From 4b3e3245ed956ee37af4a4240d049f1436a7bd65 Mon Sep 17 00:00:00 2001 From: aleckvincent Date: Mon, 13 Jan 2025 16:05:10 +0100 Subject: [PATCH 1/2] add log and remove isDeleted property --- .../domain/entities/mission/v2/env/MissionEnvEntity.kt | 1 - .../infrastructure/api/bff/model/v2/MissionEnv.kt | 3 --- .../infrastructure/monitorenv/output/MissionDataOutput.kt | 1 - .../monitorenv/v2/APIEnvControlUnitRepository.kt | 8 ++++++-- .../monitorenv/v2/APIEnvMissionRepositoryV2.kt | 8 +++++++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/v2/env/MissionEnvEntity.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/v2/env/MissionEnvEntity.kt index 6ec9d9584..c2a107e5f 100644 --- a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/v2/env/MissionEnvEntity.kt +++ b/backend/src/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? = listOf(), - val isDeleted: Boolean, val isGeometryComputedFromControls: Boolean, val missionSource: MissionSourceEnum, val hasMissionOrder: Boolean, diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/v2/MissionEnv.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/v2/MissionEnv.kt index da6b32e47..29428dd56 100644 --- a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/v2/MissionEnv.kt +++ b/backend/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/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/output/MissionDataOutput.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/output/MissionDataOutput.kt index 74f4ef77b..3282a00e8 100644 --- a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/output/MissionDataOutput.kt +++ b/backend/src/main/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/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvControlUnitRepository.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvControlUnitRepository.kt index c8c3d84d7..994c70785 100644 --- a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvControlUnitRepository.kt +++ b/backend/src/main/kotlin/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? = mapper.readValue(body); diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvMissionRepositoryV2.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvMissionRepositoryV2.kt index dc4e738a4..8f298b839 100644 --- a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvMissionRepositoryV2.kt +++ b/backend/src/main/kotlin/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)) @@ -47,8 +49,12 @@ class APIEnvMissionRepositoryV2( val response = client.send(request, HttpResponse.BodyHandlers.ofString()); logger.info("Response received, Status code: ${response.statusCode()}"); + if (response.statusCode() == 400 || response.statusCode() == 500) { + throw Exception("Error while creating mission from env, please check the logs") + } + val body = response.body() - logger.info(body) + logger.info("Response received, Content: $body") mapper.registerModule(JtsModule()) val missionDataOutput: MissionDataOutput? = mapper.readValue(body); From 7ceb0dff11fa1f8fe9735666756640a5a9d314f9 Mon Sep 17 00:00:00 2001 From: aleckvincent Date: Mon, 13 Jan 2025 16:07:49 +0100 Subject: [PATCH 2/2] put log before throwing the exception --- .../monitorenv/v2/APIEnvMissionRepositoryV2.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvMissionRepositoryV2.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvMissionRepositoryV2.kt index 8f298b839..3893bc1d9 100644 --- a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvMissionRepositoryV2.kt +++ b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/v2/APIEnvMissionRepositoryV2.kt @@ -49,13 +49,13 @@ class APIEnvMissionRepositoryV2( val response = client.send(request, HttpResponse.BodyHandlers.ofString()); logger.info("Response received, Status code: ${response.statusCode()}"); + val body = response.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") } - val body = response.body() - logger.info("Response received, Content: $body") - mapper.registerModule(JtsModule()) val missionDataOutput: MissionDataOutput? = mapper.readValue(body); missionDataOutput?.toMissionEnvEntity();