Pass robot in OnMissionRunCreated

equinor · Jan 2, 2025 · 1c892d5 · 1c892d5
1 parent d2fc422
commit 1c892d5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/backend/api.test/EventHandlers/TestMissionEventHandler.cs b/backend/api.test/EventHandlers/TestMissionEventHandler.cs
@@ -507,16 +507,14 @@ public async Task QueuedMissionsAreNotAbortedWhenRobotAvailableHappensAtTheSameT
                 inspectionArea,
                 true
             );
-            Thread.Sleep(100);
             var missionRun2 = await _databaseUtilities.NewMissionRun(
                 installation.InstallationCode,
                 robot,
                 inspectionArea,
                 true
             );
-            Thread.Sleep(100);
 
-            var missionRunCreatedEventArgs = new MissionRunCreatedEventArgs(missionRun1.Id);
+            var missionRunCreatedEventArgs = new MissionRunCreatedEventArgs(missionRun1);
             _missionRunService.RaiseEvent(
                 nameof(MissionRunService.MissionRunCreated),
                 missionRunCreatedEventArgs
@@ -599,7 +597,7 @@ public async Task QueuedContinuesWhenOnIsarStatusHappensAtTheSameTimeAsOnIsarMis
             );
             Thread.Sleep(100);
 
-            var missionRunCreatedEventArgs = new MissionRunCreatedEventArgs(missionRun1.Id);
+            var missionRunCreatedEventArgs = new MissionRunCreatedEventArgs(missionRun1);
             _missionRunService.RaiseEvent(
                 nameof(MissionRunService.MissionRunCreated),
                 missionRunCreatedEventArgs
@@ -691,7 +689,7 @@ public async Task ReturnHomeMissionAbortedIfNewMissionScheduled()
             Thread.Sleep(100);
 
             // Act
-            var eventArgs = new MissionRunCreatedEventArgs(missionRun.Id);
+            var eventArgs = new MissionRunCreatedEventArgs(missionRun);
             _missionRunService.RaiseEvent(nameof(MissionRunService.MissionRunCreated), eventArgs);
             Thread.Sleep(500);
 

diff --git a/backend/api/EventHandlers/MissionEventHandler.cs b/backend/api/EventHandlers/MissionEventHandler.cs
@@ -65,21 +65,19 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
         private async void OnMissionRunCreated(object? sender, MissionRunCreatedEventArgs e)
         {
-            _logger.LogInformation(
-                "Triggered MissionRunCreated event for mission run ID: {MissionRunId}",
-                e.MissionRunId
-            );
+            var missionRun = e.MissionRun;
 
-            var missionRun = await MissionService.ReadById(e.MissionRunId, readOnly: true);
             if (missionRun == null)
             {
-                _logger.LogError(
-                    "Mission run with ID: {MissionRunId} was not found in the database",
-                    e.MissionRunId
-                );
+                _logger.LogError("OnMissionRunCreated was triggered with null Robot value");
                 return;
             }
 
+            _logger.LogInformation(
+                "Triggered MissionRunCreated event for mission run ID: {MissionRunId}",
+                missionRun.Id
+            );
+
             _startMissionSemaphore.WaitOne();
 
             if (

diff --git a/backend/api/Services/Events/MissionEventArgs.cs b/backend/api/Services/Events/MissionEventArgs.cs
@@ -2,9 +2,9 @@
 
 namespace Api.Services.Events
 {
-    public class MissionRunCreatedEventArgs(string missionRunId) : EventArgs
+    public class MissionRunCreatedEventArgs(MissionRun missionRun) : EventArgs
     {
-        public string MissionRunId { get; } = missionRunId;
+        public MissionRun MissionRun { get; } = missionRun;
     }
 
     public class RobotAvailableEventArgs(Robot robot) : EventArgs

diff --git a/backend/api/Services/MissionRunService.cs b/backend/api/Services/MissionRunService.cs
@@ -140,9 +140,11 @@ public async Task<MissionRun> Create(
                 new MissionRunResponse(missionRun)
             );
 
+            DetachTracking(missionRun);
+
             if (triggerCreatedMissionRunEvent)
             {
-                var args = new MissionRunCreatedEventArgs(missionRun.Id);
+                var args = new MissionRunCreatedEventArgs(missionRun);
                 OnMissionRunCreated(args);
             }
 
@@ -152,8 +154,6 @@ public async Task<MissionRun> Create(
                 logger.LogInformation($"Mission run created by user with Id {userInfo.Id}");
             }
 
-            DetachTracking(missionRun);
-
             return missionRun;
         }