fix after rebase

MTES-MCT · Oct 17, 2023 · 238269c · 238269c
1 parent 689ca17
commit 238269c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
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
@@ -31,8 +31,8 @@ object EnvActionMapper {
         value: String?,
         isAdministrativeControl: Boolean?,
         isComplianceWithWaterRegulationsControl: Boolean?,
-        isSeafarersControl: Boolean?,
         isSafetyEquipmentAndStandardsComplianceControl: Boolean?,
+        isSeafarersControl: Boolean?,
     ): EnvActionEntity {
         return try {
             if (!value.isNullOrEmpty() && value != jsonbNullString) {
@@ -58,6 +58,10 @@ object EnvActionMapper {
                         facade,
                         department,
                         geom,
+                        isAdministrativeControl,
+                        isComplianceWithWaterRegulationsControl,
+                        isSafetyEquipmentAndStandardsComplianceControl,
+                        isSeafarersControl,
                     )
                     ActionTypeEnum.NOTE -> mapper.readValue(
                         value,

diff --git a/.../src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/EnvActionModel.kt b/.../src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/EnvActionModel.kt
@@ -87,19 +87,19 @@ data class EnvActionModel(
 
     fun toActionEntity(mapper: ObjectMapper): EnvActionEntity {
         return EnvActionMapper.getEnvActionEntityFromJSON(
-            mapper,
-            id,
-            actionStartDateTime?.atZone(UTC),
-            actionEndDateTime?.atZone(UTC),
-            geom,
-            actionType,
-            facade,
-            department,
-            value,
-            isAdministrativeControl,
-            isComplianceWithWaterRegulationsControl,
-            isSafetyEquipmentAndStandardsComplianceControl,
-            isSeafarersControl,
+            mapper = mapper,
+            id = id,
+            actionStartDateTimeUtc = actionStartDateTime?.atZone(UTC),
+            actionEndDateTimeUtc = actionEndDateTime?.atZone(UTC),
+            geom = geom,
+            actionType = actionType,
+            facade = facade,
+            department = department,
+            value = value,
+            isAdministrativeControl = isAdministrativeControl,
+            isComplianceWithWaterRegulationsControl = isComplianceWithWaterRegulationsControl,
+            isSafetyEquipmentAndStandardsComplianceControl = isSafetyEquipmentAndStandardsComplianceControl,
+            isSeafarersControl = isSeafarersControl,
         )
     }
     companion object {

diff --git a/.../fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaBaseRepositoryITests.kt b/.../fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaBaseRepositoryITests.kt
@@ -93,7 +93,7 @@ class JpaBaseRepositoryITests : AbstractDBTests() {
                     ControlUnitResourceEntity(
                         id = 8,
                         baseId = 3,
-                        controlUnitId = 10010,
+                        controlUnitId = 10121,
                         name = "PAM Jeanne Barret",
                         note = null,
                         photo = null,
@@ -102,7 +102,7 @@ class JpaBaseRepositoryITests : AbstractDBTests() {
                     ControlUnitResourceEntity(
                         id = 9,
                         baseId = 3,
-                        controlUnitId = 10011,
+                        controlUnitId = 10080,
                         name = "PAM Themis",
                         note = null,
                         photo = null,

diff --git a/...v/cacem/monitorenv/infrastructure/database/repositories/JpaControlUnitRepositoryITests.kt b/...v/cacem/monitorenv/infrastructure/database/repositories/JpaControlUnitRepositoryITests.kt
@@ -174,14 +174,19 @@ class JpaControlUnitRepositoryITests : AbstractDBTests() {
                 controlUnitContacts = listOf(),
                 controlUnitResources = listOf(
                     FullControlUnitResourceDTO(
-                        base = BaseEntity(id = 3, name = "Dunkerque"),
+                        base = BaseEntity(
+                            id = 3,
+                            name = "Dunkerque",
+                            latitude = 51.035534,
+                            longitude = 2.372845,
+                        ),
                         controlUnit = ControlUnitEntity(
                             id = 10121,
                             administrationId = 1009,
                             areaNote = null,
                             isArchived = false,
                             name = "PAM Jeanne Barret",
-                            termsNote = null
+                            termsNote = null,
                         ),
                         controlUnitResource = ControlUnitResourceEntity(
                             id = 8,
@@ -190,8 +195,8 @@ class JpaControlUnitRepositoryITests : AbstractDBTests() {
                             name = "PAM Jeanne Barret",
                             note = null,
                             photo = null,
-                            type = ControlUnitResourceType.FRIGATE
-                        )
+                            type = ControlUnitResourceType.FRIGATE,
+                        ),
                     ),
                 ),
             ),