tech: fix isMissionEnded

MTES-MCT · Jan 20, 2025 · facb477 · facb477
1 parent 3a62019
commit facb477
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/...nd/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidator.kt b/...nd/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidator.kt
@@ -58,7 +58,7 @@ class MissionValidator : Validator<MissionEntity> {
 
     private fun validateEnvActions(mission: MissionEntity) {
         val isMissionEnded =
-            mission.endDateTimeUtc != null && (mission.endDateTimeUtc?.isAfter(ZonedDateTime.now()) == true)
+            mission.endDateTimeUtc != null && ZonedDateTime.now().isAfter(mission.endDateTimeUtc)
 
         mission.envActions?.forEach { envAction ->
             if (envAction is EnvActionControlEntity) {

diff --git a/...est/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/actions/fixtures/EnvActionFixture.kt b/...est/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/actions/fixtures/EnvActionFixture.kt
@@ -83,7 +83,8 @@ class EnvActionFixture {
             startTime: ZonedDateTime? = null,
             endTime: ZonedDateTime? = null,
             openBy: String? = "CDA",
-            controlPlans: List<EnvActionControlPlanEntity>? = listOf(),
+            controlPlans: List<EnvActionControlPlanEntity>? =
+                listOf(EnvActionControlPlanEntity(subThemeIds = listOf(1))),
         ): EnvActionSurveillanceEntity {
             return EnvActionSurveillanceEntity(
                 id = UUID.randomUUID(),

diff --git a/...c/test/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidatorUTest.kt b/...c/test/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidatorUTest.kt
@@ -217,7 +217,7 @@ class MissionValidatorUTest {
 
     @Test
     fun `validate should throw an exception if there is a control without control plans when mission has ended`() {
-        val endDateTimeUtc = ZonedDateTime.now().plusSeconds(1)
+        val endDateTimeUtc = ZonedDateTime.now().minusSeconds(1)
         val anEnvActionControl = anEnvActionControl(controlPlans = listOf())
         val mission = aMissionEntity(endDateTimeUtc = endDateTimeUtc, envActions = listOf(anEnvActionControl))
 
@@ -227,7 +227,7 @@ class MissionValidatorUTest {
 
     @Test
     fun `validate should throw an exception if there is a control with control plan without subtheme when mission has ended`() {
-        val endDateTimeUtc = ZonedDateTime.now().plusSeconds(1)
+        val endDateTimeUtc = ZonedDateTime.now().minusSeconds(1)
         val anEnvActionControl =
             anEnvActionControl(controlPlans = listOf(EnvActionControlPlanEntity(subThemeIds = listOf())))
         val mission = aMissionEntity(endDateTimeUtc = endDateTimeUtc, envActions = listOf(anEnvActionControl))
@@ -238,7 +238,7 @@ class MissionValidatorUTest {
 
     @Test
     fun `validate should throw an exception if there is a control actionTargetType as VEHICULE without vehiculeType when mission has ended`() {
-        val endDateTimeUtc = ZonedDateTime.now().plusSeconds(1)
+        val endDateTimeUtc = ZonedDateTime.now().minusSeconds(1)
         val anEnvActionControl = anEnvActionControl(actionTargetTypeEnum = ActionTargetTypeEnum.VEHICLE)
         val mission = aMissionEntity(endDateTimeUtc = endDateTimeUtc, envActions = listOf(anEnvActionControl))
 
@@ -251,7 +251,7 @@ class MissionValidatorUTest {
     fun `validate should pass if there is a control actionTargetType as targetType other than VEHICLE without vehiculeType when mission has ended`(
         targetType: ActionTargetTypeEnum,
     ) {
-        val endDateTimeUtc = ZonedDateTime.now().plusSeconds(1)
+        val endDateTimeUtc = ZonedDateTime.now().minusSeconds(1)
         val anEnvActionControl = anEnvActionControl(actionTargetTypeEnum = targetType)
         val mission = aMissionEntity(endDateTimeUtc = endDateTimeUtc, envActions = listOf(anEnvActionControl))
 
@@ -342,7 +342,7 @@ class MissionValidatorUTest {
 
     @Test
     fun `validate should throw an exception if there is a surveillance without control plans when mission has ended`() {
-        val endDateTimeUtc = ZonedDateTime.now().plusSeconds(1)
+        val endDateTimeUtc = ZonedDateTime.now().minusSeconds(1)
         val anEnvActionSurveillance = anEnvActionSurveillance(controlPlans = listOf())
         val mission = aMissionEntity(endDateTimeUtc = endDateTimeUtc, envActions = listOf(anEnvActionSurveillance))
 
@@ -352,7 +352,7 @@ class MissionValidatorUTest {
 
     @Test
     fun `validate should throw an exception if there is a surveillance with control plan without subtheme when mission has ended`() {
-        val endDateTimeUtc = ZonedDateTime.now().plusSeconds(1)
+        val endDateTimeUtc = ZonedDateTime.now().minusSeconds(1)
         val anEnvActionSurveillance =
             anEnvActionSurveillance(controlPlans = listOf(EnvActionControlPlanEntity(subThemeIds = listOf())))
         val mission = aMissionEntity(endDateTimeUtc = endDateTimeUtc, envActions = listOf(anEnvActionSurveillance))