Make it easier to edit missions

Author: andchiind

backend/api.test/Controllers/InspectionAreaControllerTests.cs

@@ -121,9 +121,8 @@ public async Task CheckThatMissionDefinitionIsCreatedInInspectionAreaUponCreatio
                     Description = "Test description",
                 },
             };
-            var missionQuery = new MissionQuery
+            var missionQuery = new CreateMissionQuery
             {
-                RobotId = robot.Id,
                 InstallationCode = installation.InstallationCode,
                 Name = testName,
                 Tasks = tasks,
@@ -247,9 +246,8 @@ public async Task CreateMissionDefinitionOutsideInspectionAreaPolygonFails()
                     RobotPose = new Pose(11, 11, 11, 0, 0, 0, 1), // Position outside polygon
                 },
             };
-            var missionQuery = new MissionQuery
+            var missionQuery = new CreateMissionQuery
             {
-                RobotId = robot.Id,
                 InstallationCode = installation.InstallationCode,
                 Name = "TestMission",
                 Tasks = tasks,

backend/api.test/Controllers/MissionSchedulingControllerTests.cs

@@ -451,37 +451,5 @@ public async Task CheckThatMissionFailsIfRobotIsNotInSameInspectionAreaAsMission
             // Act
             Assert.Equal(HttpStatusCode.BadRequest, scheduleMissionResponse.StatusCode);
         }
-
-        private static MissionQuery CreateDefaultMissionQuery(
-            string robotId,
-            string installationCode
-        )
-        {
-            return new MissionQuery
-            {
-                RobotId = robotId,
-                InstallationCode = installationCode,
-                Name = "TestMission",
-                Tasks =
-                [
-                    new TaskQuery
-                    {
-                        TagId = "test",
-                        TargetPosition = new Position(),
-                        SensorType = SensorType.Image,
-                        AnalysisTypes = [AnalysisType.Fencilla],
-                        RobotPose = new Pose(11, 11, 11, 0, 0, 0, 1),
-                    },
-                    new TaskQuery
-                    {
-                        RobotPose = new Pose(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f),
-                        TagId = "test",
-                        TargetPosition = new Position(),
-                        SensorType = SensorType.Image,
-                        AnalysisTypes = [AnalysisType.Fencilla],
-                    },
-                ],
-            };
-        }
     }
 }

backend/api/Controllers/MissionDefinitionController.cs

@@ -159,7 +159,7 @@ [FromRoute] string installationCode
         [ProducesResponseType(StatusCodes.Status409Conflict)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         public async Task<ActionResult<MissionDefinition>> Create(
-            [FromBody] MissionQuery customMissionQuery
+            [FromBody] CreateMissionQuery customMissionQuery
         )
         {
             customMissionQuery = Sanitize.SanitizeUserInput(customMissionQuery);
@@ -216,7 +216,7 @@ [FromBody] MissionQuery customMissionQuery
         /// <response code="200"> The mission definition was successfully updated </response>
         /// <response code="400"> The mission definition data is invalid </response>
         /// <response code="404"> There was no mission definition with the given ID in the database </response>
-        [HttpPut]
+        [HttpPatch]
         [Authorize(Roles = Role.User)]
         [Route("{id}")]
         [ProducesResponseType(typeof(MissionDefinitionResponse), StatusCodes.Status200OK)]
@@ -235,24 +235,31 @@ [FromBody] UpdateMissionDefinitionQuery missionDefinitionQuery
             logger.LogInformation("Updating mission definition with id '{Id}'", id);
 
             if (!ModelState.IsValid)
-            {
                 return BadRequest("Invalid data.");
-            }
 
             var missionDefinition = await missionDefinitionService.ReadById(id, readOnly: false);
             if (missionDefinition == null)
-            {
                 return NotFound($"Could not find mission definition with id '{id}'");
-            }
 
-            if (missionDefinitionQuery.Name == null)
+            if (missionDefinitionQuery.Name != null)
+                missionDefinition.Name = missionDefinitionQuery.Name;
+
+            if (missionDefinitionQuery.Comment != null)
+                missionDefinition.Comment = missionDefinitionQuery.Comment;
+
+            if (missionDefinitionQuery.InspectionFrequency != null)
+                missionDefinition.InspectionFrequency = missionDefinitionQuery.InspectionFrequency;
+
+            if (missionDefinitionQuery.Tasks != null)
             {
-                return BadRequest("Name cannot be null.");
+                missionDefinition.Tasks =
+                [
+                    .. missionDefinitionQuery.Tasks.Select(
+                        (taskQuery, index) => new TaskDefinition(taskQuery, index + 1)
+                    ),
+                ];
             }
 
-            missionDefinition.Name = missionDefinitionQuery.Name;
-            missionDefinition.Comment = missionDefinitionQuery.Comment;
-            missionDefinition.InspectionFrequency = missionDefinitionQuery.InspectionFrequency;
             if (missionDefinitionQuery.SchedulingTimesCETperWeek != null)
             {
                 var schedulingTimesCETperWeek = missionDefinitionQuery

backend/api/Controllers/Models/CustomMissionQuery.cs

@@ -5,6 +5,22 @@ namespace Api.Controllers.Models
 {
     public struct TaskQuery
     {
+#nullable disable
+        public TaskQuery() { }
+
+#nullable enable
+        public TaskQuery(TaskDefinition def)
+        {
+            TagId = def.TagId;
+            Description = def.Description;
+            RobotPose = def.RobotPose;
+            TargetPosition = def.TargetPosition;
+            ZoomDescription = def.ZoomDescription;
+            SensorType = def.SensorType;
+            AnalysisTypes = def.AnalysisTypes;
+            VideoDuration = def.VideoDuration;
+        }
+
         public string? TagId { get; set; }
 
         public string? Description { get; set; }
@@ -22,10 +38,8 @@ public struct TaskQuery
         public float? VideoDuration { get; set; }
     }
 
-    public struct MissionQuery
+    public struct CreateMissionQuery
     {
-        public string RobotId { get; set; }
-
         public string InstallationCode { get; set; }
 
         public string Name { get; set; }

backend/api/Controllers/Models/UpdateMissionDefinitionQuery.cs

@@ -24,6 +24,8 @@ public struct UpdateMissionDefinitionQuery
         /// Will be unchanged if null. Use an empty list to remove all scheduled times.
         /// </summary>
         public IList<TimeAndDayQuery>? SchedulingTimesCETperWeek { get; set; }
+
+        public IList<TaskQuery>? Tasks { get; set; }
     }
 
     public struct TimeAndDayQuery

backend/api/Database/Context/InitDb.cs

@@ -527,7 +527,6 @@ public static void PopulateDb(FlotillaDbContext context)
                 taskDefinitions[1],
                 taskDefinitions[2],
             ];
-            context.AddRange(taskDefinitions);
             context.AddRange(missionDefinitions);
             context.AddRange(missionRuns);
             context.AddRange(accessRoles);

backend/api/Utilities/SanitizeInput.cs

@@ -24,9 +24,8 @@ public static ScheduledMissionQuery SanitizeUserInput(ScheduledMissionQuery inpu
             return inputQuery;
         }
 
-        public static MissionQuery SanitizeUserInput(MissionQuery inputQuery)
+        public static CreateMissionQuery SanitizeUserInput(CreateMissionQuery inputQuery)
         {
-            inputQuery.RobotId = SanitizeUserInput(inputQuery.RobotId);
             inputQuery.InstallationCode = SanitizeUserInput(inputQuery.InstallationCode);
             inputQuery.Name = SanitizeUserInput(inputQuery.Name);