diff --git a/.gitignore b/.gitignore index 0c3548b3c..dfe5f034e 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ datascience/docs/build # Ignore Gradle project-specific cache directory backend/.gradle +.gradle # Ignore Gradle build output directory backend/build 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 96caafb00..d10ee5f4e 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 @@ -21,7 +21,7 @@ interface IMissionRepository { pageable: Pageable, ): List - fun findAllIncludedIn(ids: List): List + fun findByIds(ids: List): List fun findByControlUnitId(controlUnitId: Int): List diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionsIncludedIn.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionsByIds.kt similarity index 72% rename from backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionsIncludedIn.kt rename to backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionsByIds.kt index a5897082b..11b90d99a 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionsIncludedIn.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionsByIds.kt @@ -7,8 +7,8 @@ import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity import fr.gouv.cacem.monitorenv.domain.repositories.IMissionRepository @UseCase -class GetMissionsIncludedIn(private val missionRepository: IMissionRepository) { +class GetMissionsByIds(private val missionRepository: IMissionRepository) { fun execute(ids: List): List { - return missionRepository.findAllIncludedIn(ids) + return missionRepository.findByIds(ids) } } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiMissionsController.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiMissionsController.kt index c35088045..574747425 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiMissionsController.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiMissionsController.kt @@ -22,7 +22,7 @@ class ApiMissionsController( private val getMissionById: GetMissionById, private val deleteMission: DeleteMission, private val getEngagedControlUnits: GetEngagedControlUnits, - private val getMissionsIncludedIn: GetMissionsIncludedIn + private val getMissionsByIds: GetMissionsByIds ) { @GetMapping("") @@ -75,7 +75,7 @@ class ApiMissionsController( @RequestParam(name = "ids") ids: List, ): List { - val missions = getMissionsIncludedIn.execute(ids) + val missions = getMissionsByIds.execute(ids) return missions.map { MissionDataOutput.fromMissionEntity(it) } } 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 312828d0f..c4b6b8c1e 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 @@ -49,8 +49,8 @@ class JpaMissionRepository( ).map { it.toMissionDTO(mapper) } } - override fun findAllIncludedIn(ids: List): List { - return dbMissionRepository.findAllIncludedIn(ids).map { it.toMissionEntity(mapper) } + override fun findByIds(ids: List): List { + return dbMissionRepository.findNotDeletedByIds(ids).map { it.toMissionEntity(mapper) } } override fun findByControlUnitId(controlUnitId: Int): List { diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBMissionRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBMissionRepository.kt index d93dee905..e06bab951 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBMissionRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBMissionRepository.kt @@ -91,7 +91,7 @@ interface IDBMissionRepository : JpaRepository { """, nativeQuery = true, ) - fun findAllIncludedIn(ids: List): List + fun findNotDeletedByIds(ids: List): List @Query("SELECT mm FROM MissionModel mm JOIN mm.controlUnits mmcu WHERE mmcu.unit.id = :controlUnitId") fun findByControlUnitId(controlUnitId: Int): List diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiMissionsControllerITests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiMissionsControllerITests.kt index b040e1e03..50eac21b1 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiMissionsControllerITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ApiMissionsControllerITests.kt @@ -49,7 +49,7 @@ class ApiMissionsControllerITests { private lateinit var deleteMission: DeleteMission @MockBean - private lateinit var getMissionsIncludedIn: GetMissionsIncludedIn + private lateinit var getMissionsByIds: GetMissionsByIds @MockBean private lateinit var getEngagedControlUnits: GetEngagedControlUnits @@ -182,7 +182,7 @@ class ApiMissionsControllerITests { isGeometryComputedFromControls = false, ) given( - getMissionsIncludedIn.execute(any()), + getMissionsByIds.execute(any()), ).willReturn(listOf(expectedFirstMission)) // When 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 306c78dd3..d96ac0009 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 @@ -714,8 +714,8 @@ class JpaMissionRepositoryITests : AbstractDBTests() { @Test @Transactional - fun `findAllIncludedIn() should find the matching missions`() { - val foundMissions = jpaMissionRepository.findAllIncludedIn(listOf(50, 51, 52)) + fun `findByIds() should find the matching missions`() { + val foundMissions = jpaMissionRepository.findByIds(listOf(50, 51, 52)) assertThat(foundMissions).hasSize(3) }