375 - front ajouter une infraction pour cette cible

.gitlab-ci.yml

@@ -16,7 +16,7 @@ variables:
     value: "postgres:15.8-alpine"
     description: "Image de la base de données"
   PROJECT_VERSION:
-    value: "2.0.8"
+    value: "2.2.0"
     description: "Version du projet à déployer"
   SERVER_ENV_INT:
     value: "int-rapportnav-appli01"

backend/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.lang.System.getenv
 
 group = "fr.gouv.dgampa"
-version = "2.0.8"
+version = "2.2.0"
 description = "RapportNav"
 
 val kotlinVersion by extra("1.9.24")
@@ -81,7 +81,8 @@ dependencies {
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
   implementation("io.sentry:sentry-spring-boot-starter-jakarta:7.1.0")
   implementation("io.sentry:sentry-log4j2:7.0.0")
-  implementation("org.apache.poi:poi:5.2.3")
+  // the two following apoche poi dependencies should have the same version
+  implementation("org.apache.poi:poi:5.3.0")
   implementation("org.apache.poi:poi-ooxml:5.3.0")
   implementation("org.apache.commons:commons-text:1.12.0")
   implementation("org.jodconverter:jodconverter-local-lo:4.4.7")
@@ -93,6 +94,7 @@ dependencies {
   testImplementation("org.testcontainers:junit-jupiter")
   testImplementation("org.testcontainers:postgresql")
   testImplementation("org.springframework.security:spring-security-test:6.3.2")
+  testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
 }
 
 buildscript {

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/control/BaseControlEntity.kt

@@ -0,0 +1,15 @@
+package fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control
+
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.infraction.InfractionEntity
+import java.util.*
+
+abstract class BaseControlEntity {
+    abstract var id: UUID
+    abstract val actionControlId: String
+    open val unitShouldConfirm: Boolean? = null
+    open var unitHasConfirmed: Boolean? = null
+    open val infractions: List<InfractionEntity>? = null
+    open val observations: String? = null
+
+    abstract fun shouldToggleOnUnitHasConfirmed(): Boolean
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/control/ControlAdministrativeEntity.kt

@@ -4,15 +4,25 @@ import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.infraction.Infracti
 import java.util.*
 
 data class ControlAdministrativeEntity(
-    var id: UUID,
+    override var id: UUID,
     val missionId: Int,
-    val actionControlId: String,
+    override val actionControlId: String,
     val amountOfControls: Int,
-    val unitShouldConfirm: Boolean? = null,
-    val unitHasConfirmed: Boolean? = null,
+    override val unitShouldConfirm: Boolean? = null,
+    override var unitHasConfirmed: Boolean? = null,
     val compliantOperatingPermit: ControlResult? = null,
     val upToDateNavigationPermit: ControlResult? = null,
     val compliantSecurityDocuments: ControlResult? = null,
-    val observations: String? = null,
-    val infractions: List<InfractionEntity>? = null
-)
+    override val observations: String? = null,
+    override val infractions: List<InfractionEntity>? = null
+) : BaseControlEntity() {
+    override fun shouldToggleOnUnitHasConfirmed(): Boolean =
+        unitShouldConfirm == true &&
+            unitHasConfirmed != true &&
+            (compliantOperatingPermit != null ||
+                upToDateNavigationPermit != null ||
+                compliantSecurityDocuments != null ||
+                infractions?.isNotEmpty() == true ||
+                observations != null
+                )
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/control/ControlGensDeMerEntity.kt

@@ -4,17 +4,25 @@ import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.infraction.Infracti
 import java.util.*
 
 data class ControlGensDeMerEntity(
-    var id: UUID,
+    override var id: UUID,
     val missionId: Int,
-    val actionControlId: String,
+    override val actionControlId: String,
     val amountOfControls: Int,
-    val unitShouldConfirm: Boolean? = null,
-    val unitHasConfirmed: Boolean? = null,
+    override val unitShouldConfirm: Boolean? = null,
+    override var unitHasConfirmed: Boolean? = null,
     val staffOutnumbered: ControlResult? = null,
     val upToDateMedicalCheck: ControlResult? = null,
     val knowledgeOfFrenchLawAndLanguage: ControlResult? = null,
-    val observations: String? = null,
-    val infractions: List<InfractionEntity>? = null
-) {
-
+    override val observations: String? = null,
+    override val infractions: List<InfractionEntity>? = null
+) : BaseControlEntity() {
+    override fun shouldToggleOnUnitHasConfirmed(): Boolean =
+        unitShouldConfirm == true &&
+            unitHasConfirmed != true &&
+            (staffOutnumbered != null ||
+                upToDateMedicalCheck != null ||
+                knowledgeOfFrenchLawAndLanguage != null ||
+                infractions?.isNotEmpty() == true ||
+                observations != null
+                )
 }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/control/ControlNavigationEntity.kt

@@ -4,14 +4,20 @@ import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.infraction.Infracti
 import java.util.*
 
 data class ControlNavigationEntity(
-    var id: UUID,
+    override var id: UUID,
     val missionId: Int,
-    val actionControlId: String,
+    override val actionControlId: String,
     val amountOfControls: Int,
-    val unitShouldConfirm: Boolean? = null,
-    val unitHasConfirmed: Boolean? = null,
-    val observations: String? = null,
-    val infractions: List<InfractionEntity>? = null
-) {
-
+    override val unitShouldConfirm: Boolean? = null,
+    override var unitHasConfirmed: Boolean? = null,
+    override val observations: String? = null,
+    override val infractions: List<InfractionEntity>? = null
+) : BaseControlEntity() {
+    override fun shouldToggleOnUnitHasConfirmed(): Boolean =
+        unitShouldConfirm == true &&
+            unitHasConfirmed != true &&
+            (
+                infractions?.isNotEmpty() == true ||
+                    observations != null
+                )
 }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/control/ControlSecurityEntity.kt

@@ -4,14 +4,20 @@ import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.infraction.Infracti
 import java.util.*
 
 data class ControlSecurityEntity(
-    var id: UUID,
+    override var id: UUID,
     val missionId: Int,
-    val actionControlId: String,
+    override val actionControlId: String,
     val amountOfControls: Int,
-    val unitShouldConfirm: Boolean? = null,
-    val unitHasConfirmed: Boolean? = null,
-    val observations: String? = null,
-    val infractions: List<InfractionEntity>? = null
-) {
-
+    override val unitShouldConfirm: Boolean? = null,
+    override var unitHasConfirmed: Boolean? = null,
+    override val observations: String? = null,
+    override val infractions: List<InfractionEntity>? = null
+) : BaseControlEntity() {
+    override fun shouldToggleOnUnitHasConfirmed(): Boolean =
+        unitShouldConfirm == true &&
+            unitHasConfirmed != true &&
+            (
+                infractions?.isNotEmpty() == true ||
+                    observations != null
+                )
 }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/GetEnvMissionById.kt

@@ -67,6 +67,7 @@ class GetEnvMissionById(
             observations = "Observation test",
             isSeafarersControl = false,  // Adjust based on your API response
             isAdministrativeControl = false,  // Adjust based on your API response
+            controlPlans = null,
             infractions = listOf(
                 InfractionEntity(
                     id = "91200795-2823-46b3-8814-a5b3bca29a47",
@@ -91,8 +92,8 @@ class GetEnvMissionById(
             controlPlans = listOf(controlTheme1),
             geom = createMockMultiPoint(listOf(Coordinate(-8.52318191, 48.30305604))),
             actionNumberOfControls = 5,
-            actionTargetType = ActionTargetTypeEnum.VEHICLE,
-            vehicleType = VehicleTypeEnum.VESSEL,
+            actionTargetType = ActionTargetTypeEnum.INDIVIDUAL,
+            vehicleType = null,
             observations = "blablabla",
             isSeafarersControl = true,
             isAdministrativeControl = true,
@@ -121,7 +122,7 @@ class GetEnvMissionById(
             controlPlans = listOf(controlTheme1),
             actionNumberOfControls = 10,
             geom = createMockMultiPoint(listOf(Coordinate(-8.52318191, 48.30305604))),
-            actionTargetType = null,
+            actionTargetType = ActionTargetTypeEnum.COMPANY,
             vehicleType = null,
             observations = null,
             observationsByUnit = "dummy",

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/GetEnvMissions.kt

@@ -41,7 +41,9 @@ class GetEnvMissions(
         missionSource = MissionSourceEnum.MONITORENV,
         hasMissionOrder = false,
         isUnderJdp = false,
-        isGeometryComputedFromControls = false
+        isGeometryComputedFromControls = false,
+        observationsByUnit = "lorem ipsum",
+        openBy = "Dummy service"
     )
     val mission3 = EnvMission(
         id = 12,

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/control/AddOrUpdateControl.kt

@@ -1,10 +1,7 @@
 package fr.gouv.dgampa.rapportnav.domain.use_cases.mission.control
 
 import fr.gouv.dgampa.rapportnav.config.UseCase
-import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control.ControlAdministrativeEntity
-import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control.ControlGensDeMerEntity
-import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control.ControlNavigationEntity
-import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control.ControlSecurityEntity
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control.*
 import fr.gouv.dgampa.rapportnav.domain.repositories.mission.control.IControlAdministrativeRepository
 import fr.gouv.dgampa.rapportnav.domain.repositories.mission.control.IControlGensDeMerRepository
 import fr.gouv.dgampa.rapportnav.domain.repositories.mission.control.IControlNavigationRepository
@@ -19,56 +16,54 @@ class AddOrUpdateControl(
     private val getControlByActionId: GetControlByActionId,
 ) {
 
-
-    fun addOrUpdateControlAdministrative(control: ControlAdministrativeEntity): ControlAdministrativeEntity {
-        val existingControl = getControlByActionId.getControlAdministrative(control.actionControlId)
-        var controlToSave: ControlAdministrativeEntity?
+    private inline fun <T : BaseControlEntity> addOrUpdateControl(
+        control: T,
+        getExistingControl: (String) -> T?,
+        saveControl: (T) -> T
+    ): T {
+        val existingControl = getExistingControl(control.actionControlId)
+        val controlToSave: BaseControlEntity = control
         if (existingControl != null) {
-            controlToSave = control
             controlToSave.id = existingControl.id
-        } else {
-            controlToSave = control
         }
-        val savedData = controlAdministrativeRepo.save(controlToSave).toControlAdministrativeEntity()
-        return savedData
+
+        if (controlToSave.shouldToggleOnUnitHasConfirmed()) {
+            controlToSave.unitHasConfirmed = true
+        }
+
+        return saveControl(controlToSave as T)
+    }
+
+
+    fun addOrUpdateControlAdministrative(control: ControlAdministrativeEntity): ControlAdministrativeEntity {
+        return addOrUpdateControl(
+            control = control,
+            getExistingControl = { getControlByActionId.getControlAdministrative(it) },
+            saveControl = { controlAdministrativeRepo.save(it).toControlAdministrativeEntity() }
+        )
     }
 
     fun addOrUpdateControlSecurity(control: ControlSecurityEntity): ControlSecurityEntity {
-        val existingControl = getControlByActionId.getControlSecurity(control.actionControlId)
-        var controlToSave: ControlSecurityEntity?
-        if (existingControl != null) {
-            controlToSave = control
-            controlToSave.id = existingControl.id
-        } else {
-            controlToSave = control
-        }
-        val savedData = controlSecurityRepo.save(controlToSave).toControlSecurityEntity()
-        return savedData
+        return addOrUpdateControl(
+            control = control,
+            getExistingControl = { getControlByActionId.getControlSecurity(it) },
+            saveControl = { controlSecurityRepo.save(it).toControlSecurityEntity() }
+        )
     }
 
     fun addOrUpdateControlNavigation(control: ControlNavigationEntity): ControlNavigationEntity {
-        val existingControl = getControlByActionId.getControlNavigation(control.actionControlId)
-        var controlToSave: ControlNavigationEntity?
-        if (existingControl != null) {
-            controlToSave = control
-            controlToSave.id = existingControl.id
-        } else {
-            controlToSave = control
-        }
-        val savedData = controlNavigationRepo.save(controlToSave).toControlNavigationEntity()
-        return savedData
+        return addOrUpdateControl(
+            control = control,
+            getExistingControl = { getControlByActionId.getControlNavigation(it) },
+            saveControl = { controlNavigationRepo.save(it).toControlNavigationEntity() }
+        )
     }
 
     fun addOrUpdateControlGensDeMer(control: ControlGensDeMerEntity): ControlGensDeMerEntity {
-        val existingControl = getControlByActionId.getControlGensDeMer(control.actionControlId)
-        var controlToSave: ControlGensDeMerEntity?
-        if (existingControl != null) {
-            controlToSave = control
-            controlToSave.id = existingControl.id
-        } else {
-            controlToSave = control
-        }
-        val savedData = controlGensDeMerRepo.save(controlToSave).toControlGensDeMerEntity()
-        return savedData
+        return addOrUpdateControl(
+            control = control,
+            getExistingControl = { getControlByActionId.getControlGensDeMer(it) },
+            saveControl = { controlGensDeMerRepo.save(it).toControlGensDeMerEntity() }
+        )
     }
 }