fix: do not archive limitless vigilance areas

MTES-MCT · Jan 20, 2025 · b086511 · b086511
1 parent c350bc3
commit b086511
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 1 deletion.
diff --git a/.../monitorenv/infrastructure/database/repositories/interfaces/IDBVigilanceAreaRepository.kt b/.../monitorenv/infrastructure/database/repositories/interfaces/IDBVigilanceAreaRepository.kt
@@ -27,7 +27,10 @@ interface IDBVigilanceAreaRepository : JpaRepository<VigilanceAreaModel, Int> {
             """
         UPDATE vigilance_areas
         SET is_archived = TRUE
-        WHERE computed_end_date IS NOT NULL AND computed_end_date < NOW() AND is_archived IS FALSE
+        WHERE computed_end_date IS NOT NULL 
+            AND computed_end_date < NOW() 
+            AND is_archived IS FALSE 
+            AND is_at_all_times IS FALSE
     """,
         nativeQuery = true,
     )

diff --git a/...cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepositoryITests.kt b/...cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepositoryITests.kt
@@ -7,6 +7,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.vigilanceArea.FrequencyEnum
 import fr.gouv.cacem.monitorenv.domain.entities.vigilanceArea.ImageEntity
 import fr.gouv.cacem.monitorenv.domain.entities.vigilanceArea.VigilanceAreaEntity
 import fr.gouv.cacem.monitorenv.domain.entities.vigilanceArea.VisibilityEnum
+import fr.gouv.cacem.monitorenv.domain.use_cases.vigilanceArea.fixtures.VigilanceAreaFixture
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -192,6 +193,20 @@ class JpaVigilanceAreaRepositoryITests : AbstractDBTests() {
         assertThat(archivedVigilanceArea?.isArchived).isEqualTo(true)
     }
 
+    @Test
+    @Transactional
+    fun `archive should not archive limitless vigilance areas`() {
+        // Given
+        val limitlessVigilanceArea =
+            VigilanceAreaFixture.aVigilanceAreaEntity().copy(id = null, isAtAllTimes = true)
+        val savedVigilanceArea = jpaVigilanceAreaRepository.save(limitlessVigilanceArea)
+        // When
+        jpaVigilanceAreaRepository.archiveOutdatedVigilanceAreas()
+        // Then
+        val archivedVigilanceArea = jpaVigilanceAreaRepository.findById(savedVigilanceArea.id!!)
+        assertThat(archivedVigilanceArea?.isArchived).isEqualTo(false)
+    }
+
     @Test
     fun `findAllByGeometry should return all vigilance areas that intersect the geometry `() {
         // Given

diff --git a/...hed, added to My Zones and showed on the map with the Zone button #0.actual.png b/...hed, added to My Zones and showed on the map with the Zone button #0.actual.png
diff --git a/...rched, added to My Zones and showed on the map with the Zone button #0.diff.png b/...rched, added to My Zones and showed on the map with the Zone button #0.diff.png
diff --git a/...e searched, added to My Zones and showed on the map with the Zone button #0.png b/...e searched, added to My Zones and showed on the map with the Zone button #0.png
diff --git a/...e searched, added to My Zones and showed on the map with the Zone button #1.png b/...e searched, added to My Zones and showed on the map with the Zone button #1.png
diff --git a/...e searched, added to My Zones and showed on the map with the Zone button #2.png b/...e searched, added to My Zones and showed on the map with the Zone button #2.png
diff --git a/...e searched, added to My Zones and showed on the map with the Zone button #3.png b/...e searched, added to My Zones and showed on the map with the Zone button #3.png
diff --git a/...e searched, added to My Zones and showed on the map with the Zone button #4.png b/...e searched, added to My Zones and showed on the map with the Zone button #4.png