Make Update MissionRun function private

equinor · Aug 30, 2024 · aff5e71 · aff5e71
1 parent 1dc36ac
commit aff5e71
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 30 deletions.
diff --git a/backend/api/Database/Models/MissionRun.cs b/backend/api/Database/Models/MissionRun.cs
@@ -176,22 +176,6 @@ public void CalculateEstimatedDuration()
             }
         }
 
-        public void SetToFailed(string? failureReason = "")
-        {
-            Status = MissionStatus.Failed;
-            StatusReason = failureReason;
-            foreach (var task in Tasks.Where(task => !task.IsCompleted))
-            {
-                task.Status = TaskStatus.Failed;
-                foreach (
-                    var inspection in task.Inspections.Where(inspection => !inspection.IsCompleted)
-                )
-                {
-                    inspection.Status = InspectionStatus.Failed;
-                }
-            }
-        }
-
         public bool IsLocalizationMission() { return MissionRunType == MissionRunType.Localization; }
 
         public bool IsReturnHomeMission() { return MissionRunType == MissionRunType.ReturnHome; }

diff --git a/backend/api/EventHandlers/IsarConnectionEventHandler.cs b/backend/api/EventHandlers/IsarConnectionEventHandler.cs
@@ -149,8 +149,7 @@ private async void OnTimeoutEvent(IsarRobotHeartbeatMessage robotHeartbeatMessag
                             missionRun.Id,
                             missionRun.Name
                         );
-                        missionRun.SetToFailed("Lost connection to ISAR during mission");
-                        await MissionRunService.Update(missionRun);
+                        await MissionRunService.SetMissionRunToFailed(missionRun.Id, "Lost connection to ISAR during mission");
                     }
                 }
 

diff --git a/backend/api/EventHandlers/MissionEventHandler.cs b/backend/api/EventHandlers/MissionEventHandler.cs
@@ -122,8 +122,7 @@ private async void OnRobotAvailable(object? sender, RobotAvailableEventArgs e)
                 if (stuckMission.Status == MissionStatus.Ongoing || stuckMission.Status == MissionStatus.Paused)
                 {
                     _logger.LogError("Ongoing/paused mission with ID: ${MissionId} is not being run in ISAR", robot.CurrentMissionId);
-                    stuckMission.SetToFailed("Mission failed due to issue with ISAR");
-                    await MissionService.Update(stuckMission);
+                    await MissionService.SetMissionRunToFailed(stuckMission.Id, "Mission failed due to issue with ISAR");
                 }
             }
 

diff --git a/backend/api/Services/MissionRunService.cs b/backend/api/Services/MissionRunService.cs
@@ -44,8 +44,6 @@ public interface IMissionRunService
 
         public bool IncludesUnsupportedInspectionType(MissionRun missionRun);
 
-        public Task<MissionRun> Update(MissionRun mission);
-
         public Task<MissionRun> UpdateMissionRunType(string missionRunId, MissionRunType missionRunType);
 
         public Task<MissionRun> UpdateMissionRunStatusByIsarMissionId(
@@ -57,6 +55,8 @@ MissionStatus missionStatus
 
         public Task<MissionRun> UpdateMissionRunProperty(string missionRunId, string propertyName, object? value);
 
+        public Task<MissionRun> SetMissionRunToFailed(string missionRunId, string failureDescription);
+
         public Task UpdateCurrentRobotMissionToFailed(string robotId);
 
         public void DetachTracking(MissionRun missionRun);
@@ -605,17 +605,31 @@ public async Task UpdateCurrentRobotMissionToFailed(string robotId)
             var robot = await robotService.ReadById(robotId, readOnly: true) ?? throw new RobotNotFoundException($"Robot with ID: {robotId} was not found in the database");
             if (robot.CurrentMissionId != null)
             {
-                var missionRun = await ReadById(robot.CurrentMissionId, readOnly: false);
-                if (missionRun != null)
+                var missionRun = await SetMissionRunToFailed(robot.CurrentMissionId, "Lost connection to ISAR during mission");
+                logger.LogWarning(
+                    "Mission '{Id}' failed because ISAR could not be reached",
+                    missionRun.Id
+                );
+            }
+        }
+
+        public async Task<MissionRun> SetMissionRunToFailed(string missionRunId, string failureDescription)
+        {
+            var missionRun = await ReadById(missionRunId, readOnly: false) ?? throw new MissionRunNotFoundException($"Could not find mission run with ID {missionRunId}");
+
+            missionRun.Status = MissionStatus.Failed;
+            missionRun.StatusReason = failureDescription;
+            foreach (var task in missionRun.Tasks.Where(task => !task.IsCompleted))
+            {
+                task.Status = Database.Models.TaskStatus.Failed;
+                foreach (
+                    var inspection in task.Inspections.Where(inspection => !inspection.IsCompleted)
+                )
                 {
-                    missionRun.SetToFailed("Lost connection to ISAR during mission");
-                    await Update(missionRun);
-                    logger.LogWarning(
-                        "Mission '{Id}' failed because ISAR could not be reached",
-                        missionRun.Id
-                    );
+                    inspection.Status = InspectionStatus.Failed;
                 }
             }
+            return await Update(missionRun);
         }
 
         public void DetachTracking(MissionRun missionRun)