[Signalements] Rattachement des actions de contrôle au signalement (#916

) ## Related Pull Requests & Issues - Resolve #799
MTES-MCT · Oct 26, 2023 · b2d1126 · b2d1126
2 parents ad8916f + 7c997cb
commit b2d1126
Show file tree

Hide file tree

Showing 75 changed files with 3,245 additions and 1,638 deletions.
diff --git a/.../src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/ActionTargetTypeEnum.kt b/.../src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/ActionTargetTypeEnum.kt
diff --git a/...ain/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/EnvActionControlProperties.kt b/...ain/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/EnvActionControlProperties.kt
diff --git a/...c/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/EnvActionNoteProperties.kt b/...c/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/EnvActionNoteProperties.kt
diff --git a/...otlin/fr/gouv/cacem/monitorenv/domain/entities/mission/EnvActionSurveillanceProperties.kt b/...otlin/fr/gouv/cacem/monitorenv/domain/entities/mission/EnvActionSurveillanceProperties.kt
diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/FormalNoticeEnum.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/FormalNoticeEnum.kt
diff --git a/...nd/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/InfractionTypeEnum.kt b/...nd/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/InfractionTypeEnum.kt
diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/MissionEntity.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/MissionEntity.kt
@@ -1,6 +1,7 @@
 package fr.gouv.cacem.monitorenv.domain.entities.mission
 
 import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.LegacyControlUnitEntity
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionEntity
 import org.locationtech.jts.geom.MultiPolygon
 import java.time.ZonedDateTime
 

diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/VesselTypeEnum.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/VesselTypeEnum.kt
diff --git a/...domain/entities/mission/ActionTypeEnum.kt → ...ities/mission/envAction/ActionTypeEnum.kt b/...domain/entities/mission/ActionTypeEnum.kt → ...ities/mission/envAction/ActionTypeEnum.kt
@@ -1,4 +1,4 @@
-package fr.gouv.cacem.monitorenv.domain.entities.mission
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction
 
 enum class ActionTypeEnum {
     SURVEILLANCE,

diff --git a/...omain/entities/mission/EnvActionEntity.kt → ...ties/mission/envAction/EnvActionEntity.kt b/...omain/entities/mission/EnvActionEntity.kt → ...ties/mission/envAction/EnvActionEntity.kt
@@ -1,10 +1,11 @@
-package fr.gouv.cacem.monitorenv.domain.entities.mission
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction
 
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.EnvActionControlEntity
 import org.locationtech.jts.geom.Geometry
 import java.time.ZonedDateTime
-import java.util.*
+import java.util.UUID
 
 @JsonTypeInfo(
     use = JsonTypeInfo.Id.NAME,

diff --git a/...n/entities/mission/EnvActionNoteEntity.kt → .../mission/envAction/EnvActionNoteEntity.kt b/...n/entities/mission/EnvActionNoteEntity.kt → .../mission/envAction/EnvActionNoteEntity.kt
@@ -1,4 +1,4 @@
-package fr.gouv.cacem.monitorenv.domain.entities.mission
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction
 
 import java.time.ZonedDateTime
 import java.util.UUID
@@ -8,7 +8,8 @@ data class EnvActionNoteEntity(
     override val actionStartDateTimeUtc: ZonedDateTime? = null,
     override val actionEndDateTimeUtc: ZonedDateTime? = null,
     val observations: String? = null,
-) : EnvActionEntity(
-    actionType = ActionTypeEnum.NOTE,
-    id = id,
-)
+) :
+    EnvActionEntity(
+        actionType = ActionTypeEnum.NOTE,
+        id = id,
+    )
diff --git a/...lin/fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionNoteProperties.kt b/...lin/fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionNoteProperties.kt
@@ -0,0 +1,26 @@
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction
+
+import java.time.ZonedDateTime
+import java.util.*
+
+data class EnvActionNoteProperties(
+    val observations: String? = null,
+) {
+    fun toEnvActionNoteEntity(
+        id: UUID,
+        actionStartDateTimeUtc: ZonedDateTime?,
+        actionEndDateTimeUtc: ZonedDateTime?,
+    ) =
+        EnvActionNoteEntity(
+            id = id,
+            actionStartDateTimeUtc = actionStartDateTimeUtc,
+            actionEndDateTimeUtc = actionEndDateTimeUtc,
+            observations = observations,
+        )
+    companion object {
+        fun fromEnvActionNoteEntity(envAction: EnvActionNoteEntity) =
+            EnvActionNoteProperties(
+                envAction.observations,
+            )
+    }
+}
diff --git a/...es/mission/EnvActionSurveillanceEntity.kt → .../envAction/EnvActionSurveillanceEntity.kt b/...es/mission/EnvActionSurveillanceEntity.kt → .../envAction/EnvActionSurveillanceEntity.kt
@@ -1,4 +1,4 @@
-package fr.gouv.cacem.monitorenv.domain.entities.mission
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction
 
 import org.locationtech.jts.geom.Geometry
 import java.time.ZonedDateTime
@@ -14,7 +14,8 @@ data class EnvActionSurveillanceEntity(
     val themes: List<ThemeEntity>? = listOf(),
     val observations: String? = null,
     val coverMissionZone: Boolean? = null,
-) : EnvActionEntity(
-    actionType = ActionTypeEnum.SURVEILLANCE,
-    id = id,
-)
+) :
+    EnvActionEntity(
+        actionType = ActionTypeEnum.SURVEILLANCE,
+        id = id,
+    )
diff --git a/...ouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionSurveillanceProperties.kt b/...ouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionSurveillanceProperties.kt
@@ -0,0 +1,39 @@
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction
+
+import org.locationtech.jts.geom.Geometry
+import java.time.ZonedDateTime
+import java.util.*
+
+data class EnvActionSurveillanceProperties(
+    val themes: List<ThemeEntity>? = listOf(),
+    val observations: String? = null,
+    val coverMissionZone: Boolean? = null,
+) {
+    fun toEnvActionSurveillanceEntity(
+        id: UUID,
+        actionStartDateTimeUtc: ZonedDateTime?,
+        actionEndDateTimeUtc: ZonedDateTime?,
+        facade: String?,
+        department: String?,
+        geom: Geometry?,
+    ) =
+        EnvActionSurveillanceEntity(
+            id = id,
+            actionStartDateTimeUtc = actionStartDateTimeUtc,
+            actionEndDateTimeUtc = actionEndDateTimeUtc,
+            facade = facade,
+            department = department,
+            geom = geom,
+            themes = themes,
+            observations = observations,
+            coverMissionZone = coverMissionZone,
+        )
+    companion object {
+        fun fromEnvActionSurveillanceEntity(envAction: EnvActionSurveillanceEntity) =
+            EnvActionSurveillanceProperties(
+                themes = envAction.themes,
+                observations = envAction.observations,
+                coverMissionZone = envAction.coverMissionZone,
+            )
+    }
+}
diff --git a/...nv/domain/entities/mission/ThemeEntity.kt → ...entities/mission/envAction/ThemeEntity.kt b/...nv/domain/entities/mission/ThemeEntity.kt → ...entities/mission/envAction/ThemeEntity.kt
@@ -1,4 +1,4 @@
-package fr.gouv.cacem.monitorenv.domain.entities.mission
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction
 
 data class ThemeEntity(
     val theme: String? = null,

diff --git a/...cem/monitorenv/domain/entities/mission/envAction/envActionControl/ActionTargetTypeEnum.kt b/...cem/monitorenv/domain/entities/mission/envAction/envActionControl/ActionTargetTypeEnum.kt
@@ -0,0 +1,7 @@
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl
+
+enum class ActionTargetTypeEnum {
+    VEHICLE,
+    COMPANY,
+    INDIVIDUAL,
+}
diff --git a/...ntities/mission/EnvActionControlEntity.kt → ...nvActionControl/EnvActionControlEntity.kt b/...ntities/mission/EnvActionControlEntity.kt → ...nvActionControl/EnvActionControlEntity.kt
@@ -1,9 +1,13 @@
-package fr.gouv.cacem.monitorenv.domain.entities.mission
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl
 
 import fr.gouv.cacem.monitorenv.domain.entities.VehicleTypeEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ActionTypeEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionEntity
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ThemeEntity
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionEntity
 import org.locationtech.jts.geom.Geometry
 import java.time.ZonedDateTime
-import java.util.*
+import java.util.UUID
 
 data class EnvActionControlEntity(
     override val id: UUID,
@@ -22,7 +26,8 @@ data class EnvActionControlEntity(
     val actionTargetType: ActionTargetTypeEnum? = null,
     val vehicleType: VehicleTypeEnum? = null,
     val infractions: List<InfractionEntity>? = listOf(),
-) : EnvActionEntity(
-    id = id,
-    actionType = ActionTypeEnum.CONTROL,
-)
+) :
+    EnvActionEntity(
+        id = id,
+        actionType = ActionTypeEnum.CONTROL,
+    )
diff --git a/...nitorenv/domain/entities/mission/envAction/envActionControl/EnvActionControlProperties.kt b/...nitorenv/domain/entities/mission/envAction/envActionControl/EnvActionControlProperties.kt
@@ -0,0 +1,62 @@
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl
+
+import fr.gouv.cacem.monitorenv.domain.entities.VehicleTypeEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ThemeEntity
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionEntity
+import org.locationtech.jts.geom.Geometry
+import java.time.ZonedDateTime
+import java.util.UUID
+
+data class EnvActionControlProperties(
+    val themes: List<ThemeEntity>? = listOf(),
+    val observations: String? = null,
+    val actionNumberOfControls: Int? = null,
+    val actionTargetType: ActionTargetTypeEnum? = null,
+    val vehicleType: VehicleTypeEnum? = null,
+    val infractions: List<InfractionEntity>? = listOf(),
+) {
+    fun toEnvActionControlEntity(
+        id: UUID,
+        actionStartDateTimeUtc: ZonedDateTime?,
+        actionEndDateTimeUtc: ZonedDateTime?,
+        facade: String?,
+        department: String?,
+        geom: Geometry?,
+        isAdministrativeControl: Boolean?,
+        isComplianceWithWaterRegulationsControl: Boolean?,
+        isSafetyEquipmentAndStandardsComplianceControl: Boolean?,
+        isSeafarersControl: Boolean?,
+    ) =
+        EnvActionControlEntity(
+            id = id,
+            actionStartDateTimeUtc = actionStartDateTimeUtc,
+            actionEndDateTimeUtc = actionEndDateTimeUtc,
+            facade = facade,
+            department = department,
+            geom = geom,
+            themes = themes,
+            observations = observations,
+            actionNumberOfControls = actionNumberOfControls,
+            actionTargetType = actionTargetType,
+            vehicleType = vehicleType,
+            infractions = infractions,
+            isAdministrativeControl = isAdministrativeControl,
+            isComplianceWithWaterRegulationsControl =
+            isComplianceWithWaterRegulationsControl,
+            isSafetyEquipmentAndStandardsComplianceControl =
+            isSafetyEquipmentAndStandardsComplianceControl,
+            isSeafarersControl = isSeafarersControl,
+        )
+
+    companion object {
+        fun fromEnvActionControlEntity(envAction: EnvActionControlEntity) =
+            EnvActionControlProperties(
+                themes = envAction.themes,
+                observations = envAction.observations,
+                actionNumberOfControls = envAction.actionNumberOfControls,
+                actionTargetType = envAction.actionTargetType,
+                vehicleType = envAction.vehicleType,
+                infractions = envAction.infractions,
+            )
+    }
+}
diff --git a/...itorenv/domain/entities/mission/envAction/envActionControl/infraction/FormalNoticeEnum.kt b/...itorenv/domain/entities/mission/envAction/envActionControl/infraction/FormalNoticeEnum.kt
@@ -0,0 +1,7 @@
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction
+
+enum class FormalNoticeEnum {
+    YES,
+    NO,
+    PENDING,
+}