feat: undo renaming infractionType to legalSanction and rename admini…

…strative sanction to administrative response
MTES-MCT · Jul 23, 2024 · 557f42f · 557f42f
1 parent 2899f4b
commit 557f42f
Show file tree

Hide file tree

Showing 18 changed files with 111 additions and 193 deletions.
diff --git a/.../infraction/AdministrativeSanctionEnum.kt → .../infraction/AdministrativeResponseEnum.kt b/.../infraction/AdministrativeSanctionEnum.kt → .../infraction/AdministrativeResponseEnum.kt
@@ -1,6 +1,6 @@
 package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction
 
-enum class AdministrativeSanctionEnum {
+enum class AdministrativeResponseEnum {
     SANCTION,
     REGULARIZATION,
     PENDING,

diff --git a/...itorenv/domain/entities/mission/envAction/envActionControl/infraction/InfractionEntity.kt b/...itorenv/domain/entities/mission/envAction/envActionControl/infraction/InfractionEntity.kt
@@ -4,14 +4,14 @@ import fr.gouv.cacem.monitorenv.domain.entities.VesselTypeEnum
 
 data class InfractionEntity(
     val id: String,
-    val administrativeSanction: AdministrativeSanctionEnum?,
+    val administrativeResponse: AdministrativeResponseEnum?,
     val natinf: List<String>? = listOf(),
     val observations: String? = null,
     val registrationNumber: String? = null,
     val companyName: String? = null,
     val relevantCourt: String? = null,
     val imo: String? = null,
-    val legalSanction: LegalSanctionEnum,
+    val infractionType: InfractionTypeEnum,
     val formalNotice: FormalNoticeEnum,
     val mmsi: String? = null,
     val toProcess: Boolean,

diff --git a/...onControl/infraction/LegalSanctionEnum.kt → ...nControl/infraction/InfractionTypeEnum.kt b/...onControl/infraction/LegalSanctionEnum.kt → ...nControl/infraction/InfractionTypeEnum.kt
@@ -1,6 +1,6 @@
 package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction
 
-enum class LegalSanctionEnum {
+enum class InfractionTypeEnum {
     WAITING,
     WITH_REPORT,
     WITHOUT_REPORT,

diff --git a/...astructure/api/adapters/bff/inputs/missions/MissionEnvActionControlInfractionDataInput.kt b/...astructure/api/adapters/bff/inputs/missions/MissionEnvActionControlInfractionDataInput.kt
@@ -1,19 +1,19 @@
 package fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.inputs.missions
 
 import fr.gouv.cacem.monitorenv.domain.entities.VesselTypeEnum
-import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.AdministrativeSanctionEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.AdministrativeResponseEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.FormalNoticeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionEntity
-import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.LegalSanctionEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionTypeEnum
 
 data class MissionEnvActionControlInfractionDataInput(
     val id: String,
-    val administrativeSanction: AdministrativeSanctionEnum,
+    val administrativeResponse: AdministrativeResponseEnum,
     val companyName: String? = null,
     val controlledPersonIdentity: String? = null,
     val formalNotice: FormalNoticeEnum,
     val imo: String? = null,
-    val legalSanction: LegalSanctionEnum,
+    val infractionType: InfractionTypeEnum,
     val mmsi: String? = null,
     val natinf: List<String>? = listOf(),
     val observations: String? = null,
@@ -27,12 +27,12 @@ data class MissionEnvActionControlInfractionDataInput(
     fun toInfractionEntity() =
         InfractionEntity(
             id = id,
-            administrativeSanction = administrativeSanction,
+            administrativeResponse = administrativeResponse,
             companyName = companyName,
             controlledPersonIdentity = controlledPersonIdentity,
             formalNotice = formalNotice,
             imo = imo,
-            legalSanction = legalSanction,
+            infractionType = infractionType,
             mmsi = mmsi,
             natinf = natinf,
             observations = observations,

diff --git a/...c/main/resources/db/migration/internal/V0.142__rename_infractionType_to_legalSanction.sql b/...c/main/resources/db/migration/internal/V0.142__rename_infractionType_to_legalSanction.sql
diff --git a/backend/src/main/resources/db/testdata/V666.10__insert_dummy_env_actions.sql b/backend/src/main/resources/db/testdata/V666.10__insert_dummy_env_actions.sql
@@ -48,7 +48,7 @@ VALUES ('e2257638-ddef-4611-960c-7675a3254c38', 38, 'SURVEILLANCE', '{
                    "observations": "RAS",
                    "relevantCourt": "LOCAL_COURT",
                    "infractionType": "WITH_REPORT",
-                   "administrativeSanction": "REGULARIZATION",
+                   "administrativeResponse": "REGULARIZATION",
                    "registrationNumber": null,
                    "controlledPersonIdentity": null
                }
@@ -103,7 +103,7 @@ VALUES ('e2257638-ddef-4611-960c-7675a3254c38', 38, 'SURVEILLANCE', '{
                    "observations": "RAS",
                    "relevantCourt": "PRE",
                    "infractionType": "WAITING",
-                   "administrativeSanction": "PENDING",
+                   "administrativeResponse": "PENDING",
                    "registrationNumber": null,
                    "controlledPersonIdentity": "M DURAND"
                }
@@ -168,7 +168,7 @@ VALUES ('e2257638-ddef-4611-960c-7675a3254c38', 38, 'SURVEILLANCE', '{
                    "observations": "Pas d''observations",
                    "relevantCourt": "LOCAL_COURT",
                    "infractionType": "WITH_REPORT",
-                   "administrativeSanction": "PENDING",
+                   "administrativeResponse": "PENDING",
                    "registrationNumber": "BALTIK",
                    "controlledPersonIdentity": "John Doe"
                }

diff --git a/backend/src/main/resources/db/testdata/V666.17__rename_infractionType_to_legalSanction.sql b/backend/src/main/resources/db/testdata/V666.17__rename_infractionType_to_legalSanction.sql
diff --git a/...c/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/MissionsITests.kt b/...c/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/MissionsITests.kt
@@ -16,7 +16,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionContr
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.ActionTargetTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.EnvActionControlEntity
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.FormalNoticeEnum
-import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.LegalSanctionEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingEntity
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.SourceTypeEnum
@@ -447,8 +447,8 @@ class MissionsITests {
             )
             .andExpect(
                 jsonPath(
-                    "$[0].envActions[0].infractions[0].legalSanction",
-                    equalTo(LegalSanctionEnum.WAITING.toString()),
+                    "$[0].envActions[0].infractions[0].infractionType",
+                    equalTo(InfractionTypeEnum.WAITING.toString()),
                 ),
             )
             .andExpect(
@@ -738,8 +738,8 @@ class MissionsITests {
             )
             .andExpect(
                 jsonPath(
-                    "$.envActions[0].infractions[0].legalSanction",
-                    equalTo(LegalSanctionEnum.WAITING.toString()),
+                    "$.envActions[0].infractions[0].infractionType",
+                    equalTo(InfractionTypeEnum.WAITING.toString()),
                 ),
             )
             .andExpect(

diff --git a/...nd/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/TestUtils.kt b/...nd/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/TestUtils.kt
@@ -1,24 +1,24 @@
 package fr.gouv.cacem.monitorenv.infrastructure.api.endpoints.bff
 
 import fr.gouv.cacem.monitorenv.domain.entities.VesselTypeEnum
-import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.AdministrativeSanctionEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.AdministrativeResponseEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.FormalNoticeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionEntity
-import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.LegalSanctionEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionTypeEnum
 
 class TestUtils {
     companion object {
         fun getControlInfraction(): List<InfractionEntity> {
             return listOf(
                 InfractionEntity(
                     id = "d0f5f3a0-0b1a-4b0e-9b0a-0b0b0b0b0b0b",
-                    administrativeSanction = AdministrativeSanctionEnum.SANCTION,
+                    administrativeResponse = AdministrativeResponseEnum.SANCTION,
                     natinf = listOf("27001"),
                     observations = "Observations de l'infraction",
                     registrationNumber = "AB-123-CD",
                     companyName = "Company Name",
                     relevantCourt = "LOCAL_COURT",
-                    legalSanction = LegalSanctionEnum.WAITING,
+                    infractionType = InfractionTypeEnum.WAITING,
                     formalNotice = FormalNoticeEnum.NO,
                     toProcess = false,
                     controlledPersonIdentity = "Captain Flame",

diff --git a/.../gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepositoryITests.kt b/.../gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepositoryITests.kt
@@ -15,10 +15,10 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionNoteE
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionSurveillanceEntity
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.ActionTargetTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.EnvActionControlEntity
-import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.AdministrativeSanctionEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.AdministrativeResponseEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.FormalNoticeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionEntity
-import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.LegalSanctionEnum
+import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionTypeEnum
 import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.catchThrowable
@@ -854,13 +854,13 @@ class JpaMissionRepositoryITests : AbstractDBTests() {
         val infraction =
             InfractionEntity(
                 id = "a4d8cd64-ee6e-4dba-ae5d-f6a41395b52a",
-                administrativeSanction = AdministrativeSanctionEnum.SANCTION,
+                administrativeResponse = AdministrativeResponseEnum.SANCTION,
                 natinf = listOf("53432"),
                 observations = "This is an infraction",
                 registrationNumber = "REGISTRATION NUM",
                 companyName = "ACME inc.",
                 relevantCourt = "MARITIME_COURT",
-                legalSanction = LegalSanctionEnum.WITHOUT_REPORT,
+                infractionType = InfractionTypeEnum.WITHOUT_REPORT,
                 formalNotice = FormalNoticeEnum.NO,
                 toProcess = false,
                 controlledPersonIdentity = "Dick Hoover",

diff --git a/...tend/cypress/e2e/side_window/mission_form/attach_actions_to_reportings_in_mission.spec.ts b/...tend/cypress/e2e/side_window/mission_form/attach_actions_to_reportings_in_mission.spec.ts
@@ -194,8 +194,8 @@ context('Side Window > Mission Form > Attach action to reporting', () => {
         cy.getDataCy('infraction-form-controlledPersonIdentity').should('have.value', 'Capitaine Crochet')
         cy.getDataCy('infraction-form-vesselName').should('have.value', 'Le Bateau 2000')
         cy.getDataCy('infraction-form-vessel-size').should('have.value', 13)
-        cy.fill('Sanction judiciaire', 'Avec PV')
-        cy.fill('Sanction administrative', 'Sanction')
+        cy.fill("Type d'infraction", 'Avec PV')
+        cy.fill('Réponse administrative', 'Sanction')
         cy.fill('Mise en demeure', 'En attente')
         cy.fill('NATINF', ["1508 - Execution d'un travail dissimule"])
 
@@ -231,9 +231,9 @@ context('Side Window > Mission Form > Attach action to reporting', () => {
             cy.get('*[data-cy="envaction-theme-element"]').contains('Remise en état après occupation du DPM')
             cy.getDataCy('infraction-form-registrationNumber').should('have.value', '987654321')
             cy.getDataCy('infraction-form-vesselName').should('have.value', 'The Boat')
-            cy.get('.Field-MultiRadio').contains('Sanction judiciaire').get('[aria-checked="true"]').contains('Avec PV')
+            cy.get('.Field-MultiRadio').contains("Type d'infraction").get('[aria-checked="true"]').contains('Avec PV')
             cy.get('.Field-MultiRadio')
-              .contains('Sanction administrative')
+              .contains('Réponse administrative')
               .get('[aria-checked="true"]')
               .contains('Sanction')
             cy.get('.Field-MultiRadio').contains('Mise en demeure').get('[aria-checked="true"]').contains('En attente')

diff --git a/frontend/cypress/e2e/side_window/mission_form/delete_mission.spec.ts b/frontend/cypress/e2e/side_window/mission_form/delete_mission.spec.ts
@@ -99,8 +99,8 @@ context('Side Window > Mission Form > Delete Mission', () => {
       cy.intercept('PUT', `/bff/v1/missions/${missionId}`).as('updateMission')
 
       cy.clickButton('Editer')
-      cy.fill('Sanction judiciaire', 'Avec PV')
-      cy.fill('Sanction administrative', 'Sanction')
+      cy.fill("Type d'infraction", 'Avec PV')
+      cy.fill('Réponse administrative', 'Sanction')
       cy.fill('Mise en demeure', 'Oui')
       cy.fill('NATINF', ["1508 - Execution d'un travail dissimule"])