Merge pull request #492 from MTES-MCT/fix/mission-create-env

add log and remove isDeleted property
MTES-MCT · Jan 13, 2025 · 78316c0 · 78316c0
2 parents c4e05eb + 7ceb0df
commit 78316c0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.../main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/v2/env/MissionEnvEntity.kt b/.../main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/v2/env/MissionEnvEntity.kt
@@ -27,7 +27,6 @@ data class MissionEnvEntity(
     val createdAtUtc: Instant? = null,
     val updatedAtUtc: Instant? = null,
     val envActions: List<EnvActionEntity>? = listOf(),
-    val isDeleted: Boolean,
     val isGeometryComputedFromControls: Boolean,
     val missionSource: MissionSourceEnum,
     val hasMissionOrder: Boolean,

diff --git a/...d/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/v2/MissionEnv.kt b/...d/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/v2/MissionEnv.kt
@@ -23,7 +23,6 @@ data class MissionEnv(
     val missionSource: MissionSourceEnum,
     val hasMissionOrder: Boolean,
     val isUnderJdp: Boolean = false,
-    val isDeleted: Boolean? = null,
     val isGeometryComputedFromControls: Boolean = false,
 ) {
 
@@ -38,7 +37,6 @@ data class MissionEnv(
                 controlUnits = mission.controlUnits,
                 hasMissionOrder = mission.hasMissionOrder,
                 missionTypes = mission.missionTypes,
-                isDeleted = mission.isDeleted
             )
         }
 
@@ -55,7 +53,6 @@ data class MissionEnv(
                 geom = mission.geom,
                 startDateTimeUtc = mission.startDateTimeUtc,
                 endDateTimeUtc = mission.endDateTimeUtc,
-                isDeleted = mission.isDeleted,
                 missionSource = mission.missionSource,
                 hasMissionOrder = mission.hasMissionOrder,
                 isUnderJdp = mission.isUnderJdp,

diff --git a/...in/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/output/MissionDataOutput.kt b/...in/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/output/MissionDataOutput.kt
@@ -71,7 +71,6 @@ data class MissionDataOutput @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) co
             hasMissionOrder = hasMissionOrder,
             isUnderJdp = isUnderJdp,
             isGeometryComputedFromControls = isGeometryComputedFromControls,
-            isDeleted = false, // TODO this is weird,
             observationsByUnit = observationsByUnit
         )
     }

diff --git a/...lin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvControlUnitRepository.kt b/...lin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvControlUnitRepository.kt
@@ -42,10 +42,14 @@ class APIEnvControlUnitRepository(
                 .build();
 
             val response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            logger.debug("Response received, Status code: ${response.statusCode()}");
+            logger.info("EnvLegacyControlUnitRepository::findAll Response received, Status code: ${response.statusCode()}");
 
             val body = response.body()
-            logger.debug(body)
+            logger.info("EnvLegacyControlUnitRepository::findAll Response received, Content: $body")
+
+            if (response.statusCode() == 400 || response.statusCode() == 500) {
+                throw Exception("Error while fetching legacy control units from env, please check the logs")
+            }
 
             mapper.registerModule(JtsModule())
             val outputs: List<LegacyControlUnitDataOutput>? = mapper.readValue(body);

diff --git a/...otlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvMissionRepositoryV2.kt b/...otlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvMissionRepositoryV2.kt
@@ -37,6 +37,8 @@ class APIEnvMissionRepositoryV2(
         logger.info("Sending POST request for Env mission creation URL: $url")
         return try {
 
+            logger.info("Body request for Mission env create : ${gson.toJson(mission)}")
+
             val request = HttpRequest
                 .newBuilder()
                 .uri(URI.create(url))
@@ -48,7 +50,11 @@ class APIEnvMissionRepositoryV2(
             logger.info("Response received, Status code: ${response.statusCode()}");
 
             val body = response.body()
-            logger.info(body)
+            logger.info("Response received, Content: $body")
+
+            if (response.statusCode() == 400 || response.statusCode() == 500) {
+                throw Exception("Error while creating mission from env, please check the logs")
+            }
 
             mapper.registerModule(JtsModule())
             val missionDataOutput: MissionDataOutput? = mapper.readValue(body);