[Tech] rename DTOs

MTES-MCT · Jan 21, 2025 · 5379dc4 · 5379dc4
1 parent bc82f0b
commit 5379dc4
Show file tree

Hide file tree

Showing 54 changed files with 231 additions and 248 deletions.
diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IMissionRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IMissionRepository.kt
@@ -3,16 +3,16 @@ package fr.gouv.cacem.monitorenv.domain.repositories
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionSourceEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionTypeEnum
-import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO
-import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionsDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionListDTO
 import java.time.Instant
 
 interface IMissionRepository {
     fun count(): Long
 
     fun delete(missionId: Int)
 
-    fun findFullMissionById(missionId: Int): MissionDTO?
+    fun findFullMissionById(missionId: Int): MissionDetailsDTO?
 
     fun findById(missionId: Int): MissionEntity?
 
@@ -27,7 +27,7 @@ interface IMissionRepository {
         startedAfter: Instant,
         startedBefore: Instant?,
         searchQuery: String?,
-    ): List<MissionsDTO>
+    ): List<MissionListDTO>
 
     fun findAll(
         controlUnitIds: List<Int>? = null,
@@ -48,5 +48,5 @@ interface IMissionRepository {
 
     fun findByControlUnitResourceId(controlUnitResourceId: Int): List<MissionEntity>
 
-    fun save(mission: MissionEntity): MissionDTO
+    fun save(mission: MissionEntity): MissionDetailsDTO
 }
diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IReportingRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IReportingRepository.kt
@@ -4,8 +4,8 @@ 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
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.TargetTypeEnum
-import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDTO
-import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingsDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingListDTO
 import org.locationtech.jts.geom.Geometry
 import java.time.Instant
 import java.util.*
@@ -48,17 +48,17 @@ interface IReportingRepository {
         targetTypes: List<TargetTypeEnum>?,
         isAttachedToMission: Boolean?,
         searchQuery: String?,
-    ): List<ReportingsDTO>
+    ): List<ReportingListDTO>
 
     fun findByControlUnitId(controlUnitId: Int): List<ReportingEntity>
 
-    fun findByMissionId(missionId: Int): List<ReportingDTO>
+    fun findByMissionId(missionId: Int): List<ReportingDetailsDTO>
 
-    fun findById(reportingId: Int): ReportingDTO
+    fun findById(reportingId: Int): ReportingDetailsDTO
 
-    fun findAllById(reportingId: List<Int>): List<ReportingDTO>
+    fun findAllById(reportingId: List<Int>): List<ReportingDetailsDTO>
 
-    fun save(reporting: ReportingEntity): ReportingDTO
+    fun save(reporting: ReportingEntity): ReportingDetailsDTO
 
     fun findAllIdsByGeometry(geometry: Geometry): List<Int>
 }
diff --git a/...itorenv/domain/use_cases/missions/CreateOrUpdateMissionWithActionsAndAttachedReporting.kt b/...itorenv/domain/use_cases/missions/CreateOrUpdateMissionWithActionsAndAttachedReporting.kt
@@ -7,7 +7,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.*
 import fr.gouv.cacem.monitorenv.domain.exceptions.ReportingAlreadyAttachedException
 import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository
 import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.EnvActionAttachedToReportingIds
-import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO
 import org.slf4j.LoggerFactory
 import java.util.*
 
@@ -29,7 +29,7 @@ class CreateOrUpdateMissionWithActionsAndAttachedReporting(
         mission: MissionEntity,
         attachedReportingIds: List<Int>,
         envActionsAttachedToReportingIds: List<EnvActionAttachedToReportingIds>,
-    ): Pair<Boolean, MissionDTO> {
+    ): Pair<Boolean, MissionDetailsDTO> {
         logger.info(
             "Attempt to CREATE or UPDATE mission: ${mission.id} with attached reporting ids: $attachedReportingIds and env actions attached to reporting ids: $envActionsAttachedToReportingIds",
         )

diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMission.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMission.kt
@@ -5,7 +5,7 @@ import fr.gouv.cacem.monitorenv.domain.exceptions.BackendUsageErrorCode
 import fr.gouv.cacem.monitorenv.domain.exceptions.BackendUsageException
 import fr.gouv.cacem.monitorenv.domain.repositories.IMissionRepository
 import fr.gouv.cacem.monitorenv.domain.use_cases.dashboard.DeleteDashboard
-import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO
 import org.slf4j.LoggerFactory
 
 @UseCase
@@ -14,7 +14,7 @@ class GetFullMission(
 ) {
     private val logger = LoggerFactory.getLogger(DeleteDashboard::class.java)
 
-    fun execute(missionId: Int): MissionDTO {
+    fun execute(missionId: Int): MissionDetailsDTO {
         logger.info("GET full mission $missionId with fish and rapport nav action")
         missionRepository.findFullMissionById(missionId)?.let {
             return it

diff --git a/.../cacem/monitorenv/domain/use_cases/missions/GetFullMissionWithFishAndRapportNavActions.kt b/.../cacem/monitorenv/domain/use_cases/missions/GetFullMissionWithFishAndRapportNavActions.kt
@@ -3,7 +3,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.missions
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.repositories.IMonitorFishMissionActionsRepository
 import fr.gouv.cacem.monitorenv.domain.repositories.IRapportNavMissionActionsRepository
-import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO
 import org.slf4j.LoggerFactory
 
 @UseCase
@@ -14,7 +14,7 @@ class GetFullMissionWithFishAndRapportNavActions(
 ) {
     private val logger = LoggerFactory.getLogger(GetFullMissionWithFishAndRapportNavActions::class.java)
 
-    fun execute(missionId: Int): Pair<Boolean, MissionDTO> {
+    fun execute(missionId: Int): Pair<Boolean, MissionDetailsDTO> {
         logger.info("GET full mission $missionId with fish and rapport nav action")
         getFullMission.execute(missionId).let {
             try {

diff --git a/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissions.kt b/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissions.kt
@@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionSourceEnum
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionTypeEnum
 import fr.gouv.cacem.monitorenv.domain.repositories.IMissionRepository
-import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionsDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionListDTO
 import org.slf4j.LoggerFactory
 import java.time.ZonedDateTime
 
@@ -23,7 +23,9 @@ class GetFullMissions(
         pageSize: Int?,
         seaFronts: List<String>?,
         searchQuery: String?,
-    ): List<MissionsDTO> {
+    ): List<MissionListDTO> {
+        logger.info("Attempt to GET all full missions")
+
         val missions =
             missionRepository.findAllFullMissions(
                 startedAfter =

diff --git a/...in/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionAndSourceAction.kt b/...in/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionAndSourceAction.kt
@@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionSourceEnum
 import fr.gouv.cacem.monitorenv.domain.repositories.IMonitorFishMissionActionsRepository
 import fr.gouv.cacem.monitorenv.domain.repositories.IRapportNavMissionActionsRepository
-import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO
 import org.slf4j.LoggerFactory
 
 @UseCase
@@ -18,24 +18,24 @@ class GetMissionAndSourceAction(
     fun execute(
         missionId: Int,
         source: MissionSourceEnum?,
-    ): MissionDTO {
+    ): MissionDetailsDTO {
         logger.info("GET mission $missionId and source action")
         getMission.execute(missionId).let {
             when (source) {
-                MissionSourceEnum.MONITORFISH -> return MissionDTO(
+                MissionSourceEnum.MONITORFISH -> return MissionDetailsDTO(
                     it,
                     hasRapportNavActions =
                         apiRapportNavMissionActionsRepository.findRapportNavMissionActionsById(
                             missionId,
                         ),
                 )
 
-                MissionSourceEnum.RAPPORT_NAV -> return MissionDTO(
+                MissionSourceEnum.RAPPORT_NAV -> return MissionDetailsDTO(
                     it,
                     fishActions = apiFishMissionActionsRepository.findFishMissionActionsById(missionId),
                 )
 
-                else -> return MissionDTO(it)
+                else -> return MissionDetailsDTO(it)
             }
         }
     }

diff --git a/...lin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionWithRapportNavActions.kt b/...lin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionWithRapportNavActions.kt
@@ -2,7 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.missions
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.repositories.IRapportNavMissionActionsRepository
-import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO
 import org.slf4j.LoggerFactory
 
 @UseCase
@@ -12,16 +12,16 @@ class GetMissionWithRapportNavActions(
 ) {
     private val logger = LoggerFactory.getLogger(GetFullMissionWithFishAndRapportNavActions::class.java)
 
-    fun execute(missionId: Int): MissionDTO {
+    fun execute(missionId: Int): MissionDetailsDTO {
         logger.info("GET mission $missionId with rapportNavActions")
         getMission.execute(missionId).let {
             try {
                 val hasRapportNavActions =
                     rapportNavMissionActionsRepository.findRapportNavMissionActionsById(missionId)
 
-                return MissionDTO(mission = it, hasRapportNavActions = hasRapportNavActions)
+                return MissionDetailsDTO(mission = it, hasRapportNavActions = hasRapportNavActions)
             } catch (e: Exception) {
-                return MissionDTO(mission = it)
+                return MissionDetailsDTO(mission = it)
             }
         }
     }

diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/PatchMission.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/PatchMission.kt
@@ -7,7 +7,7 @@ import fr.gouv.cacem.monitorenv.domain.exceptions.BackendUsageErrorCode
 import fr.gouv.cacem.monitorenv.domain.exceptions.BackendUsageException
 import fr.gouv.cacem.monitorenv.domain.mappers.PatchEntity
 import fr.gouv.cacem.monitorenv.domain.repositories.IMissionRepository
-import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO
 import org.slf4j.LoggerFactory
 
 @UseCase
@@ -20,7 +20,7 @@ class PatchMission(
     fun execute(
         id: Int,
         patchableMissionEntity: PatchableMissionEntity,
-    ): MissionDTO {
+    ): MissionDetailsDTO {
         logger.info("Attempt to PATCH mission $id")
         missionRepository.findById(id)?.let {
             patchEntity.execute(it, patchableMissionEntity)

diff --git a/...ain/use_cases/missions/dtos/MissionDTO.kt → ..._cases/missions/dtos/MissionDetailsDTO.kt b/...ain/use_cases/missions/dtos/MissionDTO.kt → ..._cases/missions/dtos/MissionDetailsDTO.kt
@@ -4,13 +4,13 @@ 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 fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO
 import java.util.*
 
-data class MissionDTO(
+data class MissionDetailsDTO(
     val mission: MissionEntity,
     val fishActions: List<MonitorFishMissionActionEntity>? = listOf(),
-    val attachedReportings: List<ReportingDTO>? = listOf(),
+    val attachedReportings: List<ReportingDetailsDTO>? = listOf(),
     val attachedReportingIds: List<Int>? = listOf(),
     val detachedReportings: List<ReportingEntity>? = listOf(),
     val detachedReportingIds: List<Int>? = listOf(),

diff --git a/...in/use_cases/missions/dtos/MissionsDTO.kt → ...use_cases/missions/dtos/MissionListDTO.kt b/...in/use_cases/missions/dtos/MissionsDTO.kt → ...use_cases/missions/dtos/MissionListDTO.kt
@@ -2,7 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos
 
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
 
-data class MissionsDTO(
+data class MissionListDTO(
     val mission: MissionEntity,
     val attachedReportingIds: List<Int>,
 )
diff --git a/...in/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/CreateOrUpdateReporting.kt b/...in/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/CreateOrUpdateReporting.kt
@@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingEntity
 import fr.gouv.cacem.monitorenv.domain.exceptions.ReportingAlreadyAttachedException
 import fr.gouv.cacem.monitorenv.domain.repositories.*
-import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO
 import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.events.UpdateReportingEvent
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -20,7 +20,7 @@ class CreateOrUpdateReporting(
     private val logger: Logger = LoggerFactory.getLogger(CreateOrUpdateReporting::class.java)
 
     @Throws(IllegalArgumentException::class)
-    fun execute(reporting: ReportingEntity): ReportingDTO {
+    fun execute(reporting: ReportingEntity): ReportingDetailsDTO {
         logger.info("Attempt to CREATE or UPDATE reporting ${reporting.id}")
         reporting.validate()
 

diff --git a/.../src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingById.kt b/.../src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingById.kt
@@ -2,7 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.reportings
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository
-import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
@@ -12,7 +12,7 @@ class GetReportingById(
 ) {
     private val logger: Logger = LoggerFactory.getLogger(DeleteReportings::class.java)
 
-    fun execute(id: Int): ReportingDTO {
+    fun execute(id: Int): ReportingDetailsDTO {
         logger.info("GET reporting $id")
 
         return reportingRepository.findById(id)

diff --git a/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportings.kt b/...end/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportings.kt
@@ -5,7 +5,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.SourceTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.TargetTypeEnum
 import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository
-import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingsDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingListDTO
 import org.slf4j.LoggerFactory
 import java.time.ZonedDateTime
 
@@ -27,7 +27,7 @@ class GetReportings(
         targetTypes: List<TargetTypeEnum>?,
         isAttachedToMission: Boolean?,
         searchQuery: String?,
-    ): List<ReportingsDTO> {
+    ): List<ReportingListDTO> {
         logger.info("Attempt to get reportings with criteria")
         val now = ZonedDateTime.now()
         val reports =

diff --git a/...rc/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsByIds.kt b/...rc/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsByIds.kt
@@ -2,7 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.reportings
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository
-import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO
 import org.slf4j.LoggerFactory
 
 @UseCase
@@ -11,7 +11,7 @@ class GetReportingsByIds(
 ) {
     private val logger = LoggerFactory.getLogger(GetReportingsByIds::class.java)
 
-    fun execute(ids: List<Int>): List<ReportingDTO> {
+    fun execute(ids: List<Int>): List<ReportingDetailsDTO> {
         logger.info("GET reportings $ids")
         val reportings = reportingRepository.findAllById(ids)
 

diff --git a/...use_cases/reportings/dtos/ReportingDTO.kt → ...es/reportings/dtos/ReportingDetailsDTO.kt b/...use_cases/reportings/dtos/ReportingDTO.kt → ...es/reportings/dtos/ReportingDetailsDTO.kt
@@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ControlStatusEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingEntity
 
-data class ReportingDTO(
+data class ReportingDetailsDTO(
     val reporting: ReportingEntity,
     val reportingSources: List<ReportingSourceDTO>,
     val attachedMission: MissionEntity? = null,

diff --git a/...se_cases/reportings/dtos/ReportingsDTO.kt → ...cases/reportings/dtos/ReportingListDTO.kt b/...se_cases/reportings/dtos/ReportingsDTO.kt → ...cases/reportings/dtos/ReportingListDTO.kt
@@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ControlStatusEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingEntity
 
-data class ReportingsDTO(
+data class ReportingListDTO(
     val reporting: ReportingEntity,
     val reportingSources: List<ReportingSourceDTO>,
     val attachedMission: MissionEntity? = null,

diff --git a/...otlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/events/UpdateReportingEvent.kt b/...otlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/events/UpdateReportingEvent.kt
@@ -1,7 +1,7 @@
 package fr.gouv.cacem.monitorenv.domain.use_cases.reportings.events
 
-import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO
 
 data class UpdateReportingEvent(
-    val reporting: ReportingDTO,
+    val reporting: ReportingDetailsDTO,
 )
diff --git a/...v/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/AttachedReportingDataOutput.kt b/...v/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/AttachedReportingDataOutput.kt
@@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.VehicleTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.TargetDetailsEntity
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.TargetTypeEnum
-import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO
 import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.reportings.ReportingSourceDataOutput
 import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.reportings.ReportingSourceDataOutput.Companion.fromReportingSourceDTO
 import org.locationtech.jts.geom.Geometry
@@ -38,7 +38,7 @@ data class AttachedReportingDataOutput(
     val withVHFAnswer: Boolean? = null,
 ) {
     companion object {
-        fun fromReportingDTO(dto: ReportingDTO): AttachedReportingDataOutput {
+        fun fromReportingDTO(dto: ReportingDetailsDTO): AttachedReportingDataOutput {
             requireNotNull(dto.reporting.id) { "ReportingEntity.id cannot be null" }
             return AttachedReportingDataOutput(
                 id = dto.reporting.id,

diff --git a/...nv/infrastructure/api/adapters/bff/outputs/missions/MissionAttachedReportingDataOutput.kt b/...nv/infrastructure/api/adapters/bff/outputs/missions/MissionAttachedReportingDataOutput.kt
@@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.VehicleTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.TargetDetailsEntity
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.TargetTypeEnum
-import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDTO
+import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO
 import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.reportings.ReportingSourceDataOutput
 import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.reportings.ReportingSourceDataOutput.Companion.fromReportingSourceDTO
 import org.locationtech.jts.geom.Geometry
@@ -37,7 +37,7 @@ data class MissionAttachedReportingDataOutput(
     val missionId: Int? = null,
 ) {
     companion object {
-        fun fromReportingDTO(dto: ReportingDTO): MissionAttachedReportingDataOutput {
+        fun fromReportingDTO(dto: ReportingDetailsDTO): MissionAttachedReportingDataOutput {
             requireNotNull(dto.reporting.id) { "ReportingEntity.id cannot be null" }
             return MissionAttachedReportingDataOutput(
                 id = dto.reporting.id,