Pass context into DetachTracking

equinor · Jan 20, 2025 · 12e8575 · 12e8575
1 parent 5d34a58
commit 12e8575
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 76 deletions.
diff --git a/backend/api/Services/AccessRoleService.cs b/backend/api/Services/AccessRoleService.cs
@@ -18,7 +18,7 @@ RoleAccessLevel accessLevel
         );
         public Task<AccessRole?> ReadByInstallation(Installation installation);
         public Task<List<AccessRole>> ReadAll();
-        public void DetachTracking(AccessRole accessRole);
+        public void DetachTracking(FlotillaDbContext context, AccessRole accessRole);
     }
 
     public class AccessRoleService(
@@ -101,7 +101,7 @@ RoleAccessLevel accessLevel
 
             await context.AccessRoles.AddAsync(newAccessRole);
             await context.SaveChangesAsync();
-            DetachTracking(newAccessRole);
+            DetachTracking(context, newAccessRole);
             return newAccessRole!;
         }
 
@@ -135,7 +135,7 @@ public bool IsAuthenticationAvailable()
             return httpContextAccessor.HttpContext != null;
         }
 
-        public void DetachTracking(AccessRole accessRole)
+        public void DetachTracking(FlotillaDbContext context, AccessRole accessRole)
         {
             context.Entry(accessRole).State = EntityState.Detached;
         }

diff --git a/backend/api/Services/AreaService.cs b/backend/api/Services/AreaService.cs
@@ -35,7 +35,7 @@ public Task<PagedList<Area>> ReadAll(
 
         public Task<Area?> Delete(string id);
 
-        public void DetachTracking(Area area);
+        public void DetachTracking(FlotillaDbContext context, Area area);
     }
 
     [SuppressMessage(
@@ -210,15 +210,15 @@ await inspectionAreaService.ReadByInstallationAndPlantAndName(
             await context.Areas.AddAsync(newArea);
             await ApplyDatabaseUpdate(installation);
 
-            DetachTracking(newArea);
+            DetachTracking(context, newArea);
             return newArea;
         }
 
         public async Task<Area> Update(Area area)
         {
             var entry = context.Update(area);
             await ApplyDatabaseUpdate(area.Installation);
-            DetachTracking(area);
+            DetachTracking(context, area);
             return entry.Entity;
         }
 
@@ -353,16 +353,16 @@ AreaQueryStringParameters parameters
             return Expression.Lambda<Func<Area, bool>>(body, area);
         }
 
-        public void DetachTracking(Area area)
+        public void DetachTracking(FlotillaDbContext context, Area area)
         {
             if (area.Installation != null)
-                installationService.DetachTracking(area.Installation);
+                installationService.DetachTracking(context, area.Installation);
             if (area.Plant != null)
-                plantService.DetachTracking(area.Plant);
+                plantService.DetachTracking(context, area.Plant);
             if (area.InspectionArea != null)
-                inspectionAreaService.DetachTracking(area.InspectionArea);
+                inspectionAreaService.DetachTracking(context, area.InspectionArea);
             if (area.DefaultLocalizationPose != null)
-                defaultLocalizationPoseService.DetachTracking(area.DefaultLocalizationPose);
+                defaultLocalizationPoseService.DetachTracking(context, area.DefaultLocalizationPose);
             context.Entry(area).State = EntityState.Detached;
         }
     }

diff --git a/backend/api/Services/DefaultLocalizationPoseService.cs b/backend/api/Services/DefaultLocalizationPoseService.cs
@@ -21,7 +21,7 @@ DefaultLocalizationPose defaultLocalizationPose
 
         public abstract Task<DefaultLocalizationPose?> Delete(string id);
 
-        public void DetachTracking(DefaultLocalizationPose defaultLocalizationPose);
+        public void DetachTracking(FlotillaDbContext context, DefaultLocalizationPose defaultLocalizationPose);
     }
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage(
@@ -59,7 +59,7 @@ DefaultLocalizationPose defaultLocalizationPose
             await context.DefaultLocalizationPoses.AddAsync(defaultLocalizationPose);
             await context.SaveChangesAsync();
 
-            DetachTracking(defaultLocalizationPose);
+            DetachTracking(context, defaultLocalizationPose);
             return defaultLocalizationPose;
         }
 
@@ -69,7 +69,7 @@ DefaultLocalizationPose defaultLocalizationPose
         {
             var entry = context.Update(defaultLocalizationPose);
             await context.SaveChangesAsync();
-            DetachTracking(defaultLocalizationPose);
+            DetachTracking(context, defaultLocalizationPose);
             return entry.Entity;
         }
 
@@ -88,7 +88,7 @@ DefaultLocalizationPose defaultLocalizationPose
             return defaultLocalizationPose;
         }
 
-        public void DetachTracking(DefaultLocalizationPose defaultLocalizationPose)
+        public void DetachTracking(FlotillaDbContext context, DefaultLocalizationPose defaultLocalizationPose)
         {
             context.Entry(defaultLocalizationPose).State = EntityState.Detached;
         }

diff --git a/backend/api/Services/InspectionAreaService.cs b/backend/api/Services/InspectionAreaService.cs
@@ -38,7 +38,7 @@ public Task<IEnumerable<InspectionArea>> ReadByInstallation(
 
         public Task<InspectionArea?> Delete(string id);
 
-        public void DetachTracking(InspectionArea inspectionArea);
+        public void DetachTracking(FlotillaDbContext context, InspectionArea inspectionArea);
     }
 
     [SuppressMessage(
@@ -194,7 +194,7 @@ await plantService.ReadByInstallationAndPlantCode(
                 inspectionArea.Installation,
                 new InspectionAreaResponse(inspectionArea)
             );
-            DetachTracking(inspectionArea);
+            DetachTracking(context, inspectionArea);
             return inspectionArea!;
         }
 
@@ -207,7 +207,7 @@ public async Task<InspectionArea> Update(InspectionArea inspectionArea)
                 inspectionArea.Installation,
                 new InspectionAreaResponse(inspectionArea)
             );
-            DetachTracking(inspectionArea);
+            DetachTracking(context, inspectionArea);
             return entry.Entity;
         }
 
@@ -264,14 +264,14 @@ private async Task ApplyDatabaseUpdate(Installation? installation)
                 );
         }
 
-        public void DetachTracking(InspectionArea inspectionArea)
+        public void DetachTracking(FlotillaDbContext context, InspectionArea inspectionArea)
         {
-            if (inspectionArea.Installation != null)
-                installationService.DetachTracking(inspectionArea.Installation);
-            if (inspectionArea.Plant != null)
-                plantService.DetachTracking(inspectionArea.Plant);
-            if (inspectionArea.DefaultLocalizationPose != null)
-                defaultLocalizationPoseService.DetachTracking(
+            if (inspectionArea.Installation != null && context.Entry(inspectionArea.Installation).State != EntityState.Detached)
+                installationService.DetachTracking(context, inspectionArea.Installation);
+            if (inspectionArea.Plant != null && context.Entry(inspectionArea.Plant).State != EntityState.Detached)
+                plantService.DetachTracking(context, inspectionArea.Plant);
+            if (inspectionArea.DefaultLocalizationPose != null && context.Entry(inspectionArea.DefaultLocalizationPose).State != EntityState.Detached)
+                defaultLocalizationPoseService.DetachTracking(context, 
                     inspectionArea.DefaultLocalizationPose
                 );
             context.Entry(inspectionArea).State = EntityState.Detached;

diff --git a/backend/api/Services/InspectionService.cs b/backend/api/Services/InspectionService.cs
@@ -107,7 +107,7 @@ private async Task Update(Inspection inspection)
             var installation = missionRun?.InspectionArea?.Installation;
 
             await ApplyDatabaseUpdate(installation);
-            DetachTracking(inspection);
+            DetachTracking(context, inspection);
         }
 
         public async Task<Inspection?> ReadByIsarTaskId(string id, bool readOnly = true)
@@ -227,7 +227,7 @@ await response.Content.ReadFromJsonAsync<IDAInspectionDataResponse>()
             return null;
         }
 
-        public void DetachTracking(Inspection inspection)
+        public void DetachTracking(FlotillaDbContext context, Inspection inspection)
         {
             foreach (var inspectionFinding in inspection.InspectionFindings)
             {

diff --git a/backend/api/Services/InstallationService.cs b/backend/api/Services/InstallationService.cs
@@ -23,7 +23,7 @@ public interface IInstallationService
 
         public abstract Task<Installation?> Delete(string id);
 
-        public void DetachTracking(Installation installation);
+        public void DetachTracking(FlotillaDbContext context, Installation installation);
     }
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage(
@@ -109,7 +109,7 @@ public async Task<Installation> Create(CreateInstallationQuery newInstallationQu
                 };
                 await context.Installations.AddAsync(installation);
                 await ApplyUnprotectedDatabaseUpdate();
-                DetachTracking(installation);
+                DetachTracking(context, installation);
             }
 
             return installation;
@@ -119,7 +119,7 @@ public async Task<Installation> Update(Installation installation)
         {
             var entry = context.Update(installation);
             await ApplyDatabaseUpdate(installation);
-            DetachTracking(installation);
+            DetachTracking(context, installation);
             return entry.Entity;
         }
 
@@ -137,7 +137,7 @@ public async Task<Installation> Update(Installation installation)
             return installation;
         }
 
-        public void DetachTracking(Installation installation)
+        public void DetachTracking(FlotillaDbContext context, Installation installation)
         {
             context.Entry(installation).State = EntityState.Detached;
         }

diff --git a/backend/api/Services/MissionDefinitionService.cs b/backend/api/Services/MissionDefinitionService.cs
@@ -39,7 +39,7 @@ string missionDefinitionId
 
         public Task<MissionDefinition?> Delete(string id);
 
-        public void DetachTracking(MissionDefinition missionDefinition);
+        public void DetachTracking(FlotillaDbContext context, MissionDefinition missionDefinition);
     }
 
     [SuppressMessage(
@@ -84,7 +84,7 @@ public async Task<MissionDefinition> Create(MissionDefinition missionDefinition)
                 missionDefinition.InspectionArea?.Installation,
                 new MissionDefinitionResponse(missionDefinition)
             );
-            DetachTracking(missionDefinition);
+            DetachTracking(context, missionDefinition);
             return missionDefinition;
         }
 
@@ -192,7 +192,7 @@ public async Task<MissionDefinition> Update(MissionDefinition missionDefinition)
                 missionDefinition?.InspectionArea?.Installation,
                 missionDefinition != null ? new MissionDefinitionResponse(missionDefinition) : null
             );
-            DetachTracking(missionDefinition!);
+            DetachTracking(context, missionDefinition!);
             return entry.Entity;
         }
 
@@ -328,12 +328,12 @@ parameters.InstallationCode is null
             );
         }
 
-        public void DetachTracking(MissionDefinition missionDefinition)
+        public void DetachTracking(FlotillaDbContext context, MissionDefinition missionDefinition)
         {
             if (missionDefinition.LastSuccessfulRun != null)
-                missionRunService.DetachTracking(missionDefinition.LastSuccessfulRun);
+                missionRunService.DetachTracking(context, missionDefinition.LastSuccessfulRun);
             if (missionDefinition.Source != null)
-                sourceService.DetachTracking(missionDefinition.Source);
+                sourceService.DetachTracking(context, missionDefinition.Source);
             context.Entry(missionDefinition).State = EntityState.Detached;
         }
     }

diff --git a/backend/api/Services/MissionRunService.cs b/backend/api/Services/MissionRunService.cs
@@ -88,7 +88,7 @@ string failureDescription
 
         public Task UpdateCurrentRobotMissionToFailed(string robotId);
 
-        public void DetachTracking(MissionRun missionRun);
+        public void DetachTracking(FlotillaDbContext context, MissionRun missionRun);
     }
 
     [SuppressMessage(
@@ -143,7 +143,7 @@ public async Task<MissionRun> Create(
                 new MissionRunResponse(missionRun)
             );
 
-            DetachTracking(missionRun);
+            DetachTracking(context, missionRun);
 
             if (triggerCreatedMissionRunEvent)
             {
@@ -311,7 +311,7 @@ public async Task<MissionRun> Update(MissionRun missionRun)
                 missionRun?.InspectionArea?.Installation,
                 missionRun != null ? new MissionRunResponse(missionRun) : null
             );
-            DetachTracking(missionRun!);
+            DetachTracking(context, missionRun!);
             return entry.Entity;
         }
 
@@ -773,17 +773,18 @@ await ReadById(missionRunId, readOnly: true)
             return await Update(missionRun);
         }
 
-        public void DetachTracking(MissionRun missionRun)
+        public void DetachTracking(FlotillaDbContext context, MissionRun missionRun)
         {
+            context.Entry(missionRun).State = EntityState.Detached;
             foreach (var task in missionRun.Tasks)
             {
-                missionTaskService.DetachTracking(task);
+                if (context.Entry(task).State != EntityState.Detached)
+                    missionTaskService.DetachTracking(context, task);
             }
-            if (missionRun.InspectionArea != null)
-                inspectionAreaService.DetachTracking(missionRun.InspectionArea);
-            if (missionRun.Robot != null)
-                robotService.DetachTracking(missionRun.Robot);
-            context.Entry(missionRun).State = EntityState.Detached;
+            if (missionRun.InspectionArea != null && context.Entry(missionRun.InspectionArea).State != EntityState.Detached)
+                inspectionAreaService.DetachTracking(context, missionRun.InspectionArea); // TODO: seemingly did nothing
+            if (missionRun.Robot != null && context.Entry(missionRun.Robot).State != EntityState.Detached) // TODO: have check if it's tracked. then enter
+                robotService.DetachTracking(context, missionRun.Robot); // This didn't do anything
         }
 
         public async Task<MissionRun> UpdateWithIsarInfo(

diff --git a/backend/api/Services/MissionTaskService.cs b/backend/api/Services/MissionTaskService.cs
@@ -14,7 +14,7 @@ public Task<MissionTask> UpdateMissionTaskStatus(
             IsarTaskStatus isarTaskStatus
         );
 
-        public void DetachTracking(MissionTask missionTask);
+        public void DetachTracking(FlotillaDbContext context, MissionTask missionTask);
     }
 
     [SuppressMessage(
@@ -49,7 +49,7 @@ private async Task<MissionTask> Update(MissionTask missionTask)
 
             var entry = context.Update(missionTask);
             await context.SaveChangesAsync();
-            DetachTracking(missionTask);
+            DetachTracking(context, missionTask);
             return entry.Entity;
         }
 
@@ -72,7 +72,7 @@ private IQueryable<MissionTask> GetMissionTasks(bool readOnly = true)
                 );
         }
 
-        public void DetachTracking(MissionTask missionTask)
+        public void DetachTracking(FlotillaDbContext context, MissionTask missionTask)
         {
             context.Entry(missionTask).State = EntityState.Detached;
         }

diff --git a/backend/api/Services/PlantService.cs b/backend/api/Services/PlantService.cs
@@ -39,7 +39,7 @@ public Task<IEnumerable<Plant>> ReadByInstallation(
 
         public Task<Plant?> Delete(string id);
 
-        public void DetachTracking(Plant plant);
+        public void DetachTracking(FlotillaDbContext context, Plant plant);
     }
 
     [SuppressMessage(
@@ -158,7 +158,7 @@ await installationService.ReadByInstallationCode(
                 context.Entry(plant.Installation).State = EntityState.Unchanged;
                 await context.Plants.AddAsync(plant);
                 await ApplyDatabaseUpdate(plant.Installation);
-                DetachTracking(plant);
+                DetachTracking(context, plant);
             }
             return plant!;
         }
@@ -167,7 +167,7 @@ public async Task<Plant> Update(Plant plant)
         {
             var entry = context.Update(plant);
             await ApplyDatabaseUpdate(plant.Installation);
-            DetachTracking(plant);
+            DetachTracking(context, plant);
             return entry.Entity;
         }
 
@@ -215,10 +215,10 @@ private async Task ApplyDatabaseUpdate(Installation? installation)
                 );
         }
 
-        public void DetachTracking(Plant plant)
+        public void DetachTracking(FlotillaDbContext context, Plant plant)
         {
             if (plant.Installation != null)
-                installationService.DetachTracking(plant.Installation);
+                installationService.DetachTracking(context, plant.Installation);
             context.Entry(plant).State = EntityState.Detached;
         }
     }