[Mission] Return ReportingEntity instead of ReportingDTO in getMissio…

…nById
MTES-MCT · Jan 17, 2025 · e7e33ff · e7e33ff
1 parent d1e2eb2
commit e7e33ff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/...main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/vigilanceArea/VigilanceAreaEntity.kt b/...main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/vigilanceArea/VigilanceAreaEntity.kt
@@ -12,9 +12,9 @@ data class VigilanceAreaEntity(
     val endingCondition: EndingConditionEnum? = null,
     val endingOccurrenceDate: ZonedDateTime? = null,
     val endingOccurrencesNumber: Int? = null,
-    val images: List<ImageEntity>? = listOf(),
     val frequency: FrequencyEnum? = null,
     val geom: MultiPolygon? = null,
+    val images: List<ImageEntity>? = listOf(),
     val isAtAllTimes: Boolean,
     val isArchived: Boolean,
     val isDeleted: Boolean,

diff --git a/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionDTO.kt b/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionDTO.kt
@@ -3,15 +3,16 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
 import fr.gouv.cacem.monitorenv.domain.entities.mission.monitorfish.MonitorFishMissionActionEntity
 import fr.gouv.cacem.monitorenv.domain.entities.mission.rapportnav.RapportNavMissionActionEntity
+import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingEntity
 import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDTO
-import java.util.UUID
+import java.util.*
 
 data class MissionDTO(
     val mission: MissionEntity,
     val fishActions: List<MonitorFishMissionActionEntity>? = listOf(),
     val attachedReportings: List<ReportingDTO>? = listOf(),
     val attachedReportingIds: List<Int>? = listOf(),
-    val detachedReportings: List<ReportingDTO>? = listOf(),
+    val detachedReportings: List<ReportingEntity>? = listOf(),
     val detachedReportingIds: List<Int>? = listOf(),
     val envActionsAttachedToReportingIds: List<EnvActionAttachedToReportingIds>? = listOf(),
     val hasRapportNavActions: RapportNavMissionActionEntity? = null,

diff --git a/...uv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionDataOutput.kt b/...uv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionDataOutput.kt
@@ -118,7 +118,7 @@ data class MissionDataOutput(
                 detachedReportingIds = dto.detachedReportingIds,
                 detachedReportings =
                     dto.detachedReportings?.map {
-                        MissionDetachedReportingDataOutput.fromReporting(it.reporting)
+                        MissionDetachedReportingDataOutput.fromReporting(it)
                     },
                 isGeometryComputedFromControls = dto.mission.isGeometryComputedFromControls,
                 hasRapportNavActions =

diff --git a/...nd/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionModel.kt b/...nd/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionModel.kt
@@ -326,7 +326,7 @@ class MissionModel(
             detachedReportings =
                 this.attachedReportings
                     ?.filter { it.detachedFromMissionAtUtc != null }
-                    ?.map { it.toReportingDTO(objectMapper) }
+                    ?.map { it.toReporting() }
                     ?: listOf(),
             detachedReportingIds =
                 this.attachedReportings