Merge pull request #486 from MTES-MCT/fix/deployfailed-patch-1

Update and rename GetEnvMissionById.kt to GetEnvMissionById2.kt
MTES-MCT · Jan 9, 2025 · c08c281 · c08c281
2 parents 24546ec + d2a38cd
commit c08c281
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/...es/mission/action/v2/GetEnvMissionById.kt → ...s/mission/action/v2/GetEnvMissionById2.kt b/...es/mission/action/v2/GetEnvMissionById.kt → ...s/mission/action/v2/GetEnvMissionById2.kt
@@ -7,10 +7,10 @@ import org.slf4j.LoggerFactory
 import org.springframework.cache.annotation.Cacheable
 
 @UseCase
-class GetEnvMissionById(
+class GetEnvMissionById2(
     private val monitorEnvApiRepo: IEnvMissionRepository
 ) {
-    private val logger = LoggerFactory.getLogger(GetEnvMissionById::class.java)
+    private val logger = LoggerFactory.getLogger(GetEnvMissionById2::class.java)
 
     @Cacheable(value = ["envMission"], key = "#missionId")
     fun execute(missionId: Int?): MissionEntity? {

diff --git a/.../kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/export/v2/ExportMissionAEM2.kt b/.../kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/export/v2/ExportMissionAEM2.kt
@@ -4,7 +4,7 @@ import fr.gouv.dgampa.rapportnav.config.UseCase
 import fr.gouv.dgampa.rapportnav.domain.entities.aem.v2.AEMTableExport2
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.export.MissionExportEntity
 import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.action.v2.GetEnvActionListByMissionId
-import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.action.v2.GetEnvMissionById
+import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.action.v2.GetEnvMissionById2
 import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.action.v2.GetFishActionListByMissionId
 import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.action.v2.GetNavActionListByMissionId
 import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.generalInfo.GetMissionGeneralInfoByMissionId
@@ -25,7 +25,7 @@ class ExportMissionAEM2(
     @Value("\${rapportnav.aem.tmp_xlsx.path}") private val aemTmpXLSXPath: String,
     @Value("\${rapportnav.aem.tmp_ods.path}") private val aemTmpODSPath: String,
     private val fillAEMExcelRow: FillAEMExcelRow,
-    private val getEnvMissionById: GetEnvMissionById,
+    private val getEnvMissionById2: GetEnvMissionById2,
     private val getEnvActionByMissionId: GetEnvActionListByMissionId,
     private val getNavActionByMissionId: GetNavActionListByMissionId,
     private val getFIshListActionByMissionId: GetFishActionListByMissionId,
@@ -77,7 +77,7 @@ class ExportMissionAEM2(
     }
 
     private fun getAemTableExport(missionIds: List<Int>) = missionIds.map {
-        val envMission = getEnvMissionById.execute(it)
+        val envMission = getEnvMissionById2.execute(it)
         val envActions = getEnvActionByMissionId.execute(it)
         val navActions = getNavActionByMissionId.execute(it)
         val fishActions = getFIshListActionByMissionId.execute(it)

diff --git a/...cases/mission/v2/GetEnvMissionByIdTest.kt → ...ases/mission/v2/GetEnvMissionById2Test.kt b/...cases/mission/v2/GetEnvMissionByIdTest.kt → ...ases/mission/v2/GetEnvMissionById2Test.kt
@@ -4,7 +4,7 @@ import fr.gouv.dgampa.rapportnav.domain.entities.mission.env.MissionEntity
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.env.MissionSourceEnum
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.env.MissionTypeEnum
 import fr.gouv.dgampa.rapportnav.domain.repositories.mission.IEnvMissionRepository
-import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.action.v2.GetEnvMissionById
+import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.action.v2.GetEnvMissionById2
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.*
@@ -13,11 +13,11 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.mock.mockito.MockBean
 import java.time.Instant
 
-@SpringBootTest(classes = [GetEnvMissionById::class])
-class GetEnvMissionByIdTest {
+@SpringBootTest(classes = [GetEnvMissionById2::class])
+class GetEnvMissionById2Test {
 
     @Autowired
-    private lateinit var getEnvMissionById: GetEnvMissionById
+    private lateinit var getEnvMissionById2: GetEnvMissionById2
 
     @MockBean
     private lateinit var monitorEnvApiRepo: IEnvMissionRepository
@@ -40,10 +40,10 @@ class GetEnvMissionByIdTest {
         // Mock behavior of findMissionById to return a MissionEntity
         `when`(monitorEnvApiRepo.findMissionById(missionId)).thenReturn(missionEntity)
 
-        getEnvMissionById = GetEnvMissionById(monitorEnvApiRepo)
+        getEnvMissionById2 = GetEnvMissionById2(monitorEnvApiRepo)
 
         // When
-        val result = getEnvMissionById.execute(missionId)
+        val result = getEnvMissionById2.execute(missionId)
 
         // Then
         assertNotNull(result)