[AMP&RegulatoryAreas] pass props from snake_case to camel_case and so…

…rt areas in selected Areas list
MTES-MCT · Jan 29, 2025 · 2763f3a · 2763f3a
1 parent 6cf5230
commit 2763f3a
Show file tree

Hide file tree

Showing 51 changed files with 220 additions and 186 deletions.
diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/amp/AMPEntity.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/amp/AMPEntity.kt
@@ -7,7 +7,7 @@ data class AMPEntity(
     val designation: String,
     val geom: MultiPolygon,
     val name: String,
-    val ref_reg: String? = null,
+    val refReg: String? = null,
     val type: String? = null,
-    val url_legicem: String? = null,
+    val urlLegicem: String? = null,
 )
diff --git a/...in/kotlin/fr/gouv/cacem/monitorenv/domain/entities/regulatoryArea/RegulatoryAreaEntity.kt b/...in/kotlin/fr/gouv/cacem/monitorenv/domain/entities/regulatoryArea/RegulatoryAreaEntity.kt
@@ -5,19 +5,19 @@ import org.locationtech.jts.geom.MultiPolygon
 data class RegulatoryAreaEntity(
     val id: Int,
     val geom: MultiPolygon? = null,
-    val entity_name: String? = null,
+    val entityName: String? = null,
     val url: String? = null,
-    val layer_name: String? = null,
+    val layerName: String? = null,
     val facade: String? = null,
-    val ref_reg: String? = null,
+    val refReg: String? = null,
     val edition: String? = null,
     val editeur: String? = null,
     val source: String? = null,
     val observation: String? = null,
     val thematique: String? = null,
     val date: String? = null,
-    val duree_validite: String? = null,
-    val date_fin: String? = null,
+    val dureeValidite: String? = null,
+    val dateFin: String? = null,
     val temporalite: String? = null,
     val type: String? = null,
 )
diff --git a/.../kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/AMPDataOutput.kt b/.../kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/AMPDataOutput.kt
@@ -8,9 +8,9 @@ data class AMPDataOutput(
     val designation: String,
     val geom: MultiPolygon,
     val name: String,
-    val ref_reg: String? = null,
+    val refReg: String? = null,
     val type: String? = null,
-    val url_legicem: String? = null,
+    val urlLegicem: String? = null,
 ) {
     companion object {
         fun fromAMPEntity(amp: AMPEntity) =
@@ -19,9 +19,9 @@ data class AMPDataOutput(
                 designation = amp.designation,
                 geom = amp.geom,
                 name = amp.name,
-                ref_reg = amp.ref_reg,
+                refReg = amp.refReg,
                 type = amp.type,
-                url_legicem = amp.url_legicem,
+                urlLegicem = amp.urlLegicem,
             )
     }
 }
diff --git a/...gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/RegulatoryAreaDataOutput.kt b/...gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/RegulatoryAreaDataOutput.kt
@@ -5,21 +5,21 @@ import org.locationtech.jts.geom.MultiPolygon
 
 data class RegulatoryAreaDataOutput(
     val id: Int,
-    val entity_name: String? = null,
+    val entityName: String? = null,
     val geom: MultiPolygon? = null,
-    val layer_name: String? = null,
-    val ref_reg: String? = null,
+    val layerName: String? = null,
+    val refReg: String? = null,
     val thematique: String? = null,
     val type: String? = null,
 ) {
     companion object {
         fun fromRegulatoryAreaEntity(regulatoryArea: RegulatoryAreaEntity) =
             RegulatoryAreaDataOutput(
                 id = regulatoryArea.id,
-                entity_name = regulatoryArea.entity_name,
+                entityName = regulatoryArea.entityName,
                 geom = regulatoryArea.geom,
-                layer_name = regulatoryArea.layer_name,
-                ref_reg = regulatoryArea.ref_reg,
+                layerName = regulatoryArea.layerName,
+                refReg = regulatoryArea.refReg,
                 thematique = regulatoryArea.thematique,
                 type = regulatoryArea.type,
             )

diff --git a/...onitorenv/infrastructure/api/adapters/bff/outputs/RegulatoryAreaWithMetadataDataOutput.kt b/...onitorenv/infrastructure/api/adapters/bff/outputs/RegulatoryAreaWithMetadataDataOutput.kt
@@ -5,11 +5,11 @@ import org.locationtech.jts.geom.MultiPolygon
 
 data class RegulatoryAreaWithMetadataDataOutput(
     val id: Int,
-    val entity_name: String? = null,
+    val entityName: String? = null,
     val facade: String? = null,
     val geom: MultiPolygon? = null,
-    val layer_name: String? = null,
-    val ref_reg: String? = null,
+    val layerName: String? = null,
+    val refReg: String? = null,
     val thematique: String? = null,
     val type: String? = null,
     val url: String? = null,
@@ -18,11 +18,11 @@ data class RegulatoryAreaWithMetadataDataOutput(
         fun fromRegulatoryAreaEntity(regulatoryArea: RegulatoryAreaEntity) =
             RegulatoryAreaWithMetadataDataOutput(
                 id = regulatoryArea.id,
-                entity_name = regulatoryArea.entity_name,
+                entityName = regulatoryArea.entityName,
                 facade = regulatoryArea.facade,
                 geom = regulatoryArea.geom,
-                layer_name = regulatoryArea.layer_name,
-                ref_reg = regulatoryArea.ref_reg,
+                layerName = regulatoryArea.layerName,
+                refReg = regulatoryArea.refReg,
                 thematique = regulatoryArea.thematique,
                 type = regulatoryArea.type,
                 url = regulatoryArea.url,

diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/AMPModel.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/AMPModel.kt
@@ -20,20 +20,20 @@ data class AMPModel(
     @Column(name = "mpa_oriname")
     val name: String,
     @Column(name = "ref_reg")
-    val ref_reg: String? = null,
+    val refReg: String? = null,
     @Column(name = "mpa_type")
     val type: String? = null,
     @Column(name = "url_legicem")
-    val url_legicem: String? = null,
+    val urlLegicem: String? = null,
 ) {
     fun toAMP() =
         AMPEntity(
             id = id,
             geom = geom,
             name = name,
             designation = designation,
-            ref_reg = ref_reg,
+            refReg = refReg,
             type = type,
-            url_legicem = url_legicem,
+            urlLegicem = urlLegicem,
         )
 }
diff --git a/...main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/RegulatoryAreaModel.kt b/...main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/RegulatoryAreaModel.kt
@@ -16,19 +16,19 @@ import org.n52.jackson.datatype.jts.GeometrySerializer
 data class RegulatoryAreaModel(
     @Id @Column(name = "id") val id: Int,
     @Column(name = "date") val date: String?,
-    @Column(name = "date_fin") val date_fin: String?,
-    @Column(name = "duree_validite") val duree_validite: String?,
+    @Column(name = "date_fin") val dateFin: String?,
+    @Column(name = "duree_validite") val dureeValidite: String?,
     @Column(name = "editeur") val editeur: String?,
     @Column(name = "edition") val edition: String?,
-    @Column(name = "entity_name") val entity_name: String?,
+    @Column(name = "entity_name") val entityName: String?,
     @Column(name = "facade") val facade: String?,
     @JsonSerialize(using = GeometrySerializer::class)
     @JsonDeserialize(contentUsing = GeometryDeserializer::class)
     @Column(name = "geom")
     val geom: MultiPolygon?,
-    @Column(name = "layer_name") val layer_name: String?,
+    @Column(name = "layer_name") val layerName: String?,
     @Column(name = "observation") val observation: String?,
-    @Column(name = "ref_reg") val ref_reg: String?,
+    @Column(name = "ref_reg") val refReg: String?,
     @Column(name = "source") val source: String?,
     @Column(name = "temporalite") val temporalite: String?,
     @Column(name = "thematique") val thematique: String?,
@@ -39,16 +39,16 @@ data class RegulatoryAreaModel(
         RegulatoryAreaEntity(
             id = id,
             date = date,
-            date_fin = date_fin,
-            duree_validite = duree_validite,
+            dateFin = dateFin,
+            dureeValidite = dureeValidite,
             editeur = editeur,
             edition = edition,
-            entity_name = entity_name,
+            entityName = entityName,
             facade = facade,
             geom = geom,
-            layer_name = layer_name,
+            layerName = layerName,
             observation = observation,
-            ref_reg = ref_reg,
+            refReg = refReg,
             source = source,
             temporalite = temporalite,
             thematique = thematique,
@@ -61,16 +61,16 @@ data class RegulatoryAreaModel(
             RegulatoryAreaModel(
                 id = regulatoryArea.id,
                 date = regulatoryArea.date,
-                date_fin = regulatoryArea.date_fin,
-                duree_validite = regulatoryArea.duree_validite,
+                dateFin = regulatoryArea.dateFin,
+                dureeValidite = regulatoryArea.dureeValidite,
                 editeur = regulatoryArea.editeur,
                 edition = regulatoryArea.edition,
-                entity_name = regulatoryArea.entity_name,
+                entityName = regulatoryArea.entityName,
                 facade = regulatoryArea.facade,
                 geom = regulatoryArea.geom,
-                layer_name = regulatoryArea.layer_name,
+                layerName = regulatoryArea.layerName,
                 observation = regulatoryArea.observation,
-                ref_reg = regulatoryArea.ref_reg,
+                refReg = regulatoryArea.refReg,
                 source = regulatoryArea.source,
                 temporalite = regulatoryArea.temporalite,
                 thematique = regulatoryArea.thematique,

diff --git a/.../kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepository.kt b/.../kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepository.kt
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository
 class JpaAMPRepository(private val dbAMPRepository: IDBAMPRepository) :
     IAMPRepository {
     override fun findAll(): List<AMPEntity> {
-        return dbAMPRepository.findAll().map { it.toAMP() }.sortedBy { it.name.lowercase() }
+        return dbAMPRepository.findAllByOrderByName().map { it.toAMP() }
     }
 
     override fun count(): Long {

diff --git a/...gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepository.kt b/...gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepository.kt
@@ -10,8 +10,7 @@ import org.springframework.stereotype.Repository
 class JpaRegulatoryAreaRepository(private val dbRegulatoryAreaRepository: IDBRegulatoryAreaRepository) :
     IRegulatoryAreaRepository {
     override fun findAll(): List<RegulatoryAreaEntity> {
-        return dbRegulatoryAreaRepository.findAll().map { it.toRegulatoryArea() }
-            .sortedBy { it.layer_name?.lowercase() }
+        return dbRegulatoryAreaRepository.findAllByOrderByLayerName().map { it.toRegulatoryArea() }
     }
 
     override fun findById(id: Int): RegulatoryAreaEntity {

diff --git a/.../gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepository.kt b/.../gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepository.kt
@@ -48,8 +48,7 @@ class JpaVigilanceAreaRepository(
 
     @Transactional
     override fun findAll(): List<VigilanceAreaEntity> {
-        return dbVigilanceAreaRepository.findAllByIsDeletedIsFalse().map { it.toVigilanceAreaEntity() }
-            .sortedBy { it.name?.lowercase() }
+        return dbVigilanceAreaRepository.findAllByIsDeletedFalseOrderByName().map { it.toVigilanceAreaEntity() }
     }
 
     override fun findAllIdsByGeometry(geometry: Geometry): List<Int> {

diff --git a/...gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBAMPRepository.kt b/...gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBAMPRepository.kt
@@ -15,4 +15,6 @@ interface IDBAMPRepository : JpaRepository<AMPModel, Int> {
         """,
     )
     fun findAllIdsByGeom(geometry: Geometry): List<Int>
+
+    fun findAllByOrderByName(): List<AMPModel>
 }
diff --git a/...monitorenv/infrastructure/database/repositories/interfaces/IDBRegulatoryAreaRepository.kt b/...monitorenv/infrastructure/database/repositories/interfaces/IDBRegulatoryAreaRepository.kt
@@ -14,4 +14,6 @@ interface IDBRegulatoryAreaRepository : JpaRepository<RegulatoryAreaModel, Int>
         """,
     )
     fun findAllIdsByGeom(geometry: Geometry): List<Int>
+
+    fun findAllByOrderByLayerName(): List<RegulatoryAreaModel>
 }
diff --git a/.../monitorenv/infrastructure/database/repositories/interfaces/IDBVigilanceAreaRepository.kt b/.../monitorenv/infrastructure/database/repositories/interfaces/IDBVigilanceAreaRepository.kt
@@ -19,7 +19,7 @@ interface IDBVigilanceAreaRepository : JpaRepository<VigilanceAreaModel, Int> {
     )
     fun delete(id: Int)
 
-    fun findAllByIsDeletedIsFalse(): List<VigilanceAreaModel>
+    fun findAllByIsDeletedFalseOrderByName(): List<VigilanceAreaModel>
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(

diff --git a/...rc/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/AmpsITests.kt b/...rc/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/AmpsITests.kt
@@ -42,9 +42,9 @@ class AmpsITests {
                 designation = "ma designation",
                 geom = polygon,
                 name = "mon nom",
-                ref_reg = "ma ref reg",
+                refReg = "ma ref reg",
                 type = "mon type",
-                url_legicem = "mon url legicem",
+                urlLegicem = "mon url legicem",
             )
         given(getAllAMPs.execute()).willReturn(listOf(amp))
 
@@ -56,8 +56,8 @@ class AmpsITests {
             .andExpect(jsonPath("$[0].designation", equalTo(amp.designation)))
             .andExpect(jsonPath("$[0].geom").exists())
             .andExpect(jsonPath("$[0].name", equalTo(amp.name)))
-            .andExpect(jsonPath("$[0].ref_reg", equalTo(amp.ref_reg)))
+            .andExpect(jsonPath("$[0].refReg", equalTo(amp.refReg)))
             .andExpect(jsonPath("$[0].type", equalTo(amp.type)))
-            .andExpect(jsonPath("$[0].url_legicem", equalTo(amp.url_legicem)))
+            .andExpect(jsonPath("$[0].urlLegicem", equalTo(amp.urlLegicem)))
     }
 }
diff --git a/...lin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/RegulatoryAreasITests.kt b/...lin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/RegulatoryAreasITests.kt
@@ -56,19 +56,19 @@ class RegulatoryAreasITests {
             RegulatoryAreaEntity(
                 id = 17,
                 geom = polygon,
-                entity_name = "Zone au sud de la cale",
+                entityName = "Zone au sud de la cale",
                 url = url,
-                layer_name = "ZMEL_Cale_Querlen",
+                layerName = "ZMEL_Cale_Querlen",
                 facade = "NAMO",
-                ref_reg = refReg,
+                refReg = refReg,
                 edition = "2021-11-02",
                 editeur = "Alexis Pré",
                 source = "",
                 observation = "",
                 thematique = "Mouillage",
                 date = "2020-07-01",
-                duree_validite = "15 ans",
-                date_fin = "2035-07-01",
+                dureeValidite = "15 ans",
+                dateFin = "2035-07-01",
                 temporalite = "temporaire",
             )
         given(getAllRegulatoryAreas.execute()).willReturn(listOf(regulatoryArea))
@@ -79,9 +79,9 @@ class RegulatoryAreasITests {
             .andDo(MockMvcResultHandlers.print())
             .andExpect(status().isOk)
             .andExpect(jsonPath("$[0].id", equalTo(regulatoryArea.id)))
-            .andExpect(jsonPath("$[0].entity_name", equalTo(regulatoryArea.entity_name)))
-            .andExpect(jsonPath("$[0].layer_name", equalTo(regulatoryArea.layer_name)))
-            .andExpect(jsonPath("$[0].ref_reg", equalTo(regulatoryArea.ref_reg)))
+            .andExpect(jsonPath("$[0].entityName", equalTo(regulatoryArea.entityName)))
+            .andExpect(jsonPath("$[0].layerName", equalTo(regulatoryArea.layerName)))
+            .andExpect(jsonPath("$[0].refReg", equalTo(regulatoryArea.refReg)))
             .andExpect(jsonPath("$[0].thematique", equalTo(regulatoryArea.thematique)))
             .andExpect(jsonPath("$[0].type", equalTo(regulatoryArea.type)))
             .andExpect(jsonPath("$[0].geom.type", equalTo("MultiPolygon")))
@@ -94,19 +94,19 @@ class RegulatoryAreasITests {
             RegulatoryAreaEntity(
                 id = 17,
                 geom = polygon,
-                entity_name = "Zone au sud de la cale",
+                entityName = "Zone au sud de la cale",
                 url = url,
-                layer_name = "ZMEL_Cale_Querlen",
+                layerName = "ZMEL_Cale_Querlen",
                 facade = "NAMO",
-                ref_reg = refReg,
+                refReg = refReg,
                 edition = "2021-11-02",
                 editeur = "Alexis Pré",
                 source = "",
                 observation = "",
                 thematique = "Mouillage",
                 date = "2020-07-01",
-                duree_validite = "15 ans",
-                date_fin = "2035-07-01",
+                dureeValidite = "15 ans",
+                dateFin = "2035-07-01",
                 temporalite = "temporaire",
             )
 
@@ -117,11 +117,11 @@ class RegulatoryAreasITests {
             // Then
             .andExpect(status().isOk)
             .andExpect(jsonPath("$.id", equalTo(regulatoryArea.id)))
-            .andExpect(jsonPath("$.entity_name", equalTo(regulatoryArea.entity_name)))
+            .andExpect(jsonPath("$.entityName", equalTo(regulatoryArea.entityName)))
             .andExpect(jsonPath("$.facade", equalTo(regulatoryArea.facade)))
             .andExpect(jsonPath("$.geom.type", equalTo("MultiPolygon")))
-            .andExpect(jsonPath("$.layer_name", equalTo(regulatoryArea.layer_name)))
-            .andExpect(jsonPath("$.ref_reg", equalTo(regulatoryArea.ref_reg)))
+            .andExpect(jsonPath("$.layerName", equalTo(regulatoryArea.layerName)))
+            .andExpect(jsonPath("$.refReg", equalTo(regulatoryArea.refReg)))
             .andExpect(jsonPath("$.thematique", equalTo(regulatoryArea.thematique)))
             .andExpect(jsonPath("$.type", equalTo(regulatoryArea.type)))
             .andExpect(jsonPath("$.url", equalTo(regulatoryArea.url)))
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,6 @@ interface IDBAMPRepository : JpaRepository<AMPModel, Int> { @@
             """,
         )
         fun findAllIdsByGeom(geometry: Geometry): List<Int>
+        fun findAllByOrderByName(): List<AMPModel>
     }