[Mission] Renvoi le statut de complétion des actions dans l'api publi…

…que des missions (#1340)
MTES-MCT · Apr 29, 2024 · 0403479 · 0403479
2 parents eee8027 + 1edee6f
commit 0403479
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...torenv/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionControlDataOutput.kt b/...torenv/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionControlDataOutput.kt
@@ -1,6 +1,7 @@
 package fr.gouv.cacem.monitorenv.infrastructure.api.adapters.publicapi.outputs
 
 import fr.gouv.cacem.monitorenv.domain.entities.VehicleTypeEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.ActionCompletionEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ActionTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.ActionTargetTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.EnvActionControlEntity
@@ -17,6 +18,7 @@ data class MissionEnvActionControlDataOutput(
     val actionTargetType: ActionTargetTypeEnum? = null,
     override val actionType: ActionTypeEnum = ActionTypeEnum.CONTROL,
     val completedBy: String? = null,
+    val completion: ActionCompletionEnum? = null,
     val controlPlans: List<MissionEnvActionControlPlanDataOutput>? = listOf(),
     val department: String? = null,
     val facade: String? = null,
@@ -46,6 +48,7 @@ data class MissionEnvActionControlDataOutput(
                 actionEndDateTimeUtc = envActionControlEntity.actionEndDateTimeUtc,
                 actionTargetType = envActionControlEntity.actionTargetType,
                 completedBy = envActionControlEntity.completedBy,
+                completion = envActionControlEntity.completion,
                 controlPlans =
                 envActionControlEntity.controlPlans?.map {
                     MissionEnvActionControlPlanDataOutput

diff --git a/...v/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionSurveillanceDataOutput.kt b/...v/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionSurveillanceDataOutput.kt
@@ -1,5 +1,6 @@
 package fr.gouv.cacem.monitorenv.infrastructure.api.adapters.publicapi.outputs
 
+import fr.gouv.cacem.monitorenv.domain.entities.mission.ActionCompletionEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ActionTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionSurveillanceEntity
 import org.locationtech.jts.geom.Geometry
@@ -12,6 +13,7 @@ data class MissionEnvActionSurveillanceDataOutput(
     override val actionStartDateTimeUtc: ZonedDateTime? = null,
     override val actionType: ActionTypeEnum = ActionTypeEnum.SURVEILLANCE,
     val completedBy: String? = null,
+    val completion: ActionCompletionEnum? = null,
     val controlPlans: List<MissionEnvActionControlPlanDataOutput>? = null,
     val department: String? = null,
     val facade: String? = null,
@@ -33,6 +35,7 @@ data class MissionEnvActionSurveillanceDataOutput(
                 actionEndDateTimeUtc = envActionSurveillanceEntity.actionEndDateTimeUtc,
                 actionStartDateTimeUtc = envActionSurveillanceEntity.actionStartDateTimeUtc,
                 completedBy = envActionSurveillanceEntity.completedBy,
+                completion = envActionSurveillanceEntity.completion,
                 controlPlans =
                 envActionSurveillanceEntity.controlPlans?.map {
                     MissionEnvActionControlPlanDataOutput