in backend, make agglomerateIds and mag optional in proofreading update actions

Author: fm3

webknossos-tracingstore/app/com/scalableminds/webknossos/tracingstore/tracings/editablemapping/EditableMappingService.scala

@@ -185,17 +185,18 @@ class EditableMappingService @Inject()(
   def findSegmentIdAtPositionIfNeeded(remoteFallbackLayer: RemoteFallbackLayer,
                                       positionOpt: Option[Vec3Int],
                                       segmentIdOpt: Option[Long],
-                                      mag: Vec3Int)(implicit tc: TokenContext): Fox[Long] =
+                                      magOpt: Option[Vec3Int])(implicit tc: TokenContext): Fox[Long] =
     segmentIdOpt match {
       case Some(segmentId) => Fox.successful(segmentId)
-      case None            => findSegmentIdAtPosition(remoteFallbackLayer, positionOpt, mag)
+      case None            => findSegmentIdAtPosition(remoteFallbackLayer, positionOpt, magOpt)
     }
 
   private def findSegmentIdAtPosition(remoteFallbackLayer: RemoteFallbackLayer,
                                       positionOpt: Option[Vec3Int],
-                                      mag: Vec3Int)(implicit tc: TokenContext): Fox[Long] =
+                                      magOpt: Option[Vec3Int])(implicit tc: TokenContext): Fox[Long] =
     for {
       pos <- positionOpt.toFox ?~> "segment id or position is required in editable mapping action"
+      mag <- magOpt.toFox ?~> "segment id or mag is required in editable mapping action"
       voxelAsBytes: Array[Byte] <- remoteDatastoreClient.getVoxelAtPosition(remoteFallbackLayer, pos, mag)
       voxelAsLongArray: Array[Long] <- bytesToLongs(voxelAsBytes, remoteFallbackLayer.elementClass)
       _ <- Fox.fromBool(voxelAsLongArray.length == 1) ?~> s"Expected one, got ${voxelAsLongArray.length} segment id values for voxel."

webknossos-tracingstore/app/com/scalableminds/webknossos/tracingstore/tracings/editablemapping/EditableMappingUpdateActions.scala

@@ -11,12 +11,12 @@ trait EditableMappingUpdateAction extends LayerUpdateAction {
 
 // we switched from positions to segment ids in https://github.com/scalableminds/webknossos/pull/7742.
 // Both are now optional to support applying old update actions stored in the db.
-case class SplitAgglomerateUpdateAction(agglomerateId: Long, // Unused, we now look this up by position/segment
+case class SplitAgglomerateUpdateAction(agglomerateId: Option[Long], // Unused, we now look this up by position/segment
                                         segmentPosition1: Option[Vec3Int],
                                         segmentPosition2: Option[Vec3Int],
                                         segmentId1: Option[Long],
                                         segmentId2: Option[Long],
-                                        mag: Vec3Int,
+                                        mag: Option[Vec3Int],
                                         actionTracingId: String,
                                         actionTimestamp: Option[Long] = None,
                                         actionAuthorId: Option[ObjectId] = None,
@@ -36,13 +36,13 @@ object SplitAgglomerateUpdateAction {
 
 // we switched from positions to segment ids in https://github.com/scalableminds/webknossos/pull/7742.
 // Both are now optional to support applying old update actions stored in the db.
-case class MergeAgglomerateUpdateAction(agglomerateId1: Long, // Unused, we now look this up by position/segment
-                                        agglomerateId2: Long, // Unused, we now look this up by position/segment
+case class MergeAgglomerateUpdateAction(agglomerateId1: Option[Long], // Unused, we now look this up by position/segment
+                                        agglomerateId2: Option[Long], // Unused, we now look this up by position/segment
                                         segmentPosition1: Option[Vec3Int],
                                         segmentPosition2: Option[Vec3Int],
                                         segmentId1: Option[Long],
                                         segmentId2: Option[Long],
-                                        mag: Vec3Int,
+                                        mag: Option[Vec3Int],
                                         actionTracingId: String,
                                         actionTimestamp: Option[Long] = None,
                                         actionAuthorId: Option[ObjectId] = None,