From 7bbfb330f9949ed081f55e90a671080d82c62207 Mon Sep 17 00:00:00 2001 From: Claire Dagan Date: Tue, 23 Apr 2024 14:07:59 +0200 Subject: [PATCH] [Mission] don't get poseidon missions in get all missions --- .../monitorenv/domain/repositories/IMissionRepository.kt | 1 + .../monitorenv/domain/use_cases/missions/GetFullMissions.kt | 6 ++++++ .../database/repositories/JpaMissionRepository.kt | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) 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 ff70d6dff..a168270c9 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 @@ -17,6 +17,7 @@ interface IMissionRepository { fun findAllFullMissions( controlUnitIds: List? = null, + missionSources: List? = null, missionStatuses: List?, missionTypes: List?, pageNumber: Int?, 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 b9e835058..8de939ef2 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 @@ -3,6 +3,7 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.missions 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.repositories.IMonitorFishMissionActionsRepository @@ -30,6 +31,11 @@ class GetFullMissions( startedAfter = startedAfterDateTime?.toInstant() ?: ZonedDateTime.now().minusDays(30).toInstant(), startedBefore = startedBeforeDateTime?.toInstant(), + missionSources = + listOf( + MissionSourceEnum.MONITORENV, + MissionSourceEnum.MONITORFISH, + ), missionTypes = missionTypes, missionStatuses = missionStatuses, seaFronts = seaFronts, 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 d6e18b486..0e207a404 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 @@ -39,6 +39,7 @@ class JpaMissionRepository( @Transactional override fun findAllFullMissions( controlUnitIds: List?, + missionSources: List?, missionStatuses: List?, missionTypes: List?, pageNumber: Int?, @@ -59,7 +60,7 @@ class JpaMissionRepository( missionTypeAIR = MissionTypeEnum.AIR in missionTypes.orEmpty(), missionTypeLAND = MissionTypeEnum.LAND in missionTypes.orEmpty(), missionTypeSEA = MissionTypeEnum.SEA in missionTypes.orEmpty(), - missionSources = null, + missionSources = missionSources, pageable = pageable, seaFronts = seaFronts, startedAfter = startedAfter,