Rename to findByIds

.gitignore

@@ -45,6 +45,7 @@ datascience/docs/build
 
 # Ignore Gradle project-specific cache directory
 backend/.gradle
+.gradle
 
 # Ignore Gradle build output directory
 backend/build

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IMissionRepository.kt

@@ -21,7 +21,7 @@ interface IMissionRepository {
         pageable: Pageable,
     ): List<MissionDTO>
 
-    fun findAllIncludedIn(ids: List<Int>): List<MissionEntity>
+    fun findByIds(ids: List<Int>): List<MissionEntity>
 
     fun findByControlUnitId(controlUnitId: Int): List<MissionEntity>
 

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionsIncludedIn.kt → 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<Int>): List<MissionEntity> {
-        return missionRepository.findAllIncludedIn(ids)
+        return missionRepository.findByIds(ids)
     }
 }

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<Int>,
     ): List<MissionDataOutput> {
-        val missions = getMissionsIncludedIn.execute(ids)
+        val missions = getMissionsByIds.execute(ids)
         return missions.map { MissionDataOutput.fromMissionEntity(it) }
     }
 

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<Int>): List<MissionEntity> {
-        return dbMissionRepository.findAllIncludedIn(ids).map { it.toMissionEntity(mapper) }
+    override fun findByIds(ids: List<Int>): List<MissionEntity> {
+        return dbMissionRepository.findNotDeletedByIds(ids).map { it.toMissionEntity(mapper) }
     }
 
     override fun findByControlUnitId(controlUnitId: Int): List<MissionEntity> {

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBMissionRepository.kt

@@ -91,7 +91,7 @@ interface IDBMissionRepository : JpaRepository<MissionModel, Int> {
         """,
         nativeQuery = true,
     )
-    fun findAllIncludedIn(ids: List<Int>): List<MissionModel>
+    fun findNotDeletedByIds(ids: List<Int>): List<MissionModel>
 
     @Query("SELECT mm FROM MissionModel mm JOIN mm.controlUnits mmcu WHERE mmcu.unit.id = :controlUnitId")
     fun findByControlUnitId(controlUnitId: Int): List<MissionModel>

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

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)
     }