Make it easier to edit missiondefinitions

Author: andchiind

backend/api/Controllers/MissionDefinitionController.cs

@@ -228,7 +228,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)]
@@ -247,24 +247,26 @@ [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];
             }
 
-            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

@@ -3,8 +3,50 @@
 
 namespace Api.Controllers.Models
 {
+    public struct UpdateTaskQuery
+    {
+        public UpdateTaskQuery() {}
+        public UpdateTaskQuery(TaskDefinition def)
+        {
+            Description = def.Description;
+            RobotPose = def.RobotPose;
+            TargetPosition = def.TargetPosition;
+            ZoomDescription = def.ZoomDescription;
+            SensorType = def.SensorType;
+            AnalysisType = def.AnalysisType;
+            VideoDuration = def.VideoDuration;
+        }
+        public string? Description { get; set; }
+
+        public Pose? RobotPose { get; set; }
+
+        public Position? TargetPosition { get; set; }
+
+        public IsarZoomDescription? ZoomDescription { get; set; }
+
+        public SensorType? SensorType { get; set; }
+
+        public AnalysisType? AnalysisType { get; set; }
+
+        public float? VideoDuration { get; set; }
+    }
+
     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;
+            AnalysisType = def.AnalysisType;
+            VideoDuration = def.VideoDuration;
+        }
         public string? TagId { get; set; }
 
         public string? Description { 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<TaskDefinition>? 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);