Fix mixed use of missionId and sourceId

backend/api.test/Client/MissionTests.cs

@@ -280,15 +280,15 @@ public async Task ScheduleOneMissionTest()
             string areaName = "areaScheduleOneMissionTest";
             (_, _, _, _) = await PostAssetInformationToDb(installationCode, plantCode, deckName, areaName);
 
-            string missionId = "95";
+            string missionSourceId = "95";
 
             // Act
             var query = new ScheduledMissionQuery
             {
                 RobotId = robotId,
                 InstallationCode = installationCode,
                 AreaName = areaName,
-                MissionId = missionId,
+                MissionSourceId = missionSourceId,
                 DesiredStartTime = DateTime.UtcNow
             };
             var content = new StringContent(
@@ -327,15 +327,15 @@ public async Task Schedule3MissionsTest()
             string areaName = "areaSchedule3MissionsTest";
             (_, _, _, _) = await PostAssetInformationToDb(installationCode, plantCode, deckName, areaName);
 
-            string missionId = "97";
+            string missionSourceId = "97";
 
             // Act
             var query = new ScheduledMissionQuery
             {
                 RobotId = robotId,
                 InstallationCode = installationCode,
                 AreaName = areaName,
-                MissionId = missionId,
+                MissionSourceId = missionSourceId,
                 DesiredStartTime = DateTime.UtcNow
             };
             var content = new StringContent(
@@ -664,14 +664,14 @@ public async Task ScheduleDuplicatMissionDefinitions()
             Assert.NotNull(robots);
             var robot = robots.Where(robot => robot.Name == "Shockwave").First();
             string robotId = robot.Id;
-            string missionId = "986"; // Corresponds to mock in ServiceMock.cs
+            string missionSourceId = "986"; // Corresponds to mock in ServiceMock.cs
 
             var query = new ScheduledMissionQuery
             {
                 RobotId = robotId,
                 InstallationCode = installationCode,
                 AreaName = areaName,
-                MissionId = missionId,
+                MissionSourceId = missionSourceId,
                 DesiredStartTime = DateTime.UtcNow
             };
             var content = new StringContent(

backend/api/Controllers/MissionLoaderController.cs

@@ -63,26 +63,26 @@ public async Task<ActionResult<IList<MissionDefinitionResponse>>> GetAvailableMi
         ///     This mission is loaded from the mission loader
         /// </remarks>
         [HttpGet]
-        [Route("missions/{missionId}")]
+        [Route("missions/{missionSourceId}")]
         [ProducesResponseType(typeof(MissionDefinitionResponse), StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         [ProducesResponseType(StatusCodes.Status403Forbidden)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         [ProducesResponseType(StatusCodes.Status502BadGateway)]
-        public async Task<ActionResult<MissionDefinitionResponse>> GetMissionDefinition([FromRoute] string missionId)
+        public async Task<ActionResult<MissionDefinitionResponse>> GetMissionDefinition([FromRoute] string missionSourceId)
         {
             try
             {
-                var mission = await missionLoader.GetMissionById(missionId);
+                var mission = await missionLoader.GetMissionById(missionSourceId);
                 return Ok(mission);
             }
             catch (HttpRequestException e)
             {
                 if (e.StatusCode.HasValue && (int)e.StatusCode.Value == 404)
                 {
-                    logger.LogWarning("Could not find mission with id={id}", missionId);
+                    logger.LogWarning("Could not find mission with id={id}", missionSourceId);
                     return NotFound("Mission not found");
                 }
 

backend/api/Controllers/MissionSchedulingController.cs

@@ -201,11 +201,11 @@ [FromBody] ScheduledMissionQuery scheduledMissionQuery
             try { robot = await robotService.GetRobotWithPreCheck(scheduledMissionQuery.RobotId, readOnly: true); }
             catch (Exception e) when (e is RobotNotFoundException) { return NotFound(e.Message); }
             catch (Exception e) when (e is RobotPreCheckFailedException) { return BadRequest(e.Message); }
-            string missionId = scheduledMissionQuery.MissionId.ToString(CultureInfo.CurrentCulture);
+            string missionSourceId = scheduledMissionQuery.MissionSourceId.ToString(CultureInfo.CurrentCulture);
             MissionDefinition? missionDefinition;
             try
             {
-                missionDefinition = await missionLoader.GetMissionById(missionId);
+                missionDefinition = await missionLoader.GetMissionById(missionSourceId);
                 if (missionDefinition == null)
                 {
                     return NotFound("Mission not found");
@@ -217,7 +217,7 @@ [FromBody] ScheduledMissionQuery scheduledMissionQuery
                 {
                     logger.LogWarning(
                         "Could not find mission with id={Id}",
-                        missionId
+                        missionSourceId
                     );
                     return NotFound("Mission not found");
                 }
@@ -240,7 +240,7 @@ [FromBody] ScheduledMissionQuery scheduledMissionQuery
             }
 
 
-            var missionTasks = await missionLoader.GetTasksForMission(missionId);
+            var missionTasks = await missionLoader.GetTasksForMission(missionSourceId);
 
             List<Area?> missionAreas;
             missionAreas = missionTasks
@@ -263,7 +263,7 @@ [FromBody] ScheduledMissionQuery scheduledMissionQuery
                 return NotFound($"No area found for mission '{missionDefinition.Name}'.");
             }
 
-            var source = await sourceService.CheckForExistingSource(scheduledMissionQuery.MissionId);
+            var source = await sourceService.CheckForExistingSource(scheduledMissionQuery.MissionSourceId);
             MissionDefinition? existingMissionDefinition = null;
             if (source == null)
             {

backend/api/Controllers/Models/ScheduledMissionQuery.cs

@@ -3,7 +3,7 @@
     public struct ScheduledMissionQuery
     {
         public string RobotId { get; set; }
-        public string MissionId { get; set; }
+        public string MissionSourceId { get; set; }
         public DateTime? DesiredStartTime { get; set; }
         public string InstallationCode { get; set; }
         public string? AreaName { get; set; }

backend/api/Services/EchoService.cs

@@ -11,7 +11,7 @@ public interface IEchoService
     {
         public Task<IQueryable<MissionDefinition>> GetAvailableMissions(string? installationCode);
         public Task<MissionDefinition?> GetMissionById(string sourceMissionId);
-        public Task<List<MissionTask>> GetTasksForMission(string missionId);
+        public Task<List<MissionTask>> GetTasksForMission(string missionSourceId);
         public Task<List<PlantInfo>> GetPlantInfos();
     }
 
@@ -90,9 +90,9 @@ private async Task<EchoMission> GetEchoMission(string echoMissionId)
             return processedEchoMission;
         }
 
-        public async Task<List<MissionTask>> GetTasksForMission(string missionId)
+        public async Task<List<MissionTask>> GetTasksForMission(string missionSourceId)
         {
-            var echoMission = await GetEchoMission(missionId);
+            var echoMission = await GetEchoMission(missionSourceId);
             var missionTasks = echoMission.Tags.Select(t => MissionTaskFromEchoTag(t)).ToList();
             return missionTasks;
         }

backend/api/Services/MissionLoaders/EchoMissionLoader.cs

@@ -16,9 +16,9 @@ public async Task<IQueryable<MissionDefinition>> GetAvailableMissions(string? in
             return await echoService.GetMissionById(sourceMissionId);
         }
 
-        public async Task<List<MissionTask>> GetTasksForMission(string missionId)
+        public async Task<List<MissionTask>> GetTasksForMission(string missionSourceId)
         {
-            return await echoService.GetTasksForMission(missionId);
+            return await echoService.GetTasksForMission(missionSourceId);
         }
 
         public async Task<List<PlantInfo>> GetPlantInfos()

frontend/src/api/ApiCaller.tsx

@@ -282,13 +282,13 @@ export class BackendAPICaller {
         return result.content
     }
 
-    static async postMission(missionId: string, robotId: string, installationCode: string | null) {
+    static async postMission(missionSourceId: string, robotId: string, installationCode: string | null) {
         const path: string = 'missions'
         const robots: Robot[] = await BackendAPICaller.getEnabledRobots()
         const desiredRobot = filterRobots(robots, robotId)
         const body = {
             robotId: desiredRobot[0].id,
-            missionId: missionId,
+            missionSourceId: missionSourceId,
             installationCode: installationCode,
             areaName: '',
         }