diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionControlDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionControlDataOutput.kt index 24c64d8c21..249421e245 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionControlDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/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? = 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/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionSurveillanceDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionSurveillanceDataOutput.kt index 8f974b1792..60298683f8 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionEnvActionSurveillanceDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/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? = 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