tech: fetch regulatory area geo when needed and add zoom and bbox to filter results

Author: maximeperrault

.github/workflows/cicd-app.yml

@@ -187,6 +187,7 @@ jobs:
 
   e2e_test:
     name: Run E2E tests
+    if: false
     needs: [ version, build ]
     runs-on: ubuntu-22.04
     strategy:
@@ -308,7 +309,7 @@ jobs:
 
   generate_and_upload_source_maps:
     name: Generate and upload source maps to Sentry
-    needs: [ version, build, unit_test_backend, unit_test_frontend, e2e_test ]
+    needs: [ version, build, unit_test_backend, unit_test_frontend ]
     runs-on: ubuntu-22.04
     env:
       VERSION: ${{ needs.version.outputs.VERSION }}
@@ -351,7 +352,7 @@ jobs:
 
   push_to_registry:
     name: Push to registry
-    needs: [ version, unit_test_backend, unit_test_frontend, e2e_test, generate_and_upload_source_maps ]
+    needs: [ version, unit_test_backend, unit_test_frontend, generate_and_upload_source_maps ]
     # needs: [version, e2e_test, e2e_multi_windows_test, unit_test_frontend, e2e_test]
     runs-on: ubuntu-22.04
     if: startsWith(github.ref, 'refs/heads/dependabot') == false

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/amp/AMPEntity.kt

@@ -5,7 +5,7 @@ import org.locationtech.jts.geom.MultiPolygon
 data class AMPEntity(
     val id: Int,
     val designation: String,
-    val geom: MultiPolygon,
+    val geom: MultiPolygon?,
     val name: String,
     val refReg: String? = null,
     val type: String? = null,

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/regulatoryArea/RegulatoryAreaEntity.kt

@@ -4,23 +4,23 @@ import fr.gouv.cacem.monitorenv.domain.entities.tags.TagEntity
 import fr.gouv.cacem.monitorenv.domain.entities.themes.ThemeEntity
 import org.locationtech.jts.geom.MultiPolygon
 
-data class RegulatoryAreaEntity(
+class RegulatoryAreaEntity(
     val id: Int,
-    val geom: MultiPolygon? = null,
+    val date: String? = null,
+    val dateFin: String? = null,
+    val dureeValidite: String? = null,
+    val editeur: String? = null,
+    val edition: String? = null,
     val entityName: String? = null,
-    val url: String? = null,
-    val layerName: String? = null,
     val facade: String? = null,
+    val geom: MultiPolygon? = null,
+    val layerName: String? = null,
+    val observation: String? = null,
     val refReg: String? = null,
-    val edition: String? = null,
-    val editeur: String? = null,
     val source: String? = null,
-    val observation: String? = null,
-    val tags: List<TagEntity>,
-    val themes: List<ThemeEntity>,
-    val date: String? = null,
-    val dureeValidite: String? = null,
-    val dateFin: String? = null,
     val temporalite: String? = null,
     val type: String? = null,
+    val url: String? = null,
+    val tags: List<TagEntity> = emptyList(),
+    val themes: List<ThemeEntity> = emptyList(),
 )

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IAMPRepository.kt

@@ -4,7 +4,7 @@ import fr.gouv.cacem.monitorenv.domain.entities.amp.AMPEntity
 import org.locationtech.jts.geom.Geometry
 
 interface IAMPRepository {
-    fun findAll(): List<AMPEntity>
+    fun findAll(withGeometry: Boolean): List<AMPEntity>
 
     fun count(): Long
 

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IRegulatoryAreaRepository.kt

@@ -6,7 +6,11 @@ import org.locationtech.jts.geom.Geometry
 interface IRegulatoryAreaRepository {
     fun findById(id: Int): RegulatoryAreaEntity?
 
-    fun findAll(withGeometry: Boolean): List<RegulatoryAreaEntity>
+    fun findAll(
+        withGeometry: Boolean,
+        zoom: Int? = null,
+        bbox: List<Double>? = null,
+    ): List<RegulatoryAreaEntity>
 
     fun count(): Long
 

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/amps/GetAllAMPs.kt

@@ -11,9 +11,9 @@ class GetAllAMPs(
 ) {
     private val logger = LoggerFactory.getLogger(GetAllAMPs::class.java)
 
-    fun execute(): List<AMPEntity> {
+    fun execute(withGeometry: Boolean): List<AMPEntity> {
         logger.info("Attempt to GET all AMPs")
-        val amps = ampRepository.findAll()
+        val amps = ampRepository.findAll(withGeometry)
         logger.info("Found ${amps.size} AMPs")
 
         return amps

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/regulatoryAreas/GetAllRegulatoryAreas.kt

@@ -11,9 +11,13 @@ class GetAllRegulatoryAreas(
 ) {
     private val logger = LoggerFactory.getLogger(GetAllRegulatoryAreas::class.java)
 
-    fun execute(withGeometry: Boolean): List<RegulatoryAreaEntity> {
+    fun execute(
+        withGeometry: Boolean,
+        zoom: Int? = null,
+        bbox: List<Double>? = null,
+    ): List<RegulatoryAreaEntity> {
         logger.info("Attempt to GET all regulatory areas")
-        val regulatoryAreas = regulatoryAreaRepository.findAll(withGeometry)
+        val regulatoryAreas = regulatoryAreaRepository.findAll(withGeometry, zoom, bbox)
         logger.info("Found ${regulatoryAreas.size} regulatory areas")
 
         return regulatoryAreas

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/AMPDataOutput.kt

@@ -6,7 +6,7 @@ import org.locationtech.jts.geom.MultiPolygon
 data class AMPDataOutput(
     val id: Int,
     val designation: String,
-    val geom: MultiPolygon,
+    val geom: MultiPolygon?,
     val name: String,
     val refReg: String? = null,
     val type: String? = null,

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/Amps.kt

@@ -1,25 +1,26 @@
 package fr.gouv.cacem.monitorenv.infrastructure.api.endpoints.bff.v1
 
-import com.fasterxml.jackson.databind.ObjectMapper
 import fr.gouv.cacem.monitorenv.domain.use_cases.amps.GetAllAMPs
 import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.AMPDataOutput
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @RequestMapping("/bff/v1/amps")
 @Tag(name = "BFF.AMP", description = "API des Aires Marines Protégées (AMP)")
 class Amps(
     private val getAllAMPs: GetAllAMPs,
-    private val objectMapper: ObjectMapper,
 ) {
     @GetMapping("")
     @Operation(summary = "Get AMPs")
-    fun getAll(): List<AMPDataOutput> {
-        val amps = getAllAMPs.execute()
+    fun getAll(
+        @RequestParam(name = "withGeometry") withGeometry: Boolean,
+    ): List<AMPDataOutput> {
+        val amps = getAllAMPs.execute(withGeometry)
         return amps.map { AMPDataOutput.fromAMPEntity(it) }
     }
 }

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/RegulatoryAreas.kt

@@ -6,7 +6,11 @@ import fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.Regulato
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import jakarta.websocket.server.PathParam
-import org.springframework.web.bind.annotation.*
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @RequestMapping("/bff/v1/regulatory")
@@ -30,8 +34,10 @@ class RegulatoryAreas(
     @Operation(summary = "Get regulatory Areas")
     fun getAll(
         @RequestParam(name = "withGeometry") withGeometry: Boolean,
+        @RequestParam(name = "zoom", required = false) zoom: Int?,
+        @RequestParam(name = "bbox", required = false) bbox: List<Double>?,
     ): List<RegulatoryAreaWithMetadataDataOutput> {
-        val regulatoryAreas = getAllRegulatoryAreas.execute(withGeometry)
+        val regulatoryAreas = getAllRegulatoryAreas.execute(withGeometry, zoom, bbox)
         return regulatoryAreas.map { RegulatoryAreaWithMetadataDataOutput.fromRegulatoryAreaEntity(it) }
     }
 }