Zones FAO - Correction de la liste des zones

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/fao_area/FAOArea.kt

@@ -1,3 +1,5 @@
 package fr.gouv.cnsp.monitorfish.domain.entities.fao_area
 
-data class FAOArea(val faoCode: String, val subArea: String? = null, val division: String? = null)
+data class FAOArea(
+    val faoCode: String,
+)

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/fao_areas/GetFAOAreas.kt

@@ -8,10 +8,7 @@ class GetFAOAreas(private val faoAreasRepository: FAOAreasRepository) {
     fun execute(): List<String> {
         val faoAreas = faoAreasRepository.findAll()
 
-        return (
-            faoAreas.mapNotNull { it.division } +
-                faoAreas.mapNotNull { it.subArea }
-            )
+        return faoAreas.map { it.faoCode }
             .distinct()
             .sorted()
     }

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/entities/FAOAreasEntity.kt

@@ -5,25 +5,16 @@ import jakarta.persistence.Column
 import jakarta.persistence.Entity
 import jakarta.persistence.Id
 import jakarta.persistence.Table
-import org.locationtech.jts.geom.Geometry
 
 @Entity
 @Table(name = "fao_areas")
 data class FAOAreasEntity(
     @Id
     @Column(name = "f_code")
     val faoCode: String,
-    @Column(name = "f_subarea")
-    val subArea: String? = null,
-    @Column(name = "f_division")
-    val division: String? = null,
-    @Column(name = "wkb_geometry", columnDefinition = "Geometry")
-    val geometry: Geometry? = null,
 ) {
 
     fun toFAOArea() = FAOArea(
         faoCode = faoCode,
-        subArea = subArea,
-        division = division,
     )
 }

backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/GetFAOAreasUTests.kt

@@ -21,9 +21,11 @@ class GetFAOAreasUTests {
         // Given
         given(faoAreasRepository.findAll()).willReturn(
             listOf(
-                FAOArea("123", "27.1", "27.1.0"),
-                FAOArea("124", "28.1", "28.1.0"),
-                FAOArea("125", "28.1", "28.1.1"),
+                FAOArea("27.1"),
+                FAOArea("27.1.0"),
+                FAOArea("28.1"),
+                FAOArea("28.1.0"),
+                FAOArea("28.1.1"),
             ),
         )
 

backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/fleet_segment/UtilsUTests.kt

@@ -13,11 +13,11 @@ class UtilsUTests {
     fun `removeRedundantFaoArea Should remove redundant fao codes`() {
         // Given
         val faoAreas = listOf(
-            FAOArea(faoCode = "27.1.B", null, null),
-            FAOArea(faoCode = "27.1", null, null),
-            FAOArea(faoCode = "27.1", null, null),
-            FAOArea(faoCode = "18", null, null),
-            FAOArea(faoCode = "27.1.B.a", null, null),
+            FAOArea(faoCode = "27.1.B"),
+            FAOArea(faoCode = "27.1"),
+            FAOArea(faoCode = "27.1"),
+            FAOArea(faoCode = "18"),
+            FAOArea(faoCode = "27.1.B.a"),
         )
 
         // When
@@ -33,10 +33,10 @@ class UtilsUTests {
     fun `removeRedundantFaoArea Should keep different fao codes`() {
         // Given
         val faoAreas = listOf(
-            FAOArea(faoCode = "27.1.B", null, null),
-            FAOArea(faoCode = "27.1.B", null, null),
-            FAOArea(faoCode = "27.1.B", null, null),
-            FAOArea(faoCode = "27.1.C", null, null),
+            FAOArea(faoCode = "27.1.B"),
+            FAOArea(faoCode = "27.1.B"),
+            FAOArea(faoCode = "27.1.B"),
+            FAOArea(faoCode = "27.1.C"),
         )
 
         // When
@@ -52,9 +52,9 @@ class UtilsUTests {
     fun `removeRedundantFaoArea Should not remove redundant fao codes When fao code is not located at the start of the string`() {
         // Given
         val faoAreas = listOf(
-            FAOArea(faoCode = "27", null, null),
-            FAOArea(faoCode = "22.1.27", null, null),
-            FAOArea(faoCode = "18", null, null),
+            FAOArea(faoCode = "27"),
+            FAOArea(faoCode = "22.1.27"),
+            FAOArea(faoCode = "18"),
         )
 
         // When
@@ -66,16 +66,16 @@ class UtilsUTests {
 
     @Test
     fun `hasFaoCodeIncludedIn Should test fao areas included in another fao area`() {
-        val faoAreaOne = FAOArea(faoCode = "27.1.B", null, null)
+        val faoAreaOne = FAOArea(faoCode = "27.1.B")
         assertThat(faoAreaOne.hasFaoCodeIncludedIn("27.1")).isTrue()
 
-        val faoAreaTwo = FAOArea(faoCode = "27.1", null, null)
+        val faoAreaTwo = FAOArea(faoCode = "27.1")
         assertThat(faoAreaTwo.hasFaoCodeIncludedIn("27.1")).isTrue()
 
-        val faoAreaThree = FAOArea(faoCode = "28.1", null, null)
+        val faoAreaThree = FAOArea(faoCode = "28.1")
         assertThat(faoAreaThree.hasFaoCodeIncludedIn("27.1")).isFalse()
 
-        val faoAreaFour = FAOArea(faoCode = "28.1.56", null, null)
+        val faoAreaFour = FAOArea(faoCode = "28.1.56")
         assertThat(faoAreaFour.hasFaoCodeIncludedIn("56")).isFalse()
     }
 }