From 5379dc4c1e01f578f10bcc3e0f30c9c1ec894d81 Mon Sep 17 00:00:00 2001 From: Claire Dagan Date: Tue, 21 Jan 2025 10:47:50 +0100 Subject: [PATCH] [Tech] rename DTOs --- .../domain/repositories/IMissionRepository.kt | 10 +++--- .../repositories/IReportingRepository.kt | 14 ++++---- ...eMissionWithActionsAndAttachedReporting.kt | 4 +-- .../use_cases/missions/GetFullMission.kt | 4 +-- ...FullMissionWithFishAndRapportNavActions.kt | 4 +-- .../use_cases/missions/GetFullMissions.kt | 6 ++-- .../missions/GetMissionAndSourceAction.kt | 10 +++--- .../GetMissionWithRapportNavActions.kt | 8 ++--- .../domain/use_cases/missions/PatchMission.kt | 4 +-- .../{MissionDTO.kt => MissionDetailsDTO.kt} | 6 ++-- .../{MissionsDTO.kt => MissionListDTO.kt} | 2 +- .../reportings/CreateOrUpdateReporting.kt | 4 +-- .../use_cases/reportings/GetReportingById.kt | 4 +-- .../use_cases/reportings/GetReportings.kt | 4 +-- .../reportings/GetReportingsByIds.kt | 4 +-- ...ReportingDTO.kt => ReportingDetailsDTO.kt} | 2 +- .../{ReportingsDTO.kt => ReportingListDTO.kt} | 2 +- .../reportings/events/UpdateReportingEvent.kt | 4 +-- .../outputs/AttachedReportingDataOutput.kt | 4 +-- .../MissionAttachedReportingDataOutput.kt | 4 +-- .../bff/outputs/missions/MissionDataOutput.kt | 4 +-- .../outputs/missions/MissionsDataOutput.kt | 4 +-- .../outputs/reportings/ReportingDataOutput.kt | 4 +-- .../reportings/ReportingsDataOutput.kt | 4 +-- .../publicapi/outputs/MissionDataOutput.kt | 4 +-- ...nWithFishAndRapportNavActionsDataOutput.kt | 4 +-- .../MissionWithRapportNavActionsDataOutput.kt | 4 +-- .../api/endpoints/bff/v1/Missions.kt | 2 +- .../database/model/MissionModel.kt | 14 ++++---- .../reportings/AbstractReportingModel.kt | 12 +++---- .../repositories/JpaMissionRepository.kt | 12 +++---- .../repositories/JpaReportingRepository.kt | 24 ++++++------- .../BypassActionCheckAndDeleteMissionUTest.kt | 14 ++++---- .../CreateOrUpdateEnvActionsUTests.kt | 12 +++---- .../missions/CreateOrUpdateMissionUTests.kt | 14 +++----- ...onWithActionsAndAttachedReportingUTests.kt | 26 ++++++-------- .../use_cases/missions/DeleteMissionUTests.kt | 14 ++++---- .../missions/GetEngagedControlUnitsUTests.kt | 6 ++-- .../use_cases/missions/GetFullMissionUTest.kt | 4 +-- ...issionWithFishAndRapportNavActionsUTest.kt | 8 ++--- .../GetMissionWithRapportNavActionsUTests.kt | 8 ++--- .../use_cases/missions/PatchMissionUTest.kt | 6 ++-- .../domain/use_cases/missions/TestUtils.kt | 10 +++--- .../missions/fixtures/MissionFixture.kt | 8 ++--- .../CreateOrUpdateReportingUTests.kt | 11 +++--- .../reportings/GetReportingByIdUTest.kt | 4 +-- .../reportings/GetReportingsByIdsUTest.kt | 5 +-- .../reportings/GetReportingsUTest.kt | 6 ++-- .../reportings/fixtures/ReportingFixture.kt | 16 ++++----- .../api/endpoints/bff/v1/MissionsITests.kt | 36 +++++++++++-------- .../api/endpoints/bff/v1/ReportingsITests.kt | 22 ++++++------ .../publicapi/ApiLegacyMissionsITests.kt | 21 +++-------- .../endpoints/publicapi/v2/MissionsITest.kt | 16 ++++----- .../JpaMissionRepositoryITests.kt | 16 ++++----- 54 files changed, 231 insertions(+), 248 deletions(-) rename backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/{MissionDTO.kt => MissionDetailsDTO.kt} (89%) rename backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/{MissionsDTO.kt => MissionListDTO.kt} (88%) rename backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/{ReportingDTO.kt => ReportingDetailsDTO.kt} (94%) rename backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/{ReportingsDTO.kt => ReportingListDTO.kt} (94%) 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 index d218bb73e2..c550658c18 100644 --- 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,8 +3,8 @@ 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 { @@ -12,7 +12,7 @@ interface IMissionRepository { 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 + ): List fun findAll( controlUnitIds: List? = null, @@ -48,5 +48,5 @@ interface IMissionRepository { fun findByControlUnitResourceId(controlUnitResourceId: Int): List - 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 index da12e11a0f..98974c633e 100644 --- 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?, isAttachedToMission: Boolean?, searchQuery: String?, - ): List + ): List fun findByControlUnitId(controlUnitId: Int): List - fun findByMissionId(missionId: Int): List + fun findByMissionId(missionId: Int): List - fun findById(reportingId: Int): ReportingDTO + fun findById(reportingId: Int): ReportingDetailsDTO - fun findAllById(reportingId: List): List + fun findAllById(reportingId: List): List - fun save(reporting: ReportingEntity): ReportingDTO + fun save(reporting: ReportingEntity): ReportingDetailsDTO fun findAllIdsByGeometry(geometry: Geometry): List } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionWithActionsAndAttachedReporting.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionWithActionsAndAttachedReporting.kt index 30b622e7aa..751fbd21e9 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionWithActionsAndAttachedReporting.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/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, envActionsAttachedToReportingIds: List, - ): Pair { + ): Pair { 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 index d7c482630a..4dfe2ba570 100644 --- 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/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionWithFishAndRapportNavActions.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionWithFishAndRapportNavActions.kt index 11b83f156b..a9a3cd8d45 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionWithFishAndRapportNavActions.kt +++ b/backend/src/main/kotlin/fr/gouv/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 { + fun execute(missionId: Int): Pair { logger.info("GET full mission $missionId with fish and rapport nav action") getFullMission.execute(missionId).let { try { diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissions.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissions.kt index 9ed835ae53..1f87a4eab3 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissions.kt +++ b/backend/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?, searchQuery: String?, - ): List { + ): List { + logger.info("Attempt to GET all full missions") + val missions = missionRepository.findAllFullMissions( startedAfter = diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionAndSourceAction.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionAndSourceAction.kt index aa7924c2ba..64d6e80a52 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionAndSourceAction.kt +++ b/backend/src/main/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,11 +18,11 @@ 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( @@ -30,12 +30,12 @@ class GetMissionAndSourceAction( ), ) - 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/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionWithRapportNavActions.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionWithRapportNavActions.kt index 85da6ee671..2d6891a8bb 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionWithRapportNavActions.kt +++ b/backend/src/main/kotlin/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 index 61812339c9..c705c03024 100644 --- 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/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionDTO.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionDetailsDTO.kt similarity index 89% rename from backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionDTO.kt rename to backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionDetailsDTO.kt index badac491f2..6d381688f8 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionDTO.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_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? = listOf(), - val attachedReportings: List? = listOf(), + val attachedReportings: List? = listOf(), val attachedReportingIds: List? = listOf(), val detachedReportings: List? = listOf(), val detachedReportingIds: List? = listOf(), diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionsDTO.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionListDTO.kt similarity index 88% rename from backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionsDTO.kt rename to backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionListDTO.kt index 73b4afce58..ca6e74e8ad 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/dtos/MissionsDTO.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/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, ) diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/CreateOrUpdateReporting.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/CreateOrUpdateReporting.kt index 73db477c03..59ba001ff4 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/CreateOrUpdateReporting.kt +++ b/backend/src/main/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/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingById.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingById.kt index 073cc03ef3..f066dec11e 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingById.kt +++ b/backend/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/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportings.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportings.kt index ab7131cc16..cc5ee612e8 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportings.kt +++ b/backend/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?, isAttachedToMission: Boolean?, searchQuery: String?, - ): List { + ): List { logger.info("Attempt to get reportings with criteria") val now = ZonedDateTime.now() val reports = diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsByIds.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsByIds.kt index 5a6353405d..264357ddf1 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsByIds.kt +++ b/backend/src/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): List { + fun execute(ids: List): List { logger.info("GET reportings $ids") val reportings = reportingRepository.findAllById(ids) diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingDTO.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingDetailsDTO.kt similarity index 94% rename from backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingDTO.kt rename to backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingDetailsDTO.kt index 70023ea8b1..d4629e4e23 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingDTO.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/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, val attachedMission: MissionEntity? = null, diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingsDTO.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingListDTO.kt similarity index 94% rename from backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingsDTO.kt rename to backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingListDTO.kt index bff6f5e0e0..85831b4ad8 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/dtos/ReportingsDTO.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_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, val attachedMission: MissionEntity? = null, diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/events/UpdateReportingEvent.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/events/UpdateReportingEvent.kt index cba7bfbf97..7a0128aeef 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/events/UpdateReportingEvent.kt +++ b/backend/src/main/kotlin/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/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/AttachedReportingDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/AttachedReportingDataOutput.kt index b716ec1f48..e2f2cc172d 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/AttachedReportingDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/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/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionAttachedReportingDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionAttachedReportingDataOutput.kt index de8dce20c5..ad533a249d 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionAttachedReportingDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/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, diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionDataOutput.kt index fcd88e717e..1904c9d881 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionDataOutput.kt @@ -7,7 +7,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.ActionTypeEnum import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionNoteEntity import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.EnvActionControlEntity import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionSurveillance.EnvActionSurveillanceEntity -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.actions.EnvActionControlDataOutput import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.actions.EnvActionDataOutput import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.actions.EnvActionNoteDataOutput @@ -44,7 +44,7 @@ data class MissionDataOutput( val hasRapportNavActions: RapportNavMissionActionDataOutput? = null, ) { companion object { - fun fromMissionDTO(dto: MissionDTO): MissionDataOutput { + fun fromMissionDTO(dto: MissionDetailsDTO): MissionDataOutput { requireNotNull(dto.mission.id) { "a mission must have an id" } return MissionDataOutput( diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionsDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionsDataOutput.kt index 2b7e09315b..dc8d1722e5 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionsDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/missions/MissionsDataOutput.kt @@ -3,7 +3,7 @@ package fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.mission import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.LegacyControlUnitEntity 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.MissionsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionListDTO import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.actions.EnvActionDataOutput import org.locationtech.jts.geom.MultiPolygon import java.time.ZonedDateTime @@ -28,7 +28,7 @@ data class MissionsDataOutput( val isGeometryComputedFromControls: Boolean, ) { companion object { - fun fromMissionDTO(dto: MissionsDTO): MissionsDataOutput { + fun fromMissionListDTO(dto: MissionListDTO): MissionsDataOutput { requireNotNull(dto.mission.id) { "a mission must have an id" } return MissionsDataOutput( diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingDataOutput.kt index fccdc94849..a89e233ac4 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingDataOutput.kt @@ -5,7 +5,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.reporting.ControlStatusEnum 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.Companion.fromReportingSourceDTO import org.locationtech.jts.geom.Geometry import java.time.ZonedDateTime @@ -42,7 +42,7 @@ data class ReportingDataOutput( val isInfractionProven: Boolean, ) { companion object { - fun fromReportingDTO(dto: ReportingDTO): ReportingDataOutput { + fun fromReportingDTO(dto: ReportingDetailsDTO): ReportingDataOutput { requireNotNull(dto.reporting.id) { "ReportingEntity.id cannot be null" } return ReportingDataOutput( id = dto.reporting.id, diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingsDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingsDataOutput.kt index d4852eeecd..28f292d83b 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingsDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/reportings/ReportingsDataOutput.kt @@ -5,7 +5,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.reporting.ControlStatusEnum 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.ReportingsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingListDTO import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.reportings.ReportingSourceDataOutput.Companion.fromReportingSourceDTO import org.locationtech.jts.geom.Geometry import java.time.ZonedDateTime @@ -41,7 +41,7 @@ data class ReportingsDataOutput( val isInfractionProven: Boolean, ) { companion object { - fun fromReportingDTO(dto: ReportingsDTO): ReportingsDataOutput { + fun fromReportingDTO(dto: ReportingListDTO): ReportingsDataOutput { requireNotNull(dto.reporting.id) { "ReportingEntity.id cannot be null" } return ReportingsDataOutput( id = dto.reporting.id, diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionDataOutput.kt index 506c5f87a2..fa47a90211 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionDataOutput.kt @@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.LegacyControlUnitEnt 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.MissionDetailsDTO import org.locationtech.jts.geom.MultiPolygon import java.time.ZonedDateTime @@ -60,7 +60,7 @@ data class MissionDataOutput( ) } - fun fromMissionDTO(missionDto: MissionDTO): MissionDataOutput { + fun fromMissionDTO(missionDto: MissionDetailsDTO): MissionDataOutput { requireNotNull(missionDto.mission.id) { "a mission must have an id" } return MissionDataOutput( diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionWithFishAndRapportNavActionsDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionWithFishAndRapportNavActionsDataOutput.kt index 8589350729..6fedbaf32a 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionWithFishAndRapportNavActionsDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionWithFishAndRapportNavActionsDataOutput.kt @@ -3,7 +3,7 @@ package fr.gouv.cacem.monitorenv.infrastructure.api.adapters.publicapi.outputs import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.LegacyControlUnitEntity 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.MissionDetailsDTO import fr.gouv.cacem.monitorenv.infrastructure.monitorfish.adapters.MonitorFishMissionActionDataOutput import fr.gouv.cacem.monitorenv.infrastructure.rapportnav.adapters.RapportNavMissionActionDataOutput import org.locationtech.jts.geom.MultiPolygon @@ -33,7 +33,7 @@ data class MissionWithFishAndRapportNavActionsDataOutput( val fishActions: List? = listOf(), ) : MissionOutput { companion object { - fun fromMissionDTO(missionDto: MissionDTO): MissionWithFishAndRapportNavActionsDataOutput { + fun fromMissionDTO(missionDto: MissionDetailsDTO): MissionWithFishAndRapportNavActionsDataOutput { requireNotNull(missionDto.mission.id) { "a mission must have an id" } return MissionWithFishAndRapportNavActionsDataOutput( diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionWithRapportNavActionsDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionWithRapportNavActionsDataOutput.kt index 34cf3a5fa0..e3e14b2978 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionWithRapportNavActionsDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/outputs/MissionWithRapportNavActionsDataOutput.kt @@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.LegacyControlUnitEnt 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.MissionDetailsDTO import fr.gouv.cacem.monitorenv.infrastructure.rapportnav.adapters.RapportNavMissionActionDataOutput import org.locationtech.jts.geom.MultiPolygon import java.time.ZonedDateTime @@ -62,7 +62,7 @@ data class MissionWithRapportNavActionsDataOutput( ) } - fun fromMissionDTO(missionDto: MissionDTO): MissionWithRapportNavActionsDataOutput { + fun fromMissionDTO(missionDto: MissionDetailsDTO): MissionWithRapportNavActionsDataOutput { requireNotNull(missionDto.mission.id) { "a mission must have an id" } return MissionWithRapportNavActionsDataOutput( diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/Missions.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/Missions.kt index 2bcb3453b9..30196a2867 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/Missions.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/Missions.kt @@ -129,7 +129,7 @@ class Missions( seaFronts = seaFronts, searchQuery = searchQuery, ) - return missions.map { MissionsDataOutput.fromMissionDTO(it) } + return missions.map { MissionsDataOutput.fromMissionListDTO(it) } } // TODO Return a ControlUnitDataOutput once the LegacyControlUnitEntity to ControlUnitEntity diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionModel.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionModel.kt index bd3ca5398b..5b13867a45 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionModel.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionModel.kt @@ -11,8 +11,8 @@ 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.EnvActionAttachedToReportingIds -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 fr.gouv.cacem.monitorenv.infrastructure.database.model.reportings.ReportingModel import jakarta.persistence.* import org.hibernate.Hibernate @@ -272,7 +272,7 @@ class MissionModel( return buildMissionEntity(null, objectMapper) } - fun toMissionDTO(objectMapper: ObjectMapper): MissionDTO { + fun toMissionDTO(objectMapper: ObjectMapper): MissionDetailsDTO { val envActionsAttachedToReportingIds = attachedReportings?.filter { it.attachedEnvAction != null }?.fold( mutableListOf(), @@ -311,7 +311,7 @@ class MissionModel( return@fold listOfActionsAttached } ?: listOf() - return MissionDTO( + return MissionDetailsDTO( mission = this.toMissionEntity(objectMapper), attachedReportingIds = this.attachedReportings @@ -321,7 +321,7 @@ class MissionModel( attachedReportings = this.attachedReportings ?.filter { it.detachedFromMissionAtUtc == null } - ?.map { it.toReportingDTO(objectMapper) } + ?.map { it.toReportingDetailsDTO(objectMapper) } ?: listOf(), detachedReportings = this.attachedReportings @@ -351,8 +351,8 @@ class MissionModel( return buildMissionEntity(mappedControlUnits, objectMapper) } - fun toMissionsDTO(objectMapper: ObjectMapper): MissionsDTO { - return MissionsDTO( + fun toMissionListDTO(objectMapper: ObjectMapper): MissionListDTO { + return MissionListDTO( mission = this.toMissionsEntity(objectMapper), attachedReportingIds = this.attachedReportings diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/reportings/AbstractReportingModel.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/reportings/AbstractReportingModel.kt index b89a86138b..1068b50c3b 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/reportings/AbstractReportingModel.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/reportings/AbstractReportingModel.kt @@ -10,8 +10,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.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.ReportingsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingListDTO import fr.gouv.cacem.monitorenv.infrastructure.database.model.* import io.hypersistence.utils.hibernate.type.json.JsonBinaryType import jakarta.persistence.* @@ -144,9 +144,9 @@ abstract class AbstractReportingModel( isInfractionProven = isInfractionProven, ) - fun toReportingsDTO(objectMapper: ObjectMapper): ReportingsDTO { + fun toReportingListDTO(objectMapper: ObjectMapper): ReportingListDTO { val reporting = this.toReporting() - return ReportingsDTO( + return ReportingListDTO( reporting = reporting, reportingSources = reportingSources.map { it.toReportingSourceDTO() }, attachedMission = @@ -161,9 +161,9 @@ abstract class AbstractReportingModel( ) } - fun toReportingDTO(objectMapper: ObjectMapper): ReportingDTO { + fun toReportingDetailsDTO(objectMapper: ObjectMapper): ReportingDetailsDTO { val reporting = this.toReporting() - return ReportingDTO( + return ReportingDetailsDTO( reporting = reporting, reportingSources = reportingSources.map { it.toReportingSourceDTO() }, attachedMission = diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepository.kt index 5fe57cbedb..2f8426e9d3 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepository.kt @@ -6,8 +6,8 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionSourceEnum import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionTypeEnum import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.EnvActionControlEntity 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.MissionsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionListDTO import fr.gouv.cacem.monitorenv.infrastructure.database.model.MissionModel import fr.gouv.cacem.monitorenv.infrastructure.database.repositories.interfaces.* import org.apache.commons.lang3.StringUtils @@ -48,7 +48,7 @@ class JpaMissionRepository( startedAfter: Instant, startedBefore: Instant?, searchQuery: String?, - ): List { + ): List { val pageable = if (pageNumber != null && pageSize != null) { PageRequest.of(pageNumber, pageSize) @@ -67,7 +67,7 @@ class JpaMissionRepository( startedAfter = startedAfter, startedBefore = startedBefore, ) - .map { it.toMissionsDTO(mapper) }.filter { findBySearchQuery(it.mission, searchQuery) } + .map { it.toMissionListDTO(mapper) }.filter { findBySearchQuery(it.mission, searchQuery) } } @Transactional @@ -161,7 +161,7 @@ class JpaMissionRepository( } @Transactional - override fun findFullMissionById(missionId: Int): MissionDTO? { + override fun findFullMissionById(missionId: Int): MissionDetailsDTO? { return dbMissionRepository.findByIdOrNull(missionId)?.toMissionDTO(mapper) } @@ -171,7 +171,7 @@ class JpaMissionRepository( } @Transactional - override fun save(mission: MissionEntity): MissionDTO { + override fun save(mission: MissionEntity): MissionDetailsDTO { // Extract all control units resources unique control unit resource IDs val uniqueControlUnitResourceIds = mission.controlUnits diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepository.kt index 0c085f4c8d..5fc5a0205a 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepository.kt @@ -7,8 +7,8 @@ import fr.gouv.cacem.monitorenv.domain.entities.reporting.SourceTypeEnum import fr.gouv.cacem.monitorenv.domain.entities.reporting.TargetTypeEnum import fr.gouv.cacem.monitorenv.domain.exceptions.NotFoundException 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.ReportingsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingListDTO import fr.gouv.cacem.monitorenv.infrastructure.database.model.ReportingSourceModel import fr.gouv.cacem.monitorenv.infrastructure.database.model.ReportingsControlPlanSubThemeModel import fr.gouv.cacem.monitorenv.infrastructure.database.model.reportings.AbstractReportingModel.Companion.fromReportingEntity @@ -62,13 +62,13 @@ class JpaReportingRepository( } // FIXME (25/07/2024) : passer par le findByIdOrNull et refacto - override fun findById(reportingId: Int): ReportingDTO { - return dbReportingRepository.findById(reportingId).get().toReportingDTO(mapper) + override fun findById(reportingId: Int): ReportingDetailsDTO { + return dbReportingRepository.findById(reportingId).get().toReportingDetailsDTO(mapper) } @Transactional - override fun findAllById(reportingId: List): List { - return dbReportingRepository.findAllById(reportingId).map { it.toReportingDTO(mapper) } + override fun findAllById(reportingId: List): List { + return dbReportingRepository.findAllById(reportingId).map { it.toReportingDetailsDTO(mapper) } } @Transactional @@ -84,7 +84,7 @@ class JpaReportingRepository( targetTypes: List?, isAttachedToMission: Boolean?, searchQuery: String?, - ): List { + ): List { val pageable = if (pageNumber != null && pageSize != null) { PageRequest.of(pageNumber, pageSize) @@ -102,7 +102,7 @@ class JpaReportingRepository( targetTypes = targetTypes, isAttachedToMission = isAttachedToMission, ) - .map { it.toReportingsDTO(mapper) }.filter { findBySearchQuery(it.reporting, searchQuery) } + .map { it.toReportingListDTO(mapper) }.filter { findBySearchQuery(it.reporting, searchQuery) } } private fun findBySearchQuery( @@ -138,13 +138,13 @@ class JpaReportingRepository( return dbReportingRepository.findByControlUnitId(controlUnitId).map { it.toReporting() } } - override fun findByMissionId(missionId: Int): List { - return dbReportingRepository.findByMissionId(missionId).map { it.toReportingDTO(mapper) } + override fun findByMissionId(missionId: Int): List { + return dbReportingRepository.findByMissionId(missionId).map { it.toReportingDetailsDTO(mapper) } } @Transactional @Modifying(clearAutomatically = true, flushAutomatically = true) - override fun save(reporting: ReportingEntity): ReportingDTO { + override fun save(reporting: ReportingEntity): ReportingDetailsDTO { return try { val missionReference = if (reporting.missionId != null) { @@ -232,7 +232,7 @@ class JpaReportingRepository( ) } - dbReportingRepository.saveAndFlush(reportingModel).toReportingDTO(mapper) + dbReportingRepository.saveAndFlush(reportingModel).toReportingDetailsDTO(mapper) } catch (e: JpaObjectRetrievalFailureException) { throw NotFoundException( "Invalid reference to semaphore, control unit or mission: not found in referential", diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/BypassActionCheckAndDeleteMissionUTest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/BypassActionCheckAndDeleteMissionUTest.kt index d7859c4684..99dc5202d3 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/BypassActionCheckAndDeleteMissionUTest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/BypassActionCheckAndDeleteMissionUTest.kt @@ -6,7 +6,7 @@ import com.nhaarman.mockitokotlin2.verify import fr.gouv.cacem.monitorenv.domain.repositories.IMissionRepository import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository import fr.gouv.cacem.monitorenv.domain.use_cases.missions.fixtures.MissionFixture -import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingDetailsDTO import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -14,7 +14,7 @@ import org.mockito.Mockito.mock import org.springframework.boot.test.system.CapturedOutput import org.springframework.boot.test.system.OutputCaptureExtension import java.time.ZonedDateTime -import java.util.UUID +import java.util.* @ExtendWith(OutputCaptureExtension::class) class BypassActionCheckAndDeleteMissionUTest { @@ -30,16 +30,16 @@ class BypassActionCheckAndDeleteMissionUTest { val missionId = 1 val attachedReportingIds = listOf(1) given(getFullMission.execute(missionId)).willReturn( - MissionFixture.aMissionDTO(attachedReportingIds = attachedReportingIds), + MissionFixture.aMissionDetailsDTO(attachedReportingIds = attachedReportingIds), ) val attachedEnvActionId = UUID.randomUUID() - val aReportingDTO = aReportingDTO(id = 1, attachedEnvActionId = attachedEnvActionId) - given(reportingRepository.findById(attachedReportingIds[0])).willReturn(aReportingDTO) + val aReportingDetailsDTO = aReportingDetailsDTO(id = 1, attachedEnvActionId = attachedEnvActionId) + given(reportingRepository.findById(attachedReportingIds[0])).willReturn(aReportingDetailsDTO) val detachedFromMissionAtUtc = ZonedDateTime.now() val savedReporting = - aReportingDTO( + aReportingDetailsDTO( reporting = - aReportingDTO.reporting.copy( + aReportingDetailsDTO.reporting.copy( detachedFromMissionAtUtc = detachedFromMissionAtUtc, attachedEnvActionId = null, ), diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateEnvActionsUTests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateEnvActionsUTests.kt index 24599a3a3c..5c7745a715 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateEnvActionsUTests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateEnvActionsUTests.kt @@ -1,10 +1,6 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.missions -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argThat -import com.nhaarman.mockitokotlin2.given -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify +import com.nhaarman.mockitokotlin2.* 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 @@ -15,7 +11,7 @@ import fr.gouv.cacem.monitorenv.domain.repositories.IDepartmentAreaRepository import fr.gouv.cacem.monitorenv.domain.repositories.IFacadeAreasRepository import fr.gouv.cacem.monitorenv.domain.repositories.IMissionRepository import fr.gouv.cacem.monitorenv.domain.repositories.IPostgisFunctionRepository -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -28,7 +24,7 @@ import org.springframework.boot.test.system.CapturedOutput import org.springframework.boot.test.system.OutputCaptureExtension import org.springframework.test.context.junit.jupiter.SpringExtension import java.time.ZonedDateTime -import java.util.UUID +import java.util.* @ExtendWith(SpringExtension::class) @ExtendWith(OutputCaptureExtension::class) @@ -158,7 +154,7 @@ class CreateOrPatchEnvActionsUTests { given(facadeAreasRepository.findFacadeFromGeometry(anyOrNull())).willReturn("La Face Ade") given(departmentRepository.findDepartmentFromGeometry(anyOrNull())).willReturn("Quequ'part") given(missionRepository.save(anyOrNull())) - .willReturn(MissionDTO(mission = expectedUpdatedMission)) + .willReturn(MissionDetailsDTO(mission = expectedUpdatedMission)) // When val createdMission = diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionUTests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionUTests.kt index a2689cda54..e3ed7c243b 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionUTests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionUTests.kt @@ -1,10 +1,6 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.missions -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argThat -import com.nhaarman.mockitokotlin2.given -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify +import com.nhaarman.mockitokotlin2.* 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 @@ -14,7 +10,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionSurve import fr.gouv.cacem.monitorenv.domain.repositories.IFacadeAreasRepository import fr.gouv.cacem.monitorenv.domain.repositories.IMissionRepository import fr.gouv.cacem.monitorenv.domain.repositories.IPostgisFunctionRepository -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -28,7 +24,7 @@ import org.springframework.boot.test.system.OutputCaptureExtension import org.springframework.context.ApplicationEventPublisher import org.springframework.test.context.junit.jupiter.SpringExtension import java.time.ZonedDateTime -import java.util.UUID +import java.util.* @ExtendWith(SpringExtension::class) @ExtendWith(OutputCaptureExtension::class) @@ -142,7 +138,7 @@ class CreateOrUpdateMissionUTests { }, ), ) - .willReturn(MissionDTO(mission = expectedCreatedMission)) + .willReturn(MissionDetailsDTO(mission = expectedCreatedMission)) // When val createdMission = @@ -216,7 +212,7 @@ class CreateOrUpdateMissionUTests { given(missionRepository.findById(100)) .willReturn(missionToUpdate.copy(createdAtUtc = ZonedDateTime.parse("2022-01-23T20:29:03Z"))) given(missionRepository.save(anyOrNull())) - .willReturn(MissionDTO(mission = returnedSavedMission)) + .willReturn(MissionDetailsDTO(mission = returnedSavedMission)) // When val createdMission = diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionWithActionsAndAttachedReportingUTests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionWithActionsAndAttachedReportingUTests.kt index 08f061189e..f8676a6991 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionWithActionsAndAttachedReportingUTests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMissionWithActionsAndAttachedReportingUTests.kt @@ -1,10 +1,6 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.missions -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.given -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions +import com.nhaarman.mockitokotlin2.* 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 @@ -14,7 +10,7 @@ import fr.gouv.cacem.monitorenv.domain.repositories.IMissionRepository import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository import fr.gouv.cacem.monitorenv.domain.use_cases.missions.TestUtils.getReportingDTO import fr.gouv.cacem.monitorenv.domain.use_cases.missions.TestUtils.getReportingDTOWithAttachedMission -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import fr.gouv.cacem.monitorenv.domain.use_cases.missions.fixtures.MissionFixture.Companion.aMissionEntity import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy @@ -28,7 +24,7 @@ import org.springframework.boot.test.system.CapturedOutput import org.springframework.boot.test.system.OutputCaptureExtension import org.springframework.test.context.junit.jupiter.SpringExtension import java.time.ZonedDateTime -import java.util.UUID +import java.util.* @ExtendWith(SpringExtension::class) @ExtendWith(OutputCaptureExtension::class) @@ -64,14 +60,14 @@ class CreateOrUpdateMissionWithActionsAndAttachedReportingUTests { val attachedReportingIds = listOf(1, 2, 3) val expectedCreatedMission = - MissionDTO( + MissionDetailsDTO( mission = aMissionEntity(), attachedReportingIds = attachedReportingIds, ) given(createOrUpdateMission.execute(anyOrNull())).willReturn(missionToCreate.copy(id = 100)) given(missionRepository.save(anyOrNull())) - .willReturn(MissionDTO(mission = missionToCreate.copy(id = 100))) + .willReturn(MissionDetailsDTO(mission = missionToCreate.copy(id = 100))) given(reportingRepository.findById(1)).willReturn(getReportingDTO(1)) given(reportingRepository.findById(2)).willReturn(getReportingDTO(2)) given(reportingRepository.findById(3)).willReturn(getReportingDTO(3)) @@ -160,7 +156,7 @@ class CreateOrUpdateMissionWithActionsAndAttachedReportingUTests { val attachedReportingIds = listOf(1, 2, 3) val expectedCreatedMission = - MissionDTO( + MissionDetailsDTO( mission = MissionEntity( id = 100, @@ -184,7 +180,7 @@ class CreateOrUpdateMissionWithActionsAndAttachedReportingUTests { given(createOrUpdateMission.execute(anyOrNull())).willReturn(missionToCreate) given(missionRepository.save(anyOrNull())) - .willReturn(MissionDTO(mission = missionToCreate.copy(id = 100))) + .willReturn(MissionDetailsDTO(mission = missionToCreate.copy(id = 100))) given(reportingRepository.findById(1)).willReturn(getReportingDTO(1)) given(reportingRepository.findById(2)).willReturn(getReportingDTO(2)) given(reportingRepository.findById(3)).willReturn(getReportingDTO(3)) @@ -245,11 +241,11 @@ class CreateOrUpdateMissionWithActionsAndAttachedReportingUTests { // Given val missionToCreate = aMissionEntity(id = 100) - val expectedCreatedMission = MissionDTO(mission = aMissionEntity()) + val expectedCreatedMission = MissionDetailsDTO(mission = aMissionEntity()) given(createOrUpdateMission.execute(anyOrNull())).willReturn(missionToCreate) given(missionRepository.save(anyOrNull())) - .willReturn(MissionDTO(mission = missionToCreate.copy(id = 100))) + .willReturn(MissionDetailsDTO(mission = missionToCreate.copy(id = 100))) given(getFullMissionWithFishAndRapportNavActions.execute(100)).willReturn(Pair(false, expectedCreatedMission)) // When @@ -276,11 +272,11 @@ class CreateOrUpdateMissionWithActionsAndAttachedReportingUTests { fun `Should create a mission doesn't call getFullMissionWithFishAndRapportNavActions`() { val missionToCreate = aMissionEntity(id = null) - val expectedCreatedMission = MissionDTO(aMissionEntity(100)) + val expectedCreatedMission = MissionDetailsDTO(aMissionEntity(100)) given(createOrUpdateMission.execute(anyOrNull())).willReturn(missionToCreate.copy(id = 100)) given(missionRepository.save(anyOrNull())) - .willReturn(MissionDTO(mission = missionToCreate.copy(id = 100))) + .willReturn(MissionDetailsDTO(mission = missionToCreate.copy(id = 100))) given(getFullMission.execute(100)).willReturn(expectedCreatedMission) // When diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/DeleteMissionUTests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/DeleteMissionUTests.kt index 7955f932bf..533974d17f 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/DeleteMissionUTests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/DeleteMissionUTests.kt @@ -11,9 +11,9 @@ 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.repositories.IReportingRepository -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import fr.gouv.cacem.monitorenv.domain.use_cases.missions.fixtures.MissionFixture.Companion.aMissionEntity -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.fixtures.ReportingFixture.Companion.aReporting import org.assertj.core.api.Assertions import org.assertj.core.api.Assertions.assertThat @@ -46,20 +46,20 @@ class DeleteMissionUTests { .willReturn(CanDeleteMissionResponse(true, listOf())) given(getFullMission.execute(missionId)) .willReturn( - MissionDTO( + MissionDetailsDTO( mission = missionToDelete, attachedReportingIds = listOf(1), ), ) given(reportingRepository.findById(1)).willReturn( - ReportingDTO( + ReportingDetailsDTO( reporting = reporting, reportingSources = listOf(), ), ) given(reportingRepository.save(expectedUpdatedReporting)) .willReturn( - ReportingDTO(reporting = expectedUpdatedReporting, reportingSources = listOf()), + ReportingDetailsDTO(reporting = expectedUpdatedReporting, reportingSources = listOf()), ) deleteMission.execute(missionId, MissionSourceEnum.MONITORFISH) @@ -86,7 +86,7 @@ class DeleteMissionUTests { .willReturn(CanDeleteMissionResponse(false, listOf(MissionSourceEnum.MONITORENV))) given(getFullMission.execute(missionId)) .willReturn( - MissionDTO( + MissionDetailsDTO( mission = missionToDelete, attachedReportingIds = null, ), @@ -121,7 +121,7 @@ class DeleteMissionUTests { .willReturn(CanDeleteMissionResponse(true, listOf())) given(getFullMission.execute(missionId)) .willReturn( - MissionDTO( + MissionDetailsDTO( mission = missionToDelete, attachedReportingIds = listOf(), ), diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetEngagedControlUnitsUTests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetEngagedControlUnitsUTests.kt index ef85bac60f..266f58fe43 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetEngagedControlUnitsUTests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetEngagedControlUnitsUTests.kt @@ -6,7 +6,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.LegacyControlUnitEnt 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.MissionsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionListDTO import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -42,7 +42,7 @@ class GetEngagedControlUnitsUTests { name = "Control Unit Name", ) val firstMission = - MissionsDTO( + MissionListDTO( mission = MissionEntity( id = 10, @@ -66,7 +66,7 @@ class GetEngagedControlUnitsUTests { attachedReportingIds = listOf(), ) val secondMission = - MissionsDTO( + MissionListDTO( mission = MissionEntity( id = 10, diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionUTest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionUTest.kt index c5d3bd1e62..04f7032ff2 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionUTest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionUTest.kt @@ -4,7 +4,7 @@ import com.nhaarman.mockitokotlin2.given 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.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import fr.gouv.cacem.monitorenv.domain.use_cases.missions.fixtures.MissionFixture import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -38,7 +38,7 @@ class GetFullMissionUTest { fun `execute should return a mission`(log: CapturedOutput) { // Given val missionId = Random.nextInt() - val missionFromDatabase = MissionDTO(MissionFixture.aMissionEntity()) + val missionFromDatabase = MissionDetailsDTO(MissionFixture.aMissionEntity()) given(missionRepository.findFullMissionById(missionId)).willReturn(missionFromDatabase) // When diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionWithFishAndRapportNavActionsUTest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionWithFishAndRapportNavActionsUTest.kt index 8d95a4fb8d..f0bfd1977b 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionWithFishAndRapportNavActionsUTest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetFullMissionWithFishAndRapportNavActionsUTest.kt @@ -5,7 +5,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.rapportnav.RapportNavMis import fr.gouv.cacem.monitorenv.domain.repositories.IMonitorFishMissionActionsRepository import fr.gouv.cacem.monitorenv.domain.repositories.IRapportNavMissionActionsRepository import fr.gouv.cacem.monitorenv.domain.use_cases.actions.fixtures.EnvActionFixture.Companion.aMonitorFishAction -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import fr.gouv.cacem.monitorenv.domain.use_cases.missions.fixtures.MissionFixture import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -36,7 +36,7 @@ class GetFullMissionWithFishAndRapportNavActionsUTest { // Given val missionId = 100 - val missionFromDatabase = MissionDTO(mission = MissionFixture.aMissionEntity()) + val missionFromDatabase = MissionDetailsDTO(mission = MissionFixture.aMissionEntity()) given(getFullMission.execute(missionId)).willReturn(missionFromDatabase) val fishActions = listOf(aMonitorFishAction(missionId)) @@ -62,7 +62,7 @@ class GetFullMissionWithFishAndRapportNavActionsUTest { // Given val missionId = 100 - val missionFromDatabase = MissionDTO(mission = MissionFixture.aMissionEntity()) + val missionFromDatabase = MissionDetailsDTO(mission = MissionFixture.aMissionEntity()) given(getFullMission.execute(missionId)).willReturn(missionFromDatabase) val fishActions = listOf(aMonitorFishAction(missionId)) @@ -86,7 +86,7 @@ class GetFullMissionWithFishAndRapportNavActionsUTest { // Given val missionId = 100 - val missionFromDatabase = MissionDTO(mission = MissionFixture.aMissionEntity()) + val missionFromDatabase = MissionDetailsDTO(mission = MissionFixture.aMissionEntity()) given(getFullMission.execute(missionId)).willReturn(missionFromDatabase) given(monitorFishMissionActionsRepository.findFishMissionActionsById(missionId)).willThrow( diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionWithRapportNavActionsUTests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionWithRapportNavActionsUTests.kt index c81d565954..8047d99886 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionWithRapportNavActionsUTests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionWithRapportNavActionsUTests.kt @@ -3,7 +3,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.missions import com.nhaarman.mockitokotlin2.given import fr.gouv.cacem.monitorenv.domain.entities.mission.rapportnav.RapportNavMissionActionEntity 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 fr.gouv.cacem.monitorenv.domain.use_cases.missions.fixtures.MissionFixture.Companion.aMissionEntity import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -26,7 +26,7 @@ class GetMissionWithRapportNavActionsUTests { val missionId = 10 val missionEntity = aMissionEntity() - val mission = MissionDTO(mission = missionEntity) + val mission = MissionDetailsDTO(mission = missionEntity) val rapportNavActions = RapportNavMissionActionEntity( id = 1, @@ -49,7 +49,7 @@ class GetMissionWithRapportNavActionsUTests { val missionId = 10 val missionEntity = aMissionEntity() - val mission = MissionDTO(mission = missionEntity) + val mission = MissionDetailsDTO(mission = missionEntity) given(getMission.execute(missionId)).willReturn(missionEntity) given(rapportNavMissionActionsRepository.findRapportNavMissionActionsById(missionId)).willThrow( @@ -65,7 +65,7 @@ class GetMissionWithRapportNavActionsUTests { fun `execute should return mission with hasRapportNavActions false when no actions are found`() { val missionId = 10 val missionEntity = aMissionEntity() - val mission = MissionDTO(mission = missionEntity) + val mission = MissionDetailsDTO(mission = missionEntity) val rapportNavActions = RapportNavMissionActionEntity( diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/PatchMissionUTest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/PatchMissionUTest.kt index 77261f45bf..8cbc1d11e0 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/PatchMissionUTest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/PatchMissionUTest.kt @@ -7,7 +7,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.PatchableMissionEntity 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 fr.gouv.cacem.monitorenv.domain.use_cases.missions.fixtures.MissionFixture.Companion.aMissionEntity import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -17,7 +17,7 @@ import org.mockito.Mockito.mock import org.springframework.boot.test.system.CapturedOutput import org.springframework.boot.test.system.OutputCaptureExtension import java.time.ZonedDateTime -import java.util.Optional +import java.util.* import kotlin.random.Random @ExtendWith(OutputCaptureExtension::class) @@ -50,7 +50,7 @@ class PatchMissionUTest { given(missionRepository.findById(id)).willReturn(missionFromDatabase) patchEntity.execute(missionFromDatabase, patchableMission) - given(missionRepository.save(missionPatched)).willReturn(MissionDTO(missionPatched)) + given(missionRepository.save(missionPatched)).willReturn(MissionDetailsDTO(missionPatched)) // When val savedMission = patchMission.execute(id, patchableMission) diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/TestUtils.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/TestUtils.kt index 7a5d58fa7f..f3f8daea5e 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/TestUtils.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/TestUtils.kt @@ -7,14 +7,14 @@ 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.entities.semaphore.SemaphoreEntity -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.dtos.ReportingSourceDTO import org.locationtech.jts.io.WKTReader import java.time.ZonedDateTime import java.util.UUID object TestUtils { - fun getReportingDTO(id: Int): ReportingDTO { + fun getReportingDTO(id: Int): ReportingDetailsDTO { val polygon = WKTReader() .read( @@ -30,7 +30,7 @@ object TestUtils { controlUnitId = null, sourceName = null, ) - return ReportingDTO( + return ReportingDetailsDTO( reporting = ReportingEntity( id = id, @@ -75,7 +75,7 @@ object TestUtils { ) } - fun getReportingDTOWithAttachedMission(id: Int): ReportingDTO { + fun getReportingDTOWithAttachedMission(id: Int): ReportingDetailsDTO { val polygon = WKTReader() .read( @@ -90,7 +90,7 @@ object TestUtils { controlUnitId = null, sourceName = null, ) - return ReportingDTO( + return ReportingDetailsDTO( reporting = ReportingEntity( id = id, diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/fixtures/MissionFixture.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/fixtures/MissionFixture.kt index 9be7ce4498..49ec57bfce 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/fixtures/MissionFixture.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/fixtures/MissionFixture.kt @@ -4,7 +4,7 @@ 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.entities.mission.envAction.EnvActionEntity -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import java.time.ZonedDateTime import kotlin.random.Random @@ -36,11 +36,11 @@ class MissionFixture { ) } - fun aMissionDTO( + fun aMissionDetailsDTO( missionEntity: MissionEntity = aMissionEntity(), attachedReportingIds: List = listOf(), - ): MissionDTO { - return MissionDTO(mission = missionEntity, attachedReportingIds = attachedReportingIds) + ): MissionDetailsDTO { + return MissionDetailsDTO(mission = missionEntity, attachedReportingIds = attachedReportingIds) } } } diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/CreateOrUpdateReportingUTests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/CreateOrUpdateReportingUTests.kt index 48922bd44a..8209983506 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/CreateOrUpdateReportingUTests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/CreateOrUpdateReportingUTests.kt @@ -16,7 +16,7 @@ import fr.gouv.cacem.monitorenv.domain.repositories.IPostgisFunctionRepository import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository import fr.gouv.cacem.monitorenv.domain.repositories.ISemaphoreRepository import fr.gouv.cacem.monitorenv.domain.use_cases.controlUnit.dtos.FullControlUnitDTO -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.fixtures.ReportingFixture.Companion.aReporting import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingSourceControlUnit import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingSourceSemaphore @@ -64,11 +64,14 @@ class CreateOrUpdateReportingUTests { // Given val aReportingWithSemaphore = aReporting(reportingSources = listOf(aReportingSourceSemaphore())) val reportingWithSemaphoreDTO = - ReportingDTO(reporting = aReporting(reportingSources = listOf(aReportingSourceControlUnit())), listOf()) + ReportingDetailsDTO( + reporting = aReporting(reportingSources = listOf(aReportingSourceControlUnit())), + listOf(), + ) val aReportingWithControlUnit = aReporting(reportingSources = listOf(aReportingSourceControlUnit())) val reportingWithControlUnitDTO = - ReportingDTO(reporting = aReportingWithControlUnit, reportingSources = listOf()) + ReportingDetailsDTO(reporting = aReportingWithControlUnit, reportingSources = listOf()) val wktReader = WKTReader() val point = wktReader.read("POINT(-2.7335 47.6078)") as Point @@ -322,7 +325,7 @@ class CreateOrUpdateReportingUTests { aReporting(id = 1, missionId = 1, attachedToMissionAtUtc = ZonedDateTime.parse("2022-01-15T04:50:09Z")) given(reportingRepository.findById(reportingWithNewAttachedMission.id!!)) - .willReturn(ReportingDTO(reporting = aReporting(id = 2, missionId = 2), reportingSources = listOf())) + .willReturn(ReportingDetailsDTO(reporting = aReporting(id = 2, missionId = 2), reportingSources = listOf())) // Then assertThatThrownBy { diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingByIdUTest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingByIdUTest.kt index 03cf22ecd5..4c0e90895e 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingByIdUTest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingByIdUTest.kt @@ -2,7 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.reportings import com.nhaarman.mockitokotlin2.given import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository -import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingDetailsDTO import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -20,7 +20,7 @@ class GetReportingByIdUTest { fun `execute should get reporting with given id`(log: CapturedOutput) { // Given val id = 1 - val expectedReportingDTO = aReportingDTO(id = id) + val expectedReportingDTO = aReportingDetailsDTO(id = id) given(reportingRepository.findById(id)).willReturn(expectedReportingDTO) // When diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsByIdsUTest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsByIdsUTest.kt index 228ee3b21e..084b473fc6 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsByIdsUTest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsByIdsUTest.kt @@ -2,7 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.reportings import com.nhaarman.mockitokotlin2.given import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository -import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingDetailsDTO import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -20,7 +20,8 @@ class GetReportingsByIdsUTest { fun `execute should retrieve reportings that match ids`(log: CapturedOutput) { // Given val ids = listOf(1, 2, 3) - val reportings = listOf(aReportingDTO(id = 1), aReportingDTO(id = 2), aReportingDTO(id = 3)) + val reportings = + listOf(aReportingDetailsDTO(id = 1), aReportingDetailsDTO(id = 2), aReportingDetailsDTO(id = 3)) given(reportingRepository.findAllById(ids)).willReturn(reportings) // When diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsUTest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsUTest.kt index bb260e1e1d..3849630182 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsUTest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/GetReportingsUTest.kt @@ -2,7 +2,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.reportings import com.nhaarman.mockitokotlin2.given import fr.gouv.cacem.monitorenv.domain.repositories.IReportingRepository -import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingListDTO import io.mockk.every import io.mockk.mockkStatic import io.mockk.unmockkStatic @@ -24,7 +24,7 @@ class GetReportingsUTest { fun `execute should retrieve all reportings with given criteria`(log: CapturedOutput) { // Given val now = ZonedDateTime.now() - val reportings = listOf(aReportingsDTO(id = 1), aReportingsDTO(id = 2), aReportingsDTO(id = 3)) + val reportings = listOf(aReportingListDTO(id = 1), aReportingListDTO(id = 2), aReportingListDTO(id = 3)) given( reportingRepository.findAll( pageNumber = null, @@ -68,7 +68,7 @@ class GetReportingsUTest { log: CapturedOutput, ) { // Given - val reportings = listOf(aReportingsDTO(id = 1), aReportingsDTO(id = 2), aReportingsDTO(id = 3)) + val reportings = listOf(aReportingListDTO(id = 1), aReportingListDTO(id = 2), aReportingListDTO(id = 3)) val now = ZonedDateTime.now() mockkStatic(ZonedDateTime::class) diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/fixtures/ReportingFixture.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/fixtures/ReportingFixture.kt index f58bb7b1ac..9cc89c22a0 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/fixtures/ReportingFixture.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/fixtures/ReportingFixture.kt @@ -2,9 +2,9 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures import fr.gouv.cacem.monitorenv.domain.entities.VehicleTypeEnum import fr.gouv.cacem.monitorenv.domain.entities.reporting.* -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.dtos.ReportingListDTO import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingSourceDTO -import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingsDTO import org.locationtech.jts.geom.MultiPolygon import org.locationtech.jts.io.WKTReader import java.time.ZonedDateTime @@ -52,12 +52,12 @@ class ReportingFixture { ) } - fun aReportingDTO( + fun aReportingDetailsDTO( id: Int? = 1, attachedEnvActionId: UUID? = null, reporting: ReportingEntity = aReporting(id, attachedEnvActionId = attachedEnvActionId), - ): ReportingDTO { - return ReportingDTO( + ): ReportingDetailsDTO { + return ReportingDetailsDTO( reporting = reporting, reportingSources = listOf( @@ -70,12 +70,12 @@ class ReportingFixture { ) } - fun aReportingsDTO( + fun aReportingListDTO( id: Int? = 1, attachedEnvActionId: UUID? = null, reporting: ReportingEntity = aReporting(id, attachedEnvActionId = attachedEnvActionId), - ): ReportingsDTO { - return ReportingsDTO( + ): ReportingListDTO { + return ReportingListDTO( reporting = reporting, reportingSources = listOf( diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/MissionsITests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/MissionsITests.kt index 31abbf5469..f0729134c2 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/MissionsITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/MissionsITests.kt @@ -22,9 +22,9 @@ import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingTypeEnum import fr.gouv.cacem.monitorenv.domain.entities.reporting.TargetTypeEnum import fr.gouv.cacem.monitorenv.domain.use_cases.missions.* 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.MissionsDTO -import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionListDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingDetailsDTO import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.inputs.actions.EnvActionDataInput import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.inputs.missions.CreateOrUpdateMissionDataInput import org.hamcrest.Matchers.equalTo @@ -52,25 +52,31 @@ import java.util.* @AutoConfigureMockMvc(addFilters = false) @WebMvcTest(value = [(Missions::class)]) class MissionsITests { - @Autowired private lateinit var mockMvc: MockMvc + @Autowired + private lateinit var mockMvc: MockMvc @MockitoBean private lateinit var createOrUpdateMissionWithActionsAndAttachedReporting: CreateOrUpdateMissionWithActionsAndAttachedReporting - @MockitoBean private lateinit var getFullMissions: GetFullMissions + @MockitoBean + private lateinit var getFullMissions: GetFullMissions @MockitoBean private lateinit var getFullMissionWithFishAndRapportNavActions: GetFullMissionWithFishAndRapportNavActions - @MockitoBean private lateinit var deleteMission: DeleteMission + @MockitoBean + private lateinit var deleteMission: DeleteMission - @MockitoBean private lateinit var canDeleteMission: CanDeleteMission + @MockitoBean + private lateinit var canDeleteMission: CanDeleteMission - @MockitoBean private lateinit var getEngagedControlUnits: GetEngagedControlUnits + @MockitoBean + private lateinit var getEngagedControlUnits: GetEngagedControlUnits - @Autowired private lateinit var objectMapper: ObjectMapper + @Autowired + private lateinit var objectMapper: ObjectMapper private val polygon = WKTReader() @@ -84,7 +90,7 @@ class MissionsITests { fun `Should create a new mission`() { // Given val expectedNewMission = - MissionDTO( + MissionDetailsDTO( mission = MissionEntity( id = 10, @@ -145,7 +151,7 @@ class MissionsITests { val requestedId = 0 val expectedFirstMission = - MissionDTO( + MissionDetailsDTO( mission = MissionEntity( id = 10, @@ -213,7 +219,7 @@ class MissionsITests { ) val expectedFirstMission = - MissionsDTO( + MissionListDTO( mission = MissionEntity( id = 10, @@ -454,7 +460,7 @@ class MissionsITests { ) val expectedFirstMission = - MissionDTO( + MissionDetailsDTO( mission = MissionEntity( id = 10, @@ -500,7 +506,7 @@ class MissionsITests { attachedReportingIds = listOf(1), attachedReportings = listOf( - ReportingDTO( + ReportingDetailsDTO( reporting = ReportingEntity( id = 1, @@ -697,7 +703,7 @@ class MissionsITests { fun `update mission should return updated mission`() { // Given val expectedUpdatedMission = - MissionDTO( + MissionDetailsDTO( mission = MissionEntity( id = 14, diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/ReportingsITests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/ReportingsITests.kt index 54577e68a6..46f2b8a936 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/ReportingsITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/ReportingsITests.kt @@ -12,12 +12,12 @@ import fr.gouv.cacem.monitorenv.domain.entities.reporting.SourceTypeEnum import fr.gouv.cacem.monitorenv.domain.entities.reporting.TargetTypeEnum import fr.gouv.cacem.monitorenv.domain.entities.semaphore.SemaphoreEntity import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.* -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.dtos.ReportingListDTO import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingSourceDTO -import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.dtos.ReportingsDTO import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.events.UpdateReportingEvent import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture -import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.reportings.fixtures.ReportingFixture.Companion.aReportingDetailsDTO import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.inputs.reportings.CreateOrUpdateReportingDataInput import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.inputs.reportings.ReportingSourceDataInput import fr.gouv.cacem.monitorenv.infrastructure.api.endpoints.bff.v1.reportings.Reportings @@ -90,7 +90,7 @@ class ReportingsITests { "MULTIPOLYGON (((-61.0 14.0, -61.0 15.0, -60.0 15.0, -60.0 14.0, -61.0 14.0)))", ) val reporting = - ReportingDTO( + ReportingDetailsDTO( reporting = ReportingEntity( id = 1, @@ -225,7 +225,7 @@ class ReportingsITests { "MULTIPOLYGON (((-61.0 14.0, -61.0 15.0, -60.0 15.0, -60.0 14.0, -61.0 14.0)))", ) val reporting = - ReportingDTO( + ReportingDetailsDTO( reporting = ReportingEntity( id = 1, @@ -318,7 +318,7 @@ class ReportingsITests { "MULTIPOLYGON (((-61.0 14.0, -61.0 15.0, -60.0 15.0, -60.0 14.0, -61.0 14.0)))", ) val reporting = - ReportingsDTO( + ReportingListDTO( reporting = ReportingEntity( id = 1, @@ -380,7 +380,7 @@ class ReportingsITests { "MULTIPOLYGON (((-61.0 14.0, -61.0 15.0, -60.0 15.0, -60.0 14.0, -61.0 14.0)))", ) val updatedReporting = - ReportingDTO( + ReportingDetailsDTO( reporting = ReportingEntity( id = 1, @@ -532,9 +532,9 @@ class ReportingsITests { val ids = listOf(1, 2, 3) given(getReportingsByIds.execute(ids)).willReturn( listOf( - aReportingDTO(1), - aReportingDTO(2), - aReportingDTO(3), + aReportingDetailsDTO(1), + aReportingDetailsDTO(2), + aReportingDetailsDTO(3), ), ) // When @@ -561,7 +561,7 @@ class ReportingsITests { ) val updateReportingEvent = UpdateReportingEvent( - ReportingDTO( + ReportingDetailsDTO( reporting = ReportingEntity( id = 1, diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiLegacyMissionsITests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiLegacyMissionsITests.kt index 980c030a21..9ca74e4c82 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiLegacyMissionsITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiLegacyMissionsITests.kt @@ -9,14 +9,8 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.CanDeleteMissionResponse 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.BypassActionCheckAndDeleteMission -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.CanDeleteMission -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.CreateOrUpdateMission -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.GetEngagedControlUnits -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.GetMissionWithRapportNavActions -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.GetMissions -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.GetMissionsByIds -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.* +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import fr.gouv.cacem.monitorenv.domain.use_cases.missions.events.UpdateMissionEvent import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.publicapi.inputs.CreateOrUpdateMissionDataInput import fr.gouv.cacem.monitorenv.infrastructure.api.endpoints.publicapi.v1.missions.LegacyMissions @@ -39,14 +33,9 @@ import org.springframework.context.annotation.Import import org.springframework.http.MediaType import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.* import org.springframework.test.web.servlet.result.MockMvcResultHandlers -import org.springframework.test.web.servlet.result.MockMvcResultMatchers.header -import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath -import org.springframework.test.web.servlet.result.MockMvcResultMatchers.request -import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status +import org.springframework.test.web.servlet.result.MockMvcResultMatchers.* import java.time.ZonedDateTime @Import(SentryConfig::class, MapperConfiguration::class) @@ -237,7 +226,7 @@ class ApiLegacyMissionsITests { val requestedId = 0 val expectedFirstMission = - MissionDTO( + MissionDetailsDTO( mission = MissionEntity( id = 10, diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/v2/MissionsITest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/v2/MissionsITest.kt index 49413adde0..e35118d548 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/v2/MissionsITest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/v2/MissionsITest.kt @@ -14,7 +14,7 @@ import fr.gouv.cacem.monitorenv.domain.use_cases.actions.fixtures.EnvActionFixtu import fr.gouv.cacem.monitorenv.domain.use_cases.missions.DeleteMission import fr.gouv.cacem.monitorenv.domain.use_cases.missions.GetMissionAndSourceAction import fr.gouv.cacem.monitorenv.domain.use_cases.missions.PatchMission -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import fr.gouv.cacem.monitorenv.domain.use_cases.missions.fixtures.MissionFixture.Companion.aMissionEntity import org.hamcrest.Matchers.equalTo import org.junit.jupiter.api.Test @@ -27,13 +27,11 @@ import org.springframework.context.annotation.Import import org.springframework.http.MediaType import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.* import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status import java.time.ZonedDateTime -import java.util.Optional +import java.util.* import kotlin.random.Random @Import(SentryConfig::class, MapperConfiguration::class) @@ -88,7 +86,7 @@ class MissionsITest { ) given(patchMission.execute(id, patchableMissionEntity)) - .willReturn(MissionDTO(mission = patchedMission)) + .willReturn(MissionDetailsDTO(mission = patchedMission)) // When mockMvc.perform( @@ -183,7 +181,7 @@ class MissionsITest { val mission = aMissionEntity() given(getMissionAndSourceAction.execute(id, source)) .willReturn( - MissionDTO( + MissionDetailsDTO( mission, hasRapportNavActions = RapportNavMissionActionEntity(1, true), ), @@ -211,7 +209,7 @@ class MissionsITest { val mission = aMissionEntity() given(getMissionAndSourceAction.execute(id, source)) .willReturn( - MissionDTO( + MissionDetailsDTO( mission, fishActions = listOf(aMonitorFishAction(id)), ), @@ -238,7 +236,7 @@ class MissionsITest { val mission = aMissionEntity() given(getMissionAndSourceAction.execute(id, null)) .willReturn( - MissionDTO( + MissionDetailsDTO( mission, ), ) diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepositoryITests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepositoryITests.kt index eb6b652070..24b06dd483 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepositoryITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepositoryITests.kt @@ -14,13 +14,9 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionContr import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.EnvActionNoteEntity import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.ActionTargetTypeEnum import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.EnvActionControlEntity -import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.AdministrativeResponseEnum -import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.FormalNoticeEnum -import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionEntity -import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.InfractionTypeEnum -import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.SeizureTypeEnum +import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction.* import fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionSurveillance.EnvActionSurveillanceEntity -import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDTO +import fr.gouv.cacem.monitorenv.domain.use_cases.missions.dtos.MissionDetailsDTO import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.catchThrowable import org.junit.jupiter.api.BeforeEach @@ -36,7 +32,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException import org.springframework.test.context.junit.jupiter.SpringExtension import org.springframework.transaction.annotation.Transactional import java.time.ZonedDateTime -import java.util.UUID +import java.util.* @ExtendWith(SpringExtension::class) @Import(DataSourceProxyBeanPostProcessor::class) @@ -421,7 +417,7 @@ class JpaMissionRepositoryITests : AbstractDBTests() { fun `findById Should return specified mission`() { // When val firstMission = - MissionDTO( + MissionDetailsDTO( mission = MissionEntity( id = 10, @@ -942,7 +938,7 @@ class JpaMissionRepositoryITests : AbstractDBTests() { updatedAtUtc = null, ) val expectedUpdatedMission = - MissionDTO( + MissionDetailsDTO( mission = MissionEntity( id = id, @@ -1023,7 +1019,7 @@ class JpaMissionRepositoryITests : AbstractDBTests() { updatedAtUtc = null, ) val expectedUpdatedMission = - MissionDTO( + MissionDetailsDTO( mission = MissionEntity( id = id,