[Thématiques Plans de Contrôle] Création des nouvelles tables de gest…

…ion des thèmes (#1011) - Resolve #755
MTES-MCT · Dec 20, 2023 · 513d2f8 · 513d2f8
2 parents 3d1e46f + cf6345a
commit 513d2f8
Show file tree

Hide file tree

Showing 152 changed files with 3,780 additions and 1,905 deletions.
diff --git a/.../kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlPlan/ControlPlanSubthemeEntity.kt b/.../kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlPlan/ControlPlanSubthemeEntity.kt
@@ -0,0 +1,8 @@
+package fr.gouv.cacem.monitorenv.domain.entities.controlPlan
+
+data class ControlPlanSubThemeEntity(
+    val id: Int,
+    val themeId: Int,
+    val subTheme: String,
+    val year: Int,
+)
diff --git a/.../main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlPlan/ControlPlanTagEntity.kt b/.../main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlPlan/ControlPlanTagEntity.kt
@@ -0,0 +1,7 @@
+package fr.gouv.cacem.monitorenv.domain.entities.controlPlan
+
+data class ControlPlanTagEntity(
+    val id: Int,
+    val tag: String,
+    val themeId: Int,
+)
diff --git a/...ain/kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlPlan/ControlPlanThemeEntity.kt b/...ain/kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlPlan/ControlPlanThemeEntity.kt
@@ -0,0 +1,6 @@
+package fr.gouv.cacem.monitorenv.domain.entities.controlPlan
+
+data class ControlPlanThemeEntity(
+    val id: Int,
+    val theme: String,
+)
diff --git a/...c/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlTheme/ControlThemeEntity.kt b/...c/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlTheme/ControlThemeEntity.kt
@@ -1,5 +1,6 @@
 package fr.gouv.cacem.monitorenv.domain.entities.controlTheme
 
+@Deprecated("Use ControlPlanSubThemesEntity instead")
 data class ControlThemeEntity(
     val id: Int,
     val themeLevel1: String,

diff --git a/.../fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionControlPlanEntity.kt b/.../fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionControlPlanEntity.kt
@@ -0,0 +1,7 @@
+package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction
+
+data class EnvActionControlPlanEntity(
+    val themeId: Int? = null,
+    val subThemeIds: List<Int>? = emptyList(),
+    val tagIds: List<Int>? = emptyList(),
+)
diff --git a/...main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionEntity.kt b/...main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionEntity.kt
@@ -21,8 +21,9 @@ import java.util.UUID
 abstract class EnvActionEntity(
     open val id: UUID,
     open val actionType: ActionTypeEnum,
-    open val actionStartDateTimeUtc: ZonedDateTime? = null,
     open val actionEndDateTimeUtc: ZonedDateTime? = null,
+    open val actionStartDateTimeUtc: ZonedDateTime? = null,
+    open val controlPlans: List<EnvActionControlPlanEntity>? = listOf(),
     open val department: String? = null,
     open val facade: String? = null,
     open val geom: Geometry? = null,

diff --git a/...fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionSurveillanceEntity.kt b/...fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionSurveillanceEntity.kt
@@ -6,14 +6,15 @@ import java.util.UUID
 
 data class EnvActionSurveillanceEntity(
     override val id: UUID,
-    override val actionStartDateTimeUtc: ZonedDateTime? = null,
     override val actionEndDateTimeUtc: ZonedDateTime? = null,
+    override val actionStartDateTimeUtc: ZonedDateTime? = null,
+    override val controlPlans: List<EnvActionControlPlanEntity>? = listOf(),
     override val geom: Geometry? = null,
     override val facade: String? = null,
     override val department: String? = null,
-    val themes: List<ThemeEntity>? = listOf(),
-    val observations: String? = null,
     val coverMissionZone: Boolean? = null,
+    val observations: String? = null,
+    @Deprecated("Use controlPlan instead") val themes: List<ThemeEntity>? = listOf(),
 ) :
     EnvActionEntity(
         actionType = ActionTypeEnum.SURVEILLANCE,

diff --git a/...ouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionSurveillanceProperties.kt b/...ouv/cacem/monitorenv/domain/entities/mission/envAction/EnvActionSurveillanceProperties.kt
@@ -5,35 +5,37 @@ import java.time.ZonedDateTime
 import java.util.*
 
 data class EnvActionSurveillanceProperties(
-    val themes: List<ThemeEntity>? = listOf(),
-    val observations: String? = null,
     val coverMissionZone: Boolean? = null,
+    val observations: String? = null,
+    @Deprecated("Use controlPlans instead") val themes: List<ThemeEntity>? = listOf(),
 ) {
     fun toEnvActionSurveillanceEntity(
         id: UUID,
         actionStartDateTimeUtc: ZonedDateTime?,
         actionEndDateTimeUtc: ZonedDateTime?,
-        facade: String?,
+        controlPlans: List<EnvActionControlPlanEntity>?,
         department: String?,
+        facade: String?,
         geom: Geometry?,
     ) =
         EnvActionSurveillanceEntity(
             id = id,
             actionStartDateTimeUtc = actionStartDateTimeUtc,
             actionEndDateTimeUtc = actionEndDateTimeUtc,
-            facade = facade,
+            controlPlans = controlPlans,
+            coverMissionZone = coverMissionZone,
             department = department,
+            facade = facade,
             geom = geom,
-            themes = themes,
             observations = observations,
-            coverMissionZone = coverMissionZone,
+            themes = themes,
         )
     companion object {
         fun fromEnvActionSurveillanceEntity(envAction: EnvActionSurveillanceEntity) =
             EnvActionSurveillanceProperties(
-                themes = envAction.themes,
-                observations = envAction.observations,
                 coverMissionZone = envAction.coverMissionZone,
+                observations = envAction.observations,
+                themes = envAction.themes,
             )
     }
 }
diff --git a/...src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/ThemeEntity.kt b/...src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/envAction/ThemeEntity.kt
@@ -1,5 +1,6 @@
 package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction
 
+@Deprecated("Use EnvActionControlPlanSubThemeEntity instead")
 data class ThemeEntity(
     val theme: String? = null,
     val subThemes: List<String>? = listOf(),

diff --git a/...m/monitorenv/domain/entities/mission/envAction/envActionControl/EnvActionControlEntity.kt b/...m/monitorenv/domain/entities/mission/envAction/envActionControl/EnvActionControlEntity.kt
@@ -2,6 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionCont
 
 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.EnvActionControlPlanEntity
 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
@@ -11,21 +12,22 @@ import java.util.UUID
 
 data class EnvActionControlEntity(
     override val id: UUID,
-    override val actionStartDateTimeUtc: ZonedDateTime? = null,
     override val actionEndDateTimeUtc: ZonedDateTime? = null,
-    override val geom: Geometry? = null,
-    override val facade: String? = null,
+    override val actionStartDateTimeUtc: ZonedDateTime? = null,
+    override val controlPlans: List<EnvActionControlPlanEntity>? = listOf(),
     override val department: String? = null,
+    override val facade: String? = null,
+    override val geom: Geometry? = null,
     override val isAdministrativeControl: Boolean? = null,
     override val isComplianceWithWaterRegulationsControl: Boolean? = null,
     override val isSafetyEquipmentAndStandardsComplianceControl: Boolean? = null,
     override val isSeafarersControl: Boolean? = null,
-    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(),
+    val observations: String? = null,
+    @Deprecated("Use controlPlan instead") val themes: List<ThemeEntity>? = listOf(),
+    val vehicleType: VehicleTypeEnum? = null,
 ) :
     EnvActionEntity(
         id = id,

diff --git a/...nitorenv/domain/entities/mission/envAction/envActionControl/EnvActionControlProperties.kt b/...nitorenv/domain/entities/mission/envAction/envActionControl/EnvActionControlProperties.kt
@@ -1,26 +1,28 @@
 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.EnvActionControlPlanEntity
 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(),
+    val observations: String? = null,
+    @Deprecated("Use controlPlans instead") val themes: List<ThemeEntity>? = listOf(),
+    val vehicleType: VehicleTypeEnum? = null,
 ) {
     fun toEnvActionControlEntity(
         id: UUID,
-        actionStartDateTimeUtc: ZonedDateTime?,
         actionEndDateTimeUtc: ZonedDateTime?,
-        facade: String?,
+        actionStartDateTimeUtc: ZonedDateTime?,
+        controlPlans: List<EnvActionControlPlanEntity>?,
         department: String?,
+        facade: String?,
         geom: Geometry?,
         isAdministrativeControl: Boolean?,
         isComplianceWithWaterRegulationsControl: Boolean?,
@@ -29,34 +31,35 @@ data class EnvActionControlProperties(
     ) =
         EnvActionControlEntity(
             id = id,
-            actionStartDateTimeUtc = actionStartDateTimeUtc,
             actionEndDateTimeUtc = actionEndDateTimeUtc,
-            facade = facade,
-            department = department,
-            geom = geom,
-            themes = themes,
-            observations = observations,
             actionNumberOfControls = actionNumberOfControls,
+            actionStartDateTimeUtc = actionStartDateTimeUtc,
             actionTargetType = actionTargetType,
-            vehicleType = vehicleType,
+            controlPlans = controlPlans,
+            department = department,
+            facade = facade,
+            geom = geom,
             infractions = infractions,
             isAdministrativeControl = isAdministrativeControl,
             isComplianceWithWaterRegulationsControl =
             isComplianceWithWaterRegulationsControl,
             isSafetyEquipmentAndStandardsComplianceControl =
             isSafetyEquipmentAndStandardsComplianceControl,
             isSeafarersControl = isSeafarersControl,
+            observations = observations,
+            themes = themes,
+            vehicleType = vehicleType,
         )
 
     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,
+                observations = envAction.observations,
+                themes = envAction.themes,
+                vehicleType = envAction.vehicleType,
             )
     }
 }
diff --git a/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/reporting/ReportingEntity.kt b/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/reporting/ReportingEntity.kt
@@ -19,8 +19,8 @@ data class ReportingEntity(
     val seaFront: String? = null,
     val description: String? = null,
     val reportType: ReportingTypeEnum? = null,
-    val theme: String? = null,
-    val subThemes: List<String>? = listOf(),
+    val themeId: Int? = null,
+    val subThemeIds: List<Int>? = emptyList(),
     val actionTaken: String? = null,
     val isControlRequired: Boolean? = null,
     val hasNoUnitAvailable: Boolean? = null,

diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/mappers/EnvActionMapper.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/mappers/EnvActionMapper.kt
@@ -2,6 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.mappers
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ActionTypeEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionControlPlanEntity
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionEntity
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionNoteEntity
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionNoteProperties
@@ -22,17 +23,18 @@ object EnvActionMapper {
     fun getEnvActionEntityFromJSON(
         mapper: ObjectMapper,
         id: UUID,
-        actionStartDateTimeUtc: ZonedDateTime?,
         actionEndDateTimeUtc: ZonedDateTime?,
-        geom: Geometry?,
         actionType: ActionTypeEnum,
-        facade: String?,
+        actionStartDateTimeUtc: ZonedDateTime?,
+        controlPlans: List<EnvActionControlPlanEntity>?,
         department: String?,
-        value: String?,
+        facade: String?,
+        geom: Geometry?,
         isAdministrativeControl: Boolean?,
         isComplianceWithWaterRegulationsControl: Boolean?,
         isSafetyEquipmentAndStandardsComplianceControl: Boolean?,
         isSeafarersControl: Boolean?,
+        value: String?,
     ): EnvActionEntity {
         return try {
             if (!value.isNullOrEmpty() && value != jsonbNullString) {
@@ -43,38 +45,42 @@ object EnvActionMapper {
                             EnvActionSurveillanceProperties::class.java,
                         )
                             .toEnvActionSurveillanceEntity(
-                                id,
-                                actionStartDateTimeUtc,
-                                actionEndDateTimeUtc,
-                                facade,
-                                department,
-                                geom,
+                                id = id,
+                                actionEndDateTimeUtc = actionEndDateTimeUtc,
+                                actionStartDateTimeUtc = actionStartDateTimeUtc,
+                                controlPlans = controlPlans,
+                                department = department,
+                                facade = facade,
+                                geom = geom,
                             )
                     ActionTypeEnum.CONTROL ->
                         mapper.readValue(
                             value,
                             EnvActionControlProperties::class.java,
                         )
                             .toEnvActionControlEntity(
-                                id,
-                                actionStartDateTimeUtc,
-                                actionEndDateTimeUtc,
-                                facade,
-                                department,
-                                geom,
-                                isAdministrativeControl,
+                                id = id,
+                                actionEndDateTimeUtc = actionEndDateTimeUtc,
+                                actionStartDateTimeUtc = actionStartDateTimeUtc,
+                                controlPlans = controlPlans,
+                                department = department,
+                                facade = facade,
+                                geom = geom,
+                                isAdministrativeControl = isAdministrativeControl,
+                                isComplianceWithWaterRegulationsControl =
                                 isComplianceWithWaterRegulationsControl,
+                                isSafetyEquipmentAndStandardsComplianceControl =
                                 isSafetyEquipmentAndStandardsComplianceControl,
-                                isSeafarersControl,
+                                isSeafarersControl = isSeafarersControl,
                             )
                     ActionTypeEnum.NOTE ->
                         mapper.readValue(
                             value,
                             EnvActionNoteProperties::class.java,
                         )
                             .toEnvActionNoteEntity(
-                                id,
-                                actionStartDateTimeUtc,
+                                id = id,
+                                actionStartDateTimeUtc = actionStartDateTimeUtc,
                             )
                 }
             } else {

diff --git a/...ain/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlPlanSubThemeRepository.kt b/...ain/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlPlanSubThemeRepository.kt
@@ -0,0 +1,8 @@
+package fr.gouv.cacem.monitorenv.domain.repositories
+
+import fr.gouv.cacem.monitorenv.domain.entities.controlPlan.ControlPlanSubThemeEntity
+
+interface IControlPlanSubThemeRepository {
+    fun findAll(): List<ControlPlanSubThemeEntity>
+    fun findByYear(year: Int): List<ControlPlanSubThemeEntity>
+}
diff --git a/...src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlPlanTagRepository.kt b/...src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlPlanTagRepository.kt
@@ -0,0 +1,8 @@
+package fr.gouv.cacem.monitorenv.domain.repositories
+
+import fr.gouv.cacem.monitorenv.domain.entities.controlPlan.ControlPlanTagEntity
+
+interface IControlPlanTagRepository {
+    fun findAll(): List<ControlPlanTagEntity>
+    fun findByYear(year: Int): List<ControlPlanTagEntity>
+}
diff --git a/...c/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlPlanThemeRepository.kt b/...c/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlPlanThemeRepository.kt
@@ -0,0 +1,8 @@
+package fr.gouv.cacem.monitorenv.domain.repositories
+
+import fr.gouv.cacem.monitorenv.domain.entities.controlPlan.ControlPlanThemeEntity
+
+interface IControlPlanThemeRepository {
+    fun findAll(): List<ControlPlanThemeEntity>
+    fun findByYear(year: Int): List<ControlPlanThemeEntity>
+}
diff --git a/...d/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlThemeRepository.kt b/...d/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlThemeRepository.kt
@@ -2,6 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.repositories
 
 import fr.gouv.cacem.monitorenv.domain.entities.controlTheme.ControlThemeEntity
 
+@Deprecated("Use IControlPlanSubThemeRepository instead")
 interface IControlThemeRepository {
     fun findById(controlThemeId: Int): ControlThemeEntity
     fun findAll(): List<ControlThemeEntity>