[Reporting] Create function to getControlStatus

MTES-MCT · Jan 17, 2025 · bad134f · bad134f
1 parent e7e33ff
commit bad134f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 42 deletions.
diff --git a/...src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingDTO.kt b/...src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingDTO.kt
@@ -1,7 +1,6 @@
 package fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos
 
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
-import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ActionTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ControlStatusEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingEntity
 
@@ -12,24 +11,5 @@ data class ReportingDTO(
     val detachedMission: MissionEntity? = null,
 ) {
     val controlStatus: ControlStatusEnum?
-        get() =
-            when {
-                this.reporting.attachedEnvActionId != null &&
-                    this.attachedMission?.envActions
-                        ?.find { it.id == this.reporting.attachedEnvActionId }
-                        ?.actionType == ActionTypeEnum.SURVEILLANCE ->
-                    ControlStatusEnum.SURVEILLANCE_DONE
-
-                this.reporting.attachedEnvActionId != null &&
-                    this.attachedMission?.envActions
-                        ?.find { it.id == this.reporting.attachedEnvActionId }
-                        ?.actionType == ActionTypeEnum.CONTROL ->
-                    ControlStatusEnum.CONTROL_DONE
-
-                this.reporting.attachedEnvActionId == null &&
-                    this.reporting.isControlRequired == true ->
-                    ControlStatusEnum.CONTROL_TO_BE_DONE
-
-                else -> null
-            }
+        get() = getControlStatus(reporting, attachedMission)
 }
diff --git a/...rc/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingsDTO.kt b/...rc/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingsDTO.kt
@@ -1,7 +1,6 @@
 package fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos
 
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
-import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ActionTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ControlStatusEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingEntity
 
@@ -11,24 +10,5 @@ data class ReportingsDTO(
     val attachedMission: MissionEntity? = null,
 ) {
     val controlStatus: ControlStatusEnum?
-        get() =
-            when {
-                this.reporting.attachedEnvActionId != null &&
-                    this.attachedMission?.envActions
-                        ?.find { it.id == this.reporting.attachedEnvActionId }
-                        ?.actionType == ActionTypeEnum.SURVEILLANCE ->
-                    ControlStatusEnum.SURVEILLANCE_DONE
-
-                this.reporting.attachedEnvActionId != null &&
-                    this.attachedMission?.envActions
-                        ?.find { it.id == this.reporting.attachedEnvActionId }
-                        ?.actionType == ActionTypeEnum.CONTROL ->
-                    ControlStatusEnum.CONTROL_DONE
-
-                this.reporting.attachedEnvActionId == null &&
-                    this.reporting.isControlRequired == true ->
-                    ControlStatusEnum.CONTROL_TO_BE_DONE
-
-                else -> null
-            }
+        get() = getControlStatus(reporting, attachedMission)
 }
diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/utils.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/utils.kt
@@ -0,0 +1,30 @@
+package fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos
+
+import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ActionTypeEnum
+import fr.gouv.cacem.monitorenv.domain.entities.reporting.ControlStatusEnum
+import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingEntity
+
+fun getControlStatus(
+    reporting: ReportingEntity,
+    attachedMission: MissionEntity?,
+): ControlStatusEnum? {
+    return when {
+        reporting.attachedEnvActionId != null &&
+            attachedMission?.envActions
+                ?.find { it.id == reporting.attachedEnvActionId }
+                ?.actionType == ActionTypeEnum.SURVEILLANCE ->
+            ControlStatusEnum.SURVEILLANCE_DONE
+
+        reporting.attachedEnvActionId != null &&
+            attachedMission?.envActions
+                ?.find { it.id == reporting.attachedEnvActionId }
+                ?.actionType == ActionTypeEnum.CONTROL ->
+            ControlStatusEnum.CONTROL_DONE
+
+        reporting.attachedEnvActionId == null && reporting.isControlRequired == true ->
+            ControlStatusEnum.CONTROL_TO_BE_DONE
+
+        else -> null
+    }
+}