[Reporting] add isInfractionProven prop

MTES-MCT · May 23, 2024 · 24bbcb8 · 24bbcb8
1 parent 57514fb
commit 24bbcb8
Show file tree

Hide file tree

Showing 17 changed files with 223 additions and 119 deletions.
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
@@ -35,6 +35,7 @@ data class ReportingEntity(
     val attachedEnvActionId: UUID? = null,
     val updatedAtUtc: ZonedDateTime? = null,
     val withVHFAnswer: Boolean? = null,
+    val isInfractionProven: Boolean,
 ) {
     fun validate() {
         when (sourceType) {

diff --git a/...cem/monitorenv/infrastructure/api/adapters/bff/inputs/CreateOrUpdateReportingDataInput.kt b/...cem/monitorenv/infrastructure/api/adapters/bff/inputs/CreateOrUpdateReportingDataInput.kt
@@ -38,6 +38,7 @@ data class CreateOrUpdateReportingDataInput(
     val attachedEnvActionId: UUID? = null,
     val updatedAtUtc: ZonedDateTime? = null,
     val withVHFAnswer: Boolean? = null,
+    val isInfractionProven: Boolean,
 ) {
     fun toReportingEntity(): ReportingEntity {
         return ReportingEntity(
@@ -69,6 +70,7 @@ data class CreateOrUpdateReportingDataInput(
             attachedEnvActionId = this.attachedEnvActionId,
             updatedAtUtc = this.updatedAtUtc,
             withVHFAnswer = this.withVHFAnswer,
+            isInfractionProven = this.isInfractionProven,
         )
     }
 }
diff --git a/...acem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingDataOutput.kt b/...acem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingDataOutput.kt
@@ -47,6 +47,7 @@ data class ReportingDataOutput(
     val controlStatus: ControlStatusEnum? = null,
     val updatedAtUtc: ZonedDateTime? = null,
     val withVHFAnswer: Boolean? = null,
+    val isInfractionProven: Boolean,
 ) {
     companion object {
         fun fromReportingDTO(
@@ -118,6 +119,7 @@ data class ReportingDataOutput(
                 controlStatus = dto.controlStatus,
                 updatedAtUtc = dto.reporting.updatedAtUtc,
                 withVHFAnswer = dto.reporting.withVHFAnswer,
+                isInfractionProven = dto.reporting.isInfractionProven,
             )
         }
     }

diff --git a/...cem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingsDataOutput.kt b/...cem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingsDataOutput.kt
@@ -41,6 +41,7 @@ data class ReportingsDataOutput(
     val attachedEnvActionId: UUID? = null,
     val controlStatus: ControlStatusEnum? = null,
     val withVHFAnswer: Boolean? = null,
+    val isInfractionProven: Boolean,
 ) {
     companion object {
         fun fromReportingDTO(
@@ -87,6 +88,7 @@ data class ReportingsDataOutput(
                 attachedEnvActionId = dto.reporting.attachedEnvActionId,
                 controlStatus = dto.controlStatus,
                 withVHFAnswer = dto.reporting.withVHFAnswer,
+                isInfractionProven = dto.reporting.isInfractionProven,
             )
         }
     }

diff --git a/.../src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/ReportingModel.kt b/.../src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/ReportingModel.kt
@@ -129,6 +129,7 @@ class ReportingModel(
     val attachedEnvAction: EnvActionModel? = null,
     @Column(name = "updated_at_utc") @UpdateTimestamp val updatedAtUtc: Instant? = null,
     @Column(name = "with_vhf_answer") val withVHFAnswer: Boolean? = null,
+    @Column(name = "is_infraction_proven") val isInfractionProven: Boolean,
 ) {
 
     fun toReporting() =
@@ -162,6 +163,7 @@ class ReportingModel(
             attachedEnvActionId = attachedEnvAction?.id,
             updatedAtUtc = updatedAtUtc?.atZone(UTC),
             withVHFAnswer = withVHFAnswer,
+            isInfractionProven = isInfractionProven,
         )
 
     fun toReportingDTO(objectMapper: ObjectMapper) =
@@ -236,6 +238,7 @@ class ReportingModel(
                 attachedEnvAction = envActionReference,
                 updatedAtUtc = reporting.updatedAtUtc?.toInstant(),
                 withVHFAnswer = reporting.withVHFAnswer,
+                isInfractionProven = reporting.isInfractionProven,
             )
     }
 }
diff --git a/backend/src/main/resources/db/migration/internal/V0.129__update_reportings_table.sql b/backend/src/main/resources/db/migration/internal/V0.129__update_reportings_table.sql
@@ -0,0 +1 @@
+ALTER TABLE public.reportings ADD COLUMN is_infraction_proven boolean NOT NULL DEFAULT TRUE;
diff --git a/...rc/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/CreateOrUpdateReportingUTests.kt b/...rc/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/CreateOrUpdateReportingUTests.kt
@@ -100,6 +100,7 @@ class CreateOrUpdateReportingUTests {
                 isDeleted = false,
                 updatedAtUtc = ZonedDateTime.now(),
                 openBy = "CDA",
+                isInfractionProven = true,
             )
         val reportingWithSemaphoreDTO =
             ReportingDTO(
@@ -124,6 +125,7 @@ class CreateOrUpdateReportingUTests {
                     isDeleted = false,
                     updatedAtUtc = ZonedDateTime.now(),
                     openBy = "CDA",
+                    isInfractionProven = true,
                 ),
             )
         val reportingWithControlUnit =
@@ -147,6 +149,7 @@ class CreateOrUpdateReportingUTests {
                 isDeleted = false,
                 updatedAtUtc = ZonedDateTime.now(),
                 openBy = "CDA",
+                isInfractionProven = true,
             )
         val reportingWithControlUnitDTO =
             ReportingDTO(
@@ -171,6 +174,7 @@ class CreateOrUpdateReportingUTests {
                     isDeleted = false,
                     updatedAtUtc = ZonedDateTime.now(),
                     openBy = "CDA",
+                    isInfractionProven = true,
                 ),
             )
 
@@ -270,6 +274,7 @@ class CreateOrUpdateReportingUTests {
                 isDeleted = false,
                 updatedAtUtc = ZonedDateTime.now(),
                 openBy = "CDA",
+                isInfractionProven = true,
             )
 
         // When
@@ -319,6 +324,7 @@ class CreateOrUpdateReportingUTests {
                 isDeleted = false,
                 updatedAtUtc = ZonedDateTime.now(),
                 openBy = "CDA",
+                isInfractionProven = true,
             )
 
         // When
@@ -368,6 +374,7 @@ class CreateOrUpdateReportingUTests {
                 isDeleted = false,
                 updatedAtUtc = ZonedDateTime.now(),
                 openBy = "CDA",
+                isInfractionProven = true,
             )
 
         val reportingWithSemaphoreId =
@@ -390,6 +397,7 @@ class CreateOrUpdateReportingUTests {
                 isDeleted = false,
                 updatedAtUtc = ZonedDateTime.now(),
                 openBy = "CDA",
+                isInfractionProven = true,
             )
         val reportingWithoutSourceName =
             ReportingEntity(
@@ -410,6 +418,7 @@ class CreateOrUpdateReportingUTests {
                 isDeleted = false,
                 updatedAtUtc = ZonedDateTime.now(),
                 openBy = "CDA",
+                isInfractionProven = true,
             )
 
         // When
@@ -496,6 +505,7 @@ class CreateOrUpdateReportingUTests {
                 attachedToMissionAtUtc = ZonedDateTime.parse("2022-01-15T04:50:09Z"),
                 detachedFromMissionAtUtc = null,
                 updatedAtUtc = ZonedDateTime.now(),
+                isInfractionProven = true,
             )
 
         // given(reportingRepository.save(reportingWithNewAttachedMission))
@@ -528,6 +538,7 @@ class CreateOrUpdateReportingUTests {
                         ZonedDateTime.parse("2023-08-15T04:50:09Z"),
                         detachedFromMissionAtUtc = null,
                         updatedAtUtc = ZonedDateTime.now(),
+                        isInfractionProven = true,
                     ),
                 ),
             )

diff --git a/...otlin/fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/CanDeleteControlUnitUTests.kt b/...otlin/fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/CanDeleteControlUnitUTests.kt
@@ -63,6 +63,7 @@ val FAKE_REPORTING =
         attachedToMissionAtUtc = null,
         detachedFromMissionAtUtc = null,
         attachedEnvActionId = null,
+        isInfractionProven = true,
     )
 
 @ExtendWith(SpringExtension::class)