Revive segment index migration route (#7750)

scalableminds · Apr 15, 2024 · d7da22e · d7da22e
1 parent 7b13f15
commit d7da22e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/models/annotation/Annotation.scala b/app/models/annotation/Annotation.scala
@@ -156,7 +156,7 @@ class AnnotationLayerDAO @Inject()(SQLClient: SqlClient)(implicit ec: ExecutionC
   def findAllVolumeLayers: Fox[List[AnnotationLayer]] =
     for {
       rows <- run(
-        q"select _annotation, tracingId, typ, name from webknossos.annotation_layers where typ = 'Volume'"
+        q"select _annotation, tracingId, typ, name, statistics from webknossos.annotation_layers where typ = 'Volume'"
           .as[AnnotationLayersRow])
       parsed <- Fox.serialCombined(rows.toList)(parse)
     } yield parsed

diff --git a/.../app/com/scalableminds/webknossos/tracingstore/tracings/volume/VolumeTracingService.scala b/.../app/com/scalableminds/webknossos/tracingstore/tracings/volume/VolumeTracingService.scala
@@ -922,9 +922,10 @@ class VolumeTracingService @Inject()(
   def checkIfSegmentIndexMayBeAdded(tracingId: String, tracing: VolumeTracing, userToken: Option[String])(
       implicit ec: ExecutionContext): Fox[Boolean] =
     for {
-      fallbackLayer <- remoteFallbackLayerFromVolumeTracing(tracing, tracingId)
+      fallbackLayerOpt <- Fox.runIf(tracing.fallbackLayer.isDefined)(
+        remoteFallbackLayerFromVolumeTracing(tracing, tracingId))
       canHaveSegmentIndex <- VolumeSegmentIndexService.canHaveSegmentIndex(remoteDatastoreClient,
-                                                                           Some(fallbackLayer),
+                                                                           fallbackLayerOpt,
                                                                            userToken)
       alreadyHasSegmentIndex = tracing.hasSegmentIndex.getOrElse(false)
     } yield canHaveSegmentIndex && !alreadyHasSegmentIndex