From 3356329b2e346f8a33db82c1fdce646e1dbc6ded Mon Sep 17 00:00:00 2001 From: Maxime Perrault Date: Thu, 24 Oct 2024 17:55:25 +0200 Subject: [PATCH] review: ivan's review. Renaming props --- .../entities/dashboard/DashboardEntity.kt | 10 +-- .../entities/dashboard/ExtractedAreaEntity.kt | 8 +-- .../domain/repositories/IAMPRepository.kt | 2 +- .../repositories/IRegulatoryAreaRepository.kt | 2 +- .../repositories/IReportingRepository.kt | 2 +- .../repositories/IVigilanceAreaRepository.kt | 2 +- .../domain/use_cases/dashboard/ExtractArea.kt | 16 ++--- .../inputs/dashboards/DashboardDataInput.kt | 20 +++--- .../outputs/dashboards/DashboardDataOutput.kt | 20 +++--- .../dashboards/DashboardsDataOutput.kt | 22 +++---- .../dashboards/ExtractedAreaDataOutput.kt | 16 ++--- .../database/model/DashboardModel.kt | 10 +-- .../database/repositories/JpaAMPRepository.kt | 4 +- .../repositories/JpaDashboardRepository.kt | 10 +-- .../JpaRegulatoryAreaRepository.kt | 4 +- .../repositories/JpaReportingRepository.kt | 4 +- .../JpaVigilanceAreaRepository.kt | 4 +- .../interfaces/IDBAMPRepository.kt | 2 +- .../interfaces/IDBRegulatoryAreaRepository.kt | 2 +- .../interfaces/IDBReportingRepository.kt | 2 +- .../interfaces/IDBVigilanceAreaRepository.kt | 2 +- .../use_cases/dashboard/ExtractAreaUTest.kt | 48 +++++++-------- .../dashboard/fixtures/DashboardFixture.kt | 10 +-- .../api/endpoints/bff/v1/DashboardsITests.kt | 61 ++++++++++--------- .../repositories/JpaAMPRepositoryTests.kt | 2 +- .../JpaDashboardsRepositoryITest.kt | 10 +-- .../JpaRegulatoryAreaRepositoryITests.kt | 2 +- .../JpaReportingRepositoryITests.kt | 4 +- .../JpaVigilanceAreaRepositoryITests.kt | 2 +- .../main_window/dashboard/dashboard.spec.ts | 8 +-- .../dashboard/edit_dashboard.spec.ts | 4 +- .../DashboardForm/ControlUnits/Item.tsx | 2 +- .../SelectedControlUnits/index.tsx | 2 +- .../DashboardForm/DashboardForm.tsx | 8 +-- .../DashboardsList/Columns/index.tsx | 20 +++--- .../Rows/TotalSelectedItemsCell.tsx | 10 +-- .../Dashboard/components/Layers/index.tsx | 16 ++--- frontend/src/features/Dashboard/slice.ts | 37 +++++------ frontend/src/features/Dashboard/types.ts | 28 ++++----- .../Dashboard/useCases/createDashboard.ts | 10 +-- frontend/src/features/Dashboard/utils.ts | 16 ++--- 41 files changed, 234 insertions(+), 230 deletions(-) diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/dashboard/DashboardEntity.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/dashboard/DashboardEntity.kt index 1dd32d76d..0c08e2b98 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/dashboard/DashboardEntity.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/dashboard/DashboardEntity.kt @@ -13,9 +13,9 @@ data class DashboardEntity( val updatedAt: ZonedDateTime?, val inseeCode: String?, val seaFront: String?, - val amps: List, - val controlUnits: List, - val regulatoryAreas: List, - val reportings: List, - val vigilanceAreas: List, + val ampIds: List, + val controlUnitIds: List, + val regulatoryAreaIds: List, + val reportingIds: List, + val vigilanceAreaIds: List, ) diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/dashboard/ExtractedAreaEntity.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/dashboard/ExtractedAreaEntity.kt index a649c817f..5d3c58999 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/dashboard/ExtractedAreaEntity.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/dashboard/ExtractedAreaEntity.kt @@ -2,8 +2,8 @@ package fr.gouv.cacem.monitorenv.domain.entities.dashboard data class ExtractedAreaEntity( val inseeCode: String?, - val reportings: List, - val regulatoryAreas: List, - val amps: List, - val vigilanceAreas: List, + val reportingIds: List, + val regulatoryAreaIds: List, + val ampIds: List, + val vigilanceAreaIds: List, ) diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IAMPRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IAMPRepository.kt index cadb9e383..b0c502874 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IAMPRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IAMPRepository.kt @@ -8,5 +8,5 @@ interface IAMPRepository { fun count(): Long - fun findAllIdByGeometry(geometry: Geometry): List + fun findAllIdsByGeometry(geometry: Geometry): List } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IRegulatoryAreaRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IRegulatoryAreaRepository.kt index 2e54fdd31..f4c9f8aaa 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IRegulatoryAreaRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IRegulatoryAreaRepository.kt @@ -10,5 +10,5 @@ interface IRegulatoryAreaRepository { fun count(): Long - fun findAllIdByGeometry(geometry: Geometry): List + fun findAllIdsByGeometry(geometry: Geometry): List } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IReportingRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IReportingRepository.kt index 33c28b024..5d82f4d25 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IReportingRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IReportingRepository.kt @@ -59,5 +59,5 @@ interface IReportingRepository { fun save(reporting: ReportingEntity): ReportingDTO - fun findAllIdByGeometry(geometry: Geometry): List + fun findAllIdsByGeometry(geometry: Geometry): List } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IVigilanceAreaRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IVigilanceAreaRepository.kt index bb29ec873..dc45b59bd 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IVigilanceAreaRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IVigilanceAreaRepository.kt @@ -14,5 +14,5 @@ interface IVigilanceAreaRepository { fun archiveOutdatedVigilanceAreas(): Int - fun findAllIdByGeometry(geometry: Geometry): List + fun findAllIdsByGeometry(geometry: Geometry): List } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/ExtractArea.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/ExtractArea.kt index 9af81e7a1..9e12b6c4c 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/ExtractArea.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/ExtractArea.kt @@ -19,17 +19,17 @@ class ExtractArea( ) { fun execute(geometry: Geometry): ExtractedAreaEntity { val inseeCode = departmentAreaRepository.findDepartmentFromGeometry(geometry = geometry) - val reportings = reportingRepository.findAllIdByGeometry(geometry = geometry) - val regulatoryAreas = regulatoryAreaRepository.findAllIdByGeometry(geometry = geometry) - val amps = ampRepository.findAllIdByGeometry(geometry = geometry) - val vigilanceAreas = vigilanceAreaRepository.findAllIdByGeometry(geometry = geometry) + val reportings = reportingRepository.findAllIdsByGeometry(geometry = geometry) + val regulatoryAreas = regulatoryAreaRepository.findAllIdsByGeometry(geometry = geometry) + val amps = ampRepository.findAllIdsByGeometry(geometry = geometry) + val vigilanceAreas = vigilanceAreaRepository.findAllIdsByGeometry(geometry = geometry) return ExtractedAreaEntity( inseeCode = inseeCode, - reportings = reportings, - regulatoryAreas = regulatoryAreas, - amps = amps, - vigilanceAreas = vigilanceAreas, + reportingIds = reportings, + regulatoryAreaIds = regulatoryAreas, + ampIds = amps, + vigilanceAreaIds = vigilanceAreas, ) } } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/inputs/dashboards/DashboardDataInput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/inputs/dashboards/DashboardDataInput.kt index a22fb50a1..6e75e2d94 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/inputs/dashboards/DashboardDataInput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/inputs/dashboards/DashboardDataInput.kt @@ -13,11 +13,11 @@ class DashboardDataInput( val updatedAt: ZonedDateTime?, val comments: String?, val inseeCode: String?, - val amps: List, - val controlUnits: List, - val regulatoryAreas: List, - val reportings: List, - val vigilanceAreas: List, + val ampIds: List, + val controlUnitIds: List, + val regulatoryAreaIds: List, + val reportingIds: List, + val vigilanceAreaIds: List, ) { fun toDashboardEntity(): DashboardEntity { return DashboardEntity( @@ -28,11 +28,11 @@ class DashboardDataInput( createdAt = createdAt, updatedAt = updatedAt, inseeCode = inseeCode, - amps = amps, - controlUnits = controlUnits, - reportings = reportings, - regulatoryAreas = regulatoryAreas, - vigilanceAreas = vigilanceAreas, + ampIds = ampIds, + controlUnitIds = controlUnitIds, + reportingIds = reportingIds, + regulatoryAreaIds = regulatoryAreaIds, + vigilanceAreaIds = vigilanceAreaIds, seaFront = null, ) } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/DashboardDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/DashboardDataOutput.kt index c2c515647..3517e3463 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/DashboardDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/DashboardDataOutput.kt @@ -13,11 +13,11 @@ class DashboardDataOutput( val createdAt: ZonedDateTime?, val updatedAt: ZonedDateTime?, val inseeCode: String?, - val amps: List, - val controlUnits: List, - val regulatoryAreas: List, - val reportings: List, - val vigilanceAreas: List, + val ampIds: List, + val controlUnitIds: List, + val regulatoryAreaIds: List, + val reportingIds: List, + val vigilanceAreaIds: List, ) { companion object { fun fromDashboardEntity(dashboardEntity: DashboardEntity): DashboardDataOutput { @@ -29,11 +29,11 @@ class DashboardDataOutput( createdAt = dashboardEntity.createdAt, updatedAt = dashboardEntity.updatedAt, inseeCode = dashboardEntity.inseeCode, - amps = dashboardEntity.amps, - controlUnits = dashboardEntity.controlUnits, - regulatoryAreas = dashboardEntity.regulatoryAreas, - reportings = dashboardEntity.reportings, - vigilanceAreas = dashboardEntity.vigilanceAreas, + ampIds = dashboardEntity.ampIds, + controlUnitIds = dashboardEntity.controlUnitIds, + regulatoryAreaIds = dashboardEntity.regulatoryAreaIds, + reportingIds = dashboardEntity.reportingIds, + vigilanceAreaIds = dashboardEntity.vigilanceAreaIds, ) } } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/DashboardsDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/DashboardsDataOutput.kt index 487cfa7d4..790f347cb 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/DashboardsDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/DashboardsDataOutput.kt @@ -3,7 +3,7 @@ package fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs.dashboa import fr.gouv.cacem.monitorenv.domain.entities.dashboard.DashboardEntity import org.locationtech.jts.geom.Geometry import java.time.ZonedDateTime -import java.util.* +import java.util.UUID class DashboardsDataOutput( val id: UUID?, @@ -13,12 +13,12 @@ class DashboardsDataOutput( val createdAt: ZonedDateTime?, val updatedAt: ZonedDateTime?, val inseeCode: String?, - val amps: List, - val controlUnits: List, - val regulatoryAreas: List, - val reportings: List, + val ampIds: List, + val controlUnitIds: List, + val regulatoryAreaIds: List, + val reportingIds: List, + val vigilanceAreaIds: List, val seaFront: String?, - val vigilanceAreas: List, ) { companion object { fun fromDashboardEntity(dashboardEntity: DashboardEntity): DashboardsDataOutput { @@ -30,12 +30,12 @@ class DashboardsDataOutput( createdAt = dashboardEntity.createdAt, updatedAt = dashboardEntity.updatedAt, inseeCode = dashboardEntity.inseeCode, - amps = dashboardEntity.amps, - controlUnits = dashboardEntity.controlUnits, - regulatoryAreas = dashboardEntity.regulatoryAreas, - reportings = dashboardEntity.reportings, + ampIds = dashboardEntity.ampIds, + controlUnitIds = dashboardEntity.controlUnitIds, + regulatoryAreaIds = dashboardEntity.regulatoryAreaIds, + reportingIds = dashboardEntity.reportingIds, seaFront = dashboardEntity.seaFront, - vigilanceAreas = dashboardEntity.vigilanceAreas, + vigilanceAreaIds = dashboardEntity.vigilanceAreaIds, ) } } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/ExtractedAreaDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/ExtractedAreaDataOutput.kt index 87e16cbbe..9352884e6 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/ExtractedAreaDataOutput.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/dashboards/ExtractedAreaDataOutput.kt @@ -4,19 +4,19 @@ import fr.gouv.cacem.monitorenv.domain.entities.dashboard.ExtractedAreaEntity class ExtractedAreaDataOutput( val inseeCode: String?, - val reportings: List, - val regulatoryAreas: List, - val amps: List, - val vigilanceAreas: List, + val reportingIds: List, + val regulatoryAreaIds: List, + val ampIds: List, + val vigilanceAreaIds: List, ) { companion object { fun fromExtractAreaEntity(extractedAreaEntity: ExtractedAreaEntity): ExtractedAreaDataOutput { return ExtractedAreaDataOutput( inseeCode = extractedAreaEntity.inseeCode, - reportings = extractedAreaEntity.reportings, - regulatoryAreas = extractedAreaEntity.regulatoryAreas, - amps = extractedAreaEntity.amps, - vigilanceAreas = extractedAreaEntity.vigilanceAreas, + reportingIds = extractedAreaEntity.reportingIds, + regulatoryAreaIds = extractedAreaEntity.regulatoryAreaIds, + ampIds = extractedAreaEntity.ampIds, + vigilanceAreaIds = extractedAreaEntity.vigilanceAreaIds, ) } } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/DashboardModel.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/DashboardModel.kt index e54d8f542..266e5d3ce 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/DashboardModel.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/DashboardModel.kt @@ -81,11 +81,11 @@ data class DashboardModel( createdAt = createdAt, updatedAt = updatedAt, inseeCode = inseeCode, - amps = amps, - controlUnits = controlUnits, - regulatoryAreas = regulatoryAreas, - reportings = reportings, - vigilanceAreas = vigilanceAreas, + ampIds = amps, + controlUnitIds = controlUnits, + regulatoryAreaIds = regulatoryAreas, + reportingIds = reportings, + vigilanceAreaIds = vigilanceAreas, seaFront = seaFront, ) } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepository.kt index 98574c3f5..72ce14e2e 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepository.kt @@ -17,7 +17,7 @@ class JpaAMPRepository(private val dbAMPRepository: IDBAMPRepository) : return dbAMPRepository.count() } - override fun findAllIdByGeometry(geometry: Geometry): List { - return dbAMPRepository.findAllIdByGeom(geometry) + override fun findAllIdsByGeometry(geometry: Geometry): List { + return dbAMPRepository.findAllIdsByGeom(geometry) } } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaDashboardRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaDashboardRepository.kt index 796763453..d34fc264b 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaDashboardRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaDashboardRepository.kt @@ -47,7 +47,7 @@ class JpaDashboardRepository( dashboard: DashboardEntity, dashboardDatasToSave: MutableList, ) { - dashboard.regulatoryAreas.forEach { + dashboard.regulatoryAreaIds.forEach { dashboardDatasToSave.add( DashboardDatasModel( id = null, @@ -67,7 +67,7 @@ class JpaDashboardRepository( dashboard: DashboardEntity, dashboardDatasToSave: MutableList, ) { - dashboard.vigilanceAreas.forEach { + dashboard.vigilanceAreaIds.forEach { dashboardDatasToSave.add( DashboardDatasModel( id = null, @@ -87,7 +87,7 @@ class JpaDashboardRepository( dashboard: DashboardEntity, dashboardDatasToSave: MutableList, ) { - dashboard.reportings.forEach { + dashboard.reportingIds.forEach { dashboardDatasToSave.add( DashboardDatasModel( id = null, @@ -127,7 +127,7 @@ class JpaDashboardRepository( dashboard: DashboardEntity, dashboardDatasToSave: MutableList, ) { - dashboard.amps.forEach { + dashboard.ampIds.forEach { dashboardDatasToSave.add( DashboardDatasModel( id = null, @@ -147,7 +147,7 @@ class JpaDashboardRepository( dashboard: DashboardEntity, dashboardDatasToSave: MutableList, ) { - dashboard.controlUnits.forEach { + dashboard.controlUnitIds.forEach { dashboardDatasToSave.add( DashboardDatasModel( id = null, diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepository.kt index b59fd404e..a6dfe5028 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepository.kt @@ -21,7 +21,7 @@ class JpaRegulatoryAreaRepository(private val dbRegulatoryAreaRepository: IDBReg return dbRegulatoryAreaRepository.count() } - override fun findAllIdByGeometry(geometry: Geometry): List { - return dbRegulatoryAreaRepository.findAllIdByGeom(geometry) + override fun findAllIdsByGeometry(geometry: Geometry): List { + return dbRegulatoryAreaRepository.findAllIdsByGeom(geometry) } } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepository.kt index 95f35b3af..e11ded857 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepository.kt @@ -249,8 +249,8 @@ class JpaReportingRepository( } @Transactional - override fun findAllIdByGeometry(geometry: Geometry): List { - return dbReportingRepository.findAllByGeom(geometry = geometry) + override fun findAllIdsByGeometry(geometry: Geometry): List { + return dbReportingRepository.findAllIdsByGeom(geometry = geometry) } @Transactional diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepository.kt index 0c8158eb1..9874e4f15 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepository.kt @@ -51,8 +51,8 @@ class JpaVigilanceAreaRepository( return dbVigilanceAreaRepository.findAllByIsDeletedIsFalse().map { it.toVigilanceAreaEntity() } } - override fun findAllIdByGeometry(geometry: Geometry): List { - return dbVigilanceAreaRepository.findAllIdByGeom(geometry) + override fun findAllIdsByGeometry(geometry: Geometry): List { + return dbVigilanceAreaRepository.findAllIdsByGeom(geometry) } @Transactional diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBAMPRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBAMPRepository.kt index 2cdf2a86e..3b3fe9e11 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBAMPRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBAMPRepository.kt @@ -14,5 +14,5 @@ interface IDBAMPRepository : JpaRepository { WHERE ST_INTERSECTS(st_setsrid(geom, 4326), st_setsrid(:geometry, 4326)) """, ) - fun findAllIdByGeom(geometry: Geometry): List + fun findAllIdsByGeom(geometry: Geometry): List } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBRegulatoryAreaRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBRegulatoryAreaRepository.kt index d1780881d..9d8a85f60 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBRegulatoryAreaRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBRegulatoryAreaRepository.kt @@ -13,5 +13,5 @@ interface IDBRegulatoryAreaRepository : JpaRepository WHERE ST_INTERSECTS(st_setsrid(r.geom, 4326), st_setsrid(:geometry, 4326)) """, ) - fun findAllIdByGeom(geometry: Geometry): List + fun findAllIdsByGeom(geometry: Geometry): List } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBReportingRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBReportingRepository.kt index 7a59815e7..467b37898 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBReportingRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBReportingRepository.kt @@ -202,5 +202,5 @@ interface IDBReportingRepository : JpaRepository { WHERE ST_INTERSECTS(st_setsrid(r.geom, 4326), st_setsrid(:geometry, 4326)) """, ) - fun findAllByGeom(geometry: Geometry): List + fun findAllIdsByGeom(geometry: Geometry): List } diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBVigilanceAreaRepository.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBVigilanceAreaRepository.kt index 4ad6d4c81..fe53d897c 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBVigilanceAreaRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBVigilanceAreaRepository.kt @@ -40,5 +40,5 @@ interface IDBVigilanceAreaRepository : JpaRepository { WHERE ST_INTERSECTS(st_setsrid(vigilanceArea.geom, 4326), st_setsrid(:geometry, 4326)) """, ) - fun findAllIdByGeom(geometry: Geometry): List + fun findAllIdsByGeom(geometry: Geometry): List } diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/ExtractAreaUTest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/ExtractAreaUTest.kt index a53271c75..2da040a4d 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/ExtractAreaUTest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/ExtractAreaUTest.kt @@ -39,26 +39,26 @@ class ExtractAreaUTest { val polygon = wktReader.read(multipolygonString) as MultiPolygon given(departementAreaRepository.findDepartmentFromGeometry(geometry = polygon)).willReturn(null) - given(reportingRepository.findAllIdByGeometry(geometry = polygon)).willReturn(listOf()) - given(regulatoryAreaRepository.findAllIdByGeometry(geometry = polygon)).willReturn(listOf()) - given(ampAreaRepository.findAllIdByGeometry(geometry = polygon)).willReturn(listOf()) - given(vigilanceAreaRepository.findAllIdByGeometry(geometry = polygon)).willReturn(listOf()) + given(reportingRepository.findAllIdsByGeometry(geometry = polygon)).willReturn(listOf()) + given(regulatoryAreaRepository.findAllIdsByGeometry(geometry = polygon)).willReturn(listOf()) + given(ampAreaRepository.findAllIdsByGeometry(geometry = polygon)).willReturn(listOf()) + given(vigilanceAreaRepository.findAllIdsByGeometry(geometry = polygon)).willReturn(listOf()) // When val extractedAreaEntity = extractArea.execute(polygon) // Then verify(departementAreaRepository).findDepartmentFromGeometry(geometry = polygon) - verify(reportingRepository).findAllIdByGeometry(geometry = polygon) - verify(regulatoryAreaRepository).findAllIdByGeometry(geometry = polygon) - verify(ampAreaRepository).findAllIdByGeometry(geometry = polygon) - verify(vigilanceAreaRepository).findAllIdByGeometry(geometry = polygon) + verify(reportingRepository).findAllIdsByGeometry(geometry = polygon) + verify(regulatoryAreaRepository).findAllIdsByGeometry(geometry = polygon) + verify(ampAreaRepository).findAllIdsByGeometry(geometry = polygon) + verify(vigilanceAreaRepository).findAllIdsByGeometry(geometry = polygon) assertThat(extractedAreaEntity.inseeCode).isNull() - assertThat(extractedAreaEntity.reportings).isEmpty() - assertThat(extractedAreaEntity.regulatoryAreas).isEmpty() - assertThat(extractedAreaEntity.amps).isEmpty() - assertThat(extractedAreaEntity.vigilanceAreas).isEmpty() + assertThat(extractedAreaEntity.reportingIds).isEmpty() + assertThat(extractedAreaEntity.regulatoryAreaIds).isEmpty() + assertThat(extractedAreaEntity.ampIds).isEmpty() + assertThat(extractedAreaEntity.vigilanceAreaIds).isEmpty() } @Test @@ -73,28 +73,28 @@ class ExtractAreaUTest { val inseeCode = "44" given(departementAreaRepository.findDepartmentFromGeometry(geometry = polygon)).willReturn(inseeCode) val reportings = listOf(1) - given(reportingRepository.findAllIdByGeometry(geometry = polygon)).willReturn(reportings) + given(reportingRepository.findAllIdsByGeometry(geometry = polygon)).willReturn(reportings) val regulatoryAreas = listOf(2) - given(regulatoryAreaRepository.findAllIdByGeometry(geometry = polygon)).willReturn(regulatoryAreas) + given(regulatoryAreaRepository.findAllIdsByGeometry(geometry = polygon)).willReturn(regulatoryAreas) val amps = listOf(3) - given(ampAreaRepository.findAllIdByGeometry(geometry = polygon)).willReturn(amps) + given(ampAreaRepository.findAllIdsByGeometry(geometry = polygon)).willReturn(amps) val vigilanceAreas = listOf(4) - given(vigilanceAreaRepository.findAllIdByGeometry(geometry = polygon)).willReturn(vigilanceAreas) + given(vigilanceAreaRepository.findAllIdsByGeometry(geometry = polygon)).willReturn(vigilanceAreas) // When val extractedAreaEntity = extractArea.execute(polygon) // Then verify(departementAreaRepository).findDepartmentFromGeometry(geometry = polygon) - verify(reportingRepository).findAllIdByGeometry(geometry = polygon) - verify(regulatoryAreaRepository).findAllIdByGeometry(geometry = polygon) - verify(ampAreaRepository).findAllIdByGeometry(geometry = polygon) - verify(vigilanceAreaRepository).findAllIdByGeometry(geometry = polygon) + verify(reportingRepository).findAllIdsByGeometry(geometry = polygon) + verify(regulatoryAreaRepository).findAllIdsByGeometry(geometry = polygon) + verify(ampAreaRepository).findAllIdsByGeometry(geometry = polygon) + verify(vigilanceAreaRepository).findAllIdsByGeometry(geometry = polygon) assertThat(extractedAreaEntity.inseeCode).isEqualTo(inseeCode) - assertThat(extractedAreaEntity.reportings).isEqualTo(reportings) - assertThat(extractedAreaEntity.regulatoryAreas).isEqualTo(regulatoryAreas) - assertThat(extractedAreaEntity.amps).isEqualTo(amps) - assertThat(extractedAreaEntity.vigilanceAreas).isEqualTo(vigilanceAreas) + assertThat(extractedAreaEntity.reportingIds).isEqualTo(reportings) + assertThat(extractedAreaEntity.regulatoryAreaIds).isEqualTo(regulatoryAreas) + assertThat(extractedAreaEntity.ampIds).isEqualTo(amps) + assertThat(extractedAreaEntity.vigilanceAreaIds).isEqualTo(vigilanceAreas) } } diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/fixtures/DashboardFixture.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/fixtures/DashboardFixture.kt index 9b3e81f62..86b488ec0 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/fixtures/DashboardFixture.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/dashboard/fixtures/DashboardFixture.kt @@ -30,12 +30,12 @@ class DashboardFixture { comments = comments, createdAt = createdAt, updatedAt = updatedAt, - amps = amps, - regulatoryAreas = regulatoryAreas, + ampIds = amps, + regulatoryAreaIds = regulatoryAreas, inseeCode = inseeCode, - reportings = reportings, - vigilanceAreas = vigilanceAreas, - controlUnits = controlUnits, + reportingIds = reportings, + vigilanceAreaIds = vigilanceAreas, + controlUnitIds = controlUnits, seaFront = seaFront, ) } diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/DashboardsITests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/DashboardsITests.kt index b8b3c733c..70a0b3e2f 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/DashboardsITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/endpoints/bff/v1/DashboardsITests.kt @@ -66,10 +66,10 @@ class DashboardsITests { .willReturn( ExtractedAreaEntity( inseeCode = "44", - reportings = reportings, - regulatoryAreas = regulatoryAreas, - amps = amps, - vigilanceAreas = vigilanceAreas, + reportingIds = reportings, + regulatoryAreaIds = regulatoryAreas, + ampIds = amps, + vigilanceAreaIds = vigilanceAreas, ), ) @@ -81,10 +81,10 @@ class DashboardsITests { // Then .andExpect(status().isOk) .andExpect(jsonPath("$.inseeCode", equalTo("44"))) - .andExpect(jsonPath("$.reportings[0]", equalTo(reportings[0]))) - .andExpect(jsonPath("$.regulatoryAreas[0]", equalTo(regulatoryAreas[0]))) - .andExpect(jsonPath("$.amps[0]", equalTo(amps[0]))) - .andExpect(jsonPath("$.vigilanceAreas[0]", equalTo(vigilanceAreas[0]))) + .andExpect(jsonPath("$.reportingIds[0]", equalTo(reportings[0]))) + .andExpect(jsonPath("$.regulatoryAreaIds[0]", equalTo(regulatoryAreas[0]))) + .andExpect(jsonPath("$.ampIds[0]", equalTo(amps[0]))) + .andExpect(jsonPath("$.vigilanceAreaIds[0]", equalTo(vigilanceAreas[0]))) } @Test @@ -100,10 +100,10 @@ class DashboardsITests { .willReturn( ExtractedAreaEntity( inseeCode = null, - reportings = reportings, - regulatoryAreas = regulatoryAreas, - amps = amps, - vigilanceAreas = vigilanceAreas, + reportingIds = reportings, + regulatoryAreaIds = regulatoryAreas, + ampIds = amps, + vigilanceAreaIds = vigilanceAreas, ), ) @@ -115,10 +115,10 @@ class DashboardsITests { // Then .andExpect(status().isOk) .andExpect(jsonPath("$.inseeCode", equalTo(null))) - .andExpect(jsonPath("$.reportings.size()", equalTo(0))) - .andExpect(jsonPath("$.regulatoryAreas.size()", equalTo(0))) - .andExpect(jsonPath("$.amps.size()", equalTo(0))) - .andExpect(jsonPath("$.vigilanceAreas.size()", equalTo(0))) + .andExpect(jsonPath("$.reportingIds.size()", equalTo(0))) + .andExpect(jsonPath("$.regulatoryAreaIds.size()", equalTo(0))) + .andExpect(jsonPath("$.ampIds.size()", equalTo(0))) + .andExpect(jsonPath("$.vigilanceAreaIds.size()", equalTo(0))) } @Test @@ -160,11 +160,11 @@ class DashboardsITests { updatedAt = updatedAt, geom = geometry, inseeCode = inseeCode, - amps = amps, - regulatoryAreas = regulatoryAreas, - vigilanceAreas = vigilanceAreas, - reportings = reportings, - controlUnits = controlUnits, + ampIds = amps, + regulatoryAreaIds = regulatoryAreas, + vigilanceAreaIds = vigilanceAreas, + reportingIds = reportings, + controlUnitIds = controlUnits, ) val dashboard = aDashboard( @@ -208,11 +208,11 @@ class DashboardsITests { ), ) .andExpect(jsonPath("$.inseeCode", equalTo(inseeCode))) - .andExpect(jsonPath("$.amps", equalTo(amps))) - .andExpect(jsonPath("$.regulatoryAreas", equalTo(regulatoryAreas))) - .andExpect(jsonPath("$.reportings", equalTo(reportings))) - .andExpect(jsonPath("$.vigilanceAreas", equalTo(vigilanceAreas))) - .andExpect(jsonPath("$.controlUnits", equalTo(controlUnits))) + .andExpect(jsonPath("$.ampIds", equalTo(amps))) + .andExpect(jsonPath("$.regulatoryAreaIds", equalTo(regulatoryAreas))) + .andExpect(jsonPath("$.reportingIds", equalTo(reportings))) + .andExpect(jsonPath("$.vigilanceAreaIds", equalTo(vigilanceAreas))) + .andExpect(jsonPath("$.controlUnitIds", equalTo(controlUnits))) } @Test @@ -270,9 +270,10 @@ class DashboardsITests { .andExpect(jsonPath("$.createdAt", equalTo(dashboard.createdAt))) .andExpect(jsonPath("$.updatedAt", equalTo(dashboard.updatedAt))) .andExpect(jsonPath("$.inseeCode", equalTo(dashboard.inseeCode))) - .andExpect(jsonPath("$.amps", equalTo(dashboard.amps))) - .andExpect(jsonPath("$.regulatoryAreas", equalTo(dashboard.regulatoryAreas))) - .andExpect(jsonPath("$.reportings", equalTo(dashboard.reportings))) - .andExpect(jsonPath("$.vigilanceAreas", equalTo(dashboard.vigilanceAreas))) + .andExpect(jsonPath("$.ampIds", equalTo(dashboard.ampIds))) + .andExpect(jsonPath("$.regulatoryAreaIds", equalTo(dashboard.regulatoryAreaIds))) + .andExpect(jsonPath("$.reportingIds", equalTo(dashboard.reportingIds))) + .andExpect(jsonPath("$.vigilanceAreaIds", equalTo(dashboard.vigilanceAreaIds))) + .andExpect(jsonPath("$.controlUnitIds", equalTo(dashboard.controlUnitIds))) } } diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepositoryTests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepositoryTests.kt index 62a1bce87..b96d81a5e 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepositoryTests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaAMPRepositoryTests.kt @@ -30,7 +30,7 @@ class JpaAMPRepositoryTests : AbstractDBTests() { val polygon = wktReader.read(multipolygonString) as MultiPolygon // When - val amps = jpaAMPRepository.findAllIdByGeometry(polygon) + val amps = jpaAMPRepository.findAllIdsByGeometry(polygon) // Then assertThat(amps).hasSize(1) diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaDashboardsRepositoryITest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaDashboardsRepositoryITest.kt index 9c2e917fb..215e584b7 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaDashboardsRepositoryITest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaDashboardsRepositoryITest.kt @@ -80,11 +80,11 @@ class JpaDashboardsRepositoryITest : AbstractDBTests() { comments = comments, geom = geom, inseeCode = inseeCode, - amps = amps, - controlUnits = controlUnits, - regulatoryAreas = regulatoryAreas, - reportings = reportings, - vigilanceAreas = vigilanceAreas, + ampIds = amps, + controlUnitIds = controlUnits, + regulatoryAreaIds = regulatoryAreas, + reportingIds = reportings, + vigilanceAreaIds = vigilanceAreas, ) // When diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepositoryITests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepositoryITests.kt index 604b97786..943ffa3b9 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepositoryITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaRegulatoryAreaRepositoryITests.kt @@ -103,7 +103,7 @@ class JpaRegulatoryAreaRepositoryITests : AbstractDBTests() { val polygon = wktReader.read(multipolygonString) as MultiPolygon // When - val regulatoryAreas = jpaRegulatoryAreasRepository.findAllIdByGeometry(polygon) + val regulatoryAreas = jpaRegulatoryAreasRepository.findAllIdsByGeometry(polygon) // Then assertThat(regulatoryAreas).hasSize(4) diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt index 0ae161a8e..117ca424f 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaReportingRepositoryITests.kt @@ -681,7 +681,7 @@ class JpaReportingRepositoryITests : AbstractDBTests() { val polygon = wktReader.read(multipolygonString) as MultiPolygon // When - val reportings = jpaReportingRepository.findAllIdByGeometry(polygon) + val reportings = jpaReportingRepository.findAllIdsByGeometry(polygon) // Then assertThat(reportings).hasSize(1) @@ -699,7 +699,7 @@ class JpaReportingRepositoryITests : AbstractDBTests() { val polygon = wktReader.read(multipolygonString) as MultiPolygon // When - val reportings = jpaReportingRepository.findAllIdByGeometry(polygon) + val reportings = jpaReportingRepository.findAllIdsByGeometry(polygon) // Then assertThat(reportings).isEmpty() diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepositoryITests.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepositoryITests.kt index a8386590f..66bacd87c 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepositoryITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaVigilanceAreaRepositoryITests.kt @@ -195,7 +195,7 @@ class JpaVigilanceAreaRepositoryITests : AbstractDBTests() { val polygon = wktReader.read(multipolygonString) as MultiPolygon // When - val vigilanceAreas = jpaVigilanceAreaRepository.findAllIdByGeometry(polygon) + val vigilanceAreas = jpaVigilanceAreaRepository.findAllIdsByGeometry(polygon) val queryCount = customQueryCountListener?.getQueryCount() println("Number of Queries Executed: $queryCount") diff --git a/frontend/cypress/e2e/main_window/dashboard/dashboard.spec.ts b/frontend/cypress/e2e/main_window/dashboard/dashboard.spec.ts index a8d9bd3b8..57a0e144d 100644 --- a/frontend/cypress/e2e/main_window/dashboard/dashboard.spec.ts +++ b/frontend/cypress/e2e/main_window/dashboard/dashboard.spec.ts @@ -28,10 +28,10 @@ context('Dashboard', () => { const body = response.body expect(body.inseeCode).equal('29') - expect(body.regulatoryAreas.length).equal(13) - expect(body.amps.length).equal(4) - expect(body.reportings.length).equal(6) - expect(body.vigilanceAreas.length).equal(2) + expect(body.regulatoryAreaIds.length).equal(13) + expect(body.ampIds.length).equal(4) + expect(body.reportingIds.length).equal(6) + expect(body.vigilanceAreaIds.length).equal(2) }) }) }) diff --git a/frontend/cypress/e2e/side_window/dashboard/edit_dashboard.spec.ts b/frontend/cypress/e2e/side_window/dashboard/edit_dashboard.spec.ts index 82b3be0dd..a77c5066c 100644 --- a/frontend/cypress/e2e/side_window/dashboard/edit_dashboard.spec.ts +++ b/frontend/cypress/e2e/side_window/dashboard/edit_dashboard.spec.ts @@ -39,9 +39,9 @@ context('Side Window > Dashboard > Edit Dashboard', () => { } assert.deepInclude(interception.request.body, { - controlUnits: [10000, 10023], + controlUnitIds: [10000, 10023], id, - vigilanceAreas: [9, 8] + vigilanceAreaIds: [9, 8] }) }) diff --git a/frontend/src/features/Dashboard/components/DashboardForm/ControlUnits/Item.tsx b/frontend/src/features/Dashboard/components/DashboardForm/ControlUnits/Item.tsx index 27fe9871c..c38ebf844 100644 --- a/frontend/src/features/Dashboard/components/DashboardForm/ControlUnits/Item.tsx +++ b/frontend/src/features/Dashboard/components/DashboardForm/ControlUnits/Item.tsx @@ -15,7 +15,7 @@ export function Item({ controlUnit }: { controlUnit: ControlUnit.ControlUnit }) const activeDashboardId = useAppSelector(state => state.dashboard.activeDashboardId) const selectedControlUnitIds = useAppSelector(state => - activeDashboardId ? state.dashboard.dashboards?.[activeDashboardId]?.dashboard.controlUnits : [] + activeDashboardId ? state.dashboard.dashboards?.[activeDashboardId]?.dashboard.controlUnitIds : [] ) const isSelected = selectedControlUnitIds?.includes(controlUnit.id) diff --git a/frontend/src/features/Dashboard/components/DashboardForm/ControlUnits/SelectedControlUnits/index.tsx b/frontend/src/features/Dashboard/components/DashboardForm/ControlUnits/SelectedControlUnits/index.tsx index e790bf81f..b5cfe45ce 100644 --- a/frontend/src/features/Dashboard/components/DashboardForm/ControlUnits/SelectedControlUnits/index.tsx +++ b/frontend/src/features/Dashboard/components/DashboardForm/ControlUnits/SelectedControlUnits/index.tsx @@ -18,7 +18,7 @@ export function SelectedControlUnits({ const activeDashboardId = useAppSelector(state => state.dashboard.activeDashboardId) const selectedControlUnitIds = useAppSelector(state => - activeDashboardId ? state.dashboard.dashboards?.[activeDashboardId]?.dashboard.controlUnits : [] + activeDashboardId ? state.dashboard.dashboards?.[activeDashboardId]?.dashboard.controlUnitIds : [] ) const expandedControlUnit = id => { diff --git a/frontend/src/features/Dashboard/components/DashboardForm/DashboardForm.tsx b/frontend/src/features/Dashboard/components/DashboardForm/DashboardForm.tsx index 876c708a3..8a4047aa4 100644 --- a/frontend/src/features/Dashboard/components/DashboardForm/DashboardForm.tsx +++ b/frontend/src/features/Dashboard/components/DashboardForm/DashboardForm.tsx @@ -33,7 +33,7 @@ export function DashboardForm({ dashboardForm: [key, dashboard], isActive }: Das const { data: controlUnits } = useGetControlUnitsQuery(undefined, RTK_DEFAULT_QUERY_OPTIONS) const activeControlUnits = useMemo(() => controlUnits?.filter(isNotArchived), [controlUnits]) const selectedReportings = - dashboard.extractedArea?.reportings.filter(reporting => dashboard.dashboard.reportings.includes(+reporting.id)) ?? + dashboard.extractedArea?.reportings.filter(reporting => dashboard.dashboard.reportingIds.includes(+reporting.id)) ?? [] const firstColumnRef = useRef(null) @@ -105,7 +105,7 @@ export function DashboardForm({ dashboardForm: [key, dashboard], isActive }: Das isExpanded={expandedAccordionFirstColumn === Dashboard.Block.REGULATORY_AREAS} isSelectedAccordionOpen={previewSelectionFilter} regulatoryAreas={dashboard.extractedArea?.regulatoryAreas} - selectedRegulatoryAreaIds={dashboard.dashboard.regulatoryAreas} + selectedRegulatoryAreaIds={dashboard.dashboard.regulatoryAreaIds} setExpandedAccordion={() => handleAccordionClick(Dashboard.Block.REGULATORY_AREAS)} /> @@ -114,14 +114,14 @@ export function DashboardForm({ dashboardForm: [key, dashboard], isActive }: Das columnWidth={firstColumnWidth} isExpanded={expandedAccordionFirstColumn === Dashboard.Block.AMP} isSelectedAccordionOpen={previewSelectionFilter} - selectedAmpIds={dashboard.dashboard.amps} + selectedAmpIds={dashboard.dashboard.ampIds} setExpandedAccordion={() => handleAccordionClick(Dashboard.Block.AMP)} /> handleAccordionClick(Dashboard.Block.VIGILANCE_AREAS)} vigilanceAreas={dashboard.extractedArea?.vigilanceAreas} /> diff --git a/frontend/src/features/Dashboard/components/DashboardsList/Columns/index.tsx b/frontend/src/features/Dashboard/components/DashboardsList/Columns/index.tsx index 56b5e33fd..f95feddcf 100644 --- a/frontend/src/features/Dashboard/components/DashboardsList/Columns/index.tsx +++ b/frontend/src/features/Dashboard/components/DashboardsList/Columns/index.tsx @@ -87,19 +87,19 @@ export const Columns = (regulatoryAreas, controlUnits, legacyFirefoxOffset: numb sortingFn: (rowA: Row, rowB: Row) => { const dasboardA = rowA.original const totalSelectedItemsA = - (dasboardA?.reportings?.length ?? 0) + - (dasboardA?.regulatoryAreas?.length ?? 0) + - (dasboardA.controlUnits?.length ?? 0) + - (dasboardA.amps?.length ?? 0) + - (dasboardA.vigilanceAreas?.length ?? 0) + (dasboardA?.reportingIds?.length ?? 0) + + (dasboardA?.regulatoryAreaIds?.length ?? 0) + + (dasboardA.controlUnitIds?.length ?? 0) + + (dasboardA.ampIds?.length ?? 0) + + (dasboardA.vigilanceAreaIds?.length ?? 0) const dasboardB = rowB.original const totalSelectedItemsB = - (dasboardB?.reportings?.length ?? 0) + - (dasboardB?.regulatoryAreas?.length ?? 0) + - (dasboardB.controlUnits?.length ?? 0) + - (dasboardB.amps?.length ?? 0) + - (dasboardB.vigilanceAreas?.length ?? 0) + (dasboardB?.reportingIds?.length ?? 0) + + (dasboardB?.regulatoryAreaIds?.length ?? 0) + + (dasboardB.controlUnitIds?.length ?? 0) + + (dasboardB.ampIds?.length ?? 0) + + (dasboardB.vigilanceAreaIds?.length ?? 0) return totalSelectedItemsA - totalSelectedItemsB } diff --git a/frontend/src/features/Dashboard/components/DashboardsList/Rows/TotalSelectedItemsCell.tsx b/frontend/src/features/Dashboard/components/DashboardsList/Rows/TotalSelectedItemsCell.tsx index 7af0a278f..bdd015ad1 100644 --- a/frontend/src/features/Dashboard/components/DashboardsList/Rows/TotalSelectedItemsCell.tsx +++ b/frontend/src/features/Dashboard/components/DashboardsList/Rows/TotalSelectedItemsCell.tsx @@ -9,11 +9,11 @@ export function TotalSelectedItemsCell({ row }: { row: Row } const totalSelectedItems = - (dashboard.reportings?.length ?? 0) + - (dashboard.regulatoryAreas?.length ?? 0) + - (dashboard.controlUnits?.length ?? 0) + - (dashboard.amps?.length ?? 0) + - (dashboard.vigilanceAreas?.length ?? 0) + (dashboard.reportingIds?.length ?? 0) + + (dashboard.regulatoryAreaIds?.length ?? 0) + + (dashboard.controlUnitIds?.length ?? 0) + + (dashboard.ampIds?.length ?? 0) + + (dashboard.vigilanceAreaIds?.length ?? 0) return {totalSelectedItems} } diff --git a/frontend/src/features/Dashboard/components/Layers/index.tsx b/frontend/src/features/Dashboard/components/Layers/index.tsx index 56f1ac04c..a8f6826f2 100644 --- a/frontend/src/features/Dashboard/components/Layers/index.tsx +++ b/frontend/src/features/Dashboard/components/Layers/index.tsx @@ -33,7 +33,7 @@ export function DashboardLayer({ map }: BaseMapChildrenProps) { const activeDashboardId = useAppSelector(state => state.dashboard.activeDashboardId) const dashboard = useAppSelector(state => getDashboardById(state.dashboard, activeDashboardId)) - const { data: reportings } = useGetReportingsByIdsQuery(dashboard?.dashboard.reportings ?? []) + const { data: reportings } = useGetReportingsByIdsQuery(dashboard?.dashboard.reportingIds ?? []) const { data: regulatoryLayers } = useGetRegulatoryLayersQuery() const { data: ampLayers } = useGetAMPsQuery() const { data: vigilanceAreas } = useGetVigilanceAreasQuery() @@ -63,7 +63,7 @@ export function DashboardLayer({ map }: BaseMapChildrenProps) { if (activeDashboard) { // Regulatory Areas if (regulatoryLayers?.entities) { - let regulatoryLayersIds = activeDashboard.regulatoryAreas + let regulatoryLayersIds = activeDashboard.regulatoryAreaIds const openPanelIsRegulatory = openPanel?.type === Dashboard.Block.REGULATORY_AREAS // we don't want to display the area twice if (openPanelIsRegulatory) { @@ -86,7 +86,7 @@ export function DashboardLayer({ map }: BaseMapChildrenProps) { // AMP if (ampLayers?.entities) { - let ampLayerIds = activeDashboard.amps + let ampLayerIds = activeDashboard.ampIds const openPanelIsRegulatory = openPanel?.type === Dashboard.Block.AMP // we don't want to display the area twice if (openPanelIsRegulatory) { @@ -111,7 +111,7 @@ export function DashboardLayer({ map }: BaseMapChildrenProps) { // Vigilance Areas if (vigilanceAreas?.entities) { - let vigilanceAreaLayersIds = activeDashboard.vigilanceAreas + let vigilanceAreaLayersIds = activeDashboard.vigilanceAreaIds const openPanelIsVigilanceArea = openPanel?.type === Dashboard.Block.VIGILANCE_AREAS // we don't want to display the area twice if (openPanelIsVigilanceArea) { @@ -159,10 +159,10 @@ export function DashboardLayer({ map }: BaseMapChildrenProps) { }, [ activeDashboard, ampLayers?.entities, - activeDashboard?.amps, - activeDashboard?.regulatoryAreas, - activeDashboard?.reportings, - activeDashboard?.vigilanceAreas, + activeDashboard?.ampIds, + activeDashboard?.regulatoryAreaIds, + activeDashboard?.reportingIds, + activeDashboard?.vigilanceAreaIds, map, openPanel?.id, openPanel?.type, diff --git a/frontend/src/features/Dashboard/slice.ts b/frontend/src/features/Dashboard/slice.ts index 9b714cbef..f44153f9f 100644 --- a/frontend/src/features/Dashboard/slice.ts +++ b/frontend/src/features/Dashboard/slice.ts @@ -17,14 +17,14 @@ export const initialDashboard: DashboardType = { ampIdsToDisplay: [], controlUnitFilters: {}, dashboard: { - amps: [], - controlUnits: [], + ampIds: [], + controlUnitIds: [], geom: undefined, id: '', name: '', - regulatoryAreas: [], - reportings: [], - vigilanceAreas: [] + regulatoryAreaIds: [], + reportingIds: [], + vigilanceAreaIds: [] }, defaultName: '', extractedArea: undefined, @@ -128,25 +128,28 @@ export const dashboardSlice = createSlice({ if (state.dashboards[id]) { switch (type) { case Dashboard.Block.AMP: - state.dashboards[id].dashboard.amps = [...state.dashboards[id].dashboard.amps, ...itemIds] + state.dashboards[id].dashboard.ampIds = [...state.dashboards[id].dashboard.ampIds, ...itemIds] break case Dashboard.Block.CONTROL_UNITS: - state.dashboards[id].dashboard.controlUnits = [...state.dashboards[id].dashboard.controlUnits, ...itemIds] + state.dashboards[id].dashboard.controlUnitIds = [ + ...state.dashboards[id].dashboard.controlUnitIds, + ...itemIds + ] break case Dashboard.Block.REGULATORY_AREAS: - state.dashboards[id].dashboard.regulatoryAreas = [ - ...state.dashboards[id].dashboard.regulatoryAreas, + state.dashboards[id].dashboard.regulatoryAreaIds = [ + ...state.dashboards[id].dashboard.regulatoryAreaIds, ...itemIds ] break case Dashboard.Block.VIGILANCE_AREAS: - state.dashboards[id].dashboard.vigilanceAreas = [ - ...state.dashboards[id].dashboard.vigilanceAreas, + state.dashboards[id].dashboard.vigilanceAreaIds = [ + ...state.dashboards[id].dashboard.vigilanceAreaIds, ...itemIds ] break case Dashboard.Block.REPORTINGS: - state.dashboards[id].dashboard.reportings = [...state.dashboards[id].dashboard.reportings, ...itemIds] + state.dashboards[id].dashboard.reportingIds = [...state.dashboards[id].dashboard.reportingIds, ...itemIds] break case Dashboard.Block.COMMENTS: case Dashboard.Block.TERRITORIAL_PRESSURE: @@ -230,27 +233,27 @@ export const dashboardSlice = createSlice({ if (state.dashboards[id]) { switch (type) { case Dashboard.Block.AMP: - state.dashboards[id].dashboard.amps = state.dashboards[id].dashboard.amps.filter( + state.dashboards[id].dashboard.ampIds = state.dashboards[id].dashboard.ampIds.filter( item => !itemIds.includes(item) ) break case Dashboard.Block.CONTROL_UNITS: - state.dashboards[id].dashboard.controlUnits = state.dashboards[id].dashboard.controlUnits.filter( + state.dashboards[id].dashboard.controlUnitIds = state.dashboards[id].dashboard.controlUnitIds.filter( item => !itemIds.includes(item) ) break case Dashboard.Block.REGULATORY_AREAS: - state.dashboards[id].dashboard.regulatoryAreas = state.dashboards[id].dashboard.regulatoryAreas.filter( + state.dashboards[id].dashboard.regulatoryAreaIds = state.dashboards[id].dashboard.regulatoryAreaIds.filter( item => !itemIds.includes(item) ) break case Dashboard.Block.VIGILANCE_AREAS: - state.dashboards[id].dashboard.vigilanceAreas = state.dashboards[id].dashboard.vigilanceAreas.filter( + state.dashboards[id].dashboard.vigilanceAreaIds = state.dashboards[id].dashboard.vigilanceAreaIds.filter( item => !itemIds.includes(item) ) break case Dashboard.Block.REPORTINGS: - state.dashboards[id].dashboard.reportings = state.dashboards[id].dashboard.reportings.filter( + state.dashboards[id].dashboard.reportingIds = state.dashboards[id].dashboard.reportingIds.filter( item => !itemIds.includes(item) ) break diff --git a/frontend/src/features/Dashboard/types.ts b/frontend/src/features/Dashboard/types.ts index ad38f562c..b863ffed3 100644 --- a/frontend/src/features/Dashboard/types.ts +++ b/frontend/src/features/Dashboard/types.ts @@ -14,41 +14,41 @@ export namespace Dashboard { vigilanceAreas: VigilanceArea.VigilanceArea[] } export interface ExtractedAreaFromApi { - amps: number[] + ampIds: number[] inseeCode: string - regulatoryAreas: number[] - reportings: number[] - vigilanceAreas: number[] + regulatoryAreaIds: number[] + reportingIds: number[] + vigilanceAreaIds: number[] } export type Dashboard = { - amps: number[] + ampIds: number[] comments?: string - controlUnits: number[] + controlUnitIds: number[] createdAt?: string geom?: GeoJSON.Geometry id: string inseeCode?: string name: string - regulatoryAreas: number[] - reportings: number[] + regulatoryAreaIds: number[] + reportingIds: number[] seaFront?: string updatedAt?: string - vigilanceAreas: number[] + vigilanceAreaIds: number[] } export type DashboardToApi = { - amps: number[] + ampIds: number[] comments?: string - controlUnits: number[] + controlUnitIds: number[] createdAt?: string geom?: GeoJSON.Geometry id?: string inseeCode?: string name: string - regulatoryAreas: number[] - reportings: number[] + regulatoryAreaIds: number[] + reportingIds: number[] updatedAt?: string - vigilanceAreas: number[] + vigilanceAreaIds: number[] } export type DashboardFromApi = Omit & { createdAt: string; id: string } diff --git a/frontend/src/features/Dashboard/useCases/createDashboard.ts b/frontend/src/features/Dashboard/useCases/createDashboard.ts index 7823c9fd2..03f5c07f9 100644 --- a/frontend/src/features/Dashboard/useCases/createDashboard.ts +++ b/frontend/src/features/Dashboard/useCases/createDashboard.ts @@ -24,15 +24,15 @@ export const createDashboard = const newId = `new-${Object.keys(getState().dashboard.dashboards).length}` const newDashboardName = `Tab ${customDayjs().format('DD/MM/YYYY')}` const dashboard = { - amps: [], - controlUnits: [], + ampIds: [], + controlUnitIds: [], geom: geometry, id: newId, inseeCode: data.inseeCode, name: newDashboardName, - regulatoryAreas: [], - reportings: [], - vigilanceAreas: [] + regulatoryAreaIds: [], + reportingIds: [], + vigilanceAreaIds: [] } const extractedArea = await populateExtractAreaFromApi(dispatch, data) dispatch(dashboardActions.createDashboard({ dashboard, defaultName: newDashboardName, extractedArea })) diff --git a/frontend/src/features/Dashboard/utils.ts b/frontend/src/features/Dashboard/utils.ts index ad3c1203f..9536a3cb4 100644 --- a/frontend/src/features/Dashboard/utils.ts +++ b/frontend/src/features/Dashboard/utils.ts @@ -37,11 +37,11 @@ const updateDashboardDatas = ( extractedData: Dashboard.ExtractedAreaFromApi ): Dashboard.Dashboard => ({ ...dashboard, - amps: intersection(dashboard.amps, extractedData.amps), + ampIds: intersection(dashboard.ampIds, extractedData.ampIds), inseeCode: extractedData.inseeCode, - regulatoryAreas: intersection(dashboard.regulatoryAreas, extractedData.regulatoryAreas), - reportings: intersection(dashboard.reportings, extractedData.reportings), - vigilanceAreas: intersection(dashboard.vigilanceAreas, extractedData.vigilanceAreas) + regulatoryAreaIds: intersection(dashboard.regulatoryAreaIds, extractedData.regulatoryAreaIds), + reportingIds: intersection(dashboard.reportingIds, extractedData.reportingIds), + vigilanceAreaIds: intersection(dashboard.vigilanceAreaIds, extractedData.vigilanceAreaIds) }) export async function populateExtractAreaFromApi( @@ -52,18 +52,18 @@ export async function populateExtractAreaFromApi( const { data: ampLayers } = await dispatch(ampsAPI.endpoints.getAMPs.initiate()) const { data: vigilanceAreas } = await dispatch(vigilanceAreasAPI.endpoints.getVigilanceAreas.initiate()) const { data: reportings } = await dispatch( - reportingsAPI.endpoints.getReportingsByIds.initiate(extractedAreaFromApi.reportings) + reportingsAPI.endpoints.getReportingsByIds.initiate(extractedAreaFromApi.reportingIds) ) const extractedArea: Dashboard.ExtractedArea = { ...extractedAreaFromApi, - amps: Object.values(ampLayers?.entities ?? []).filter(amp => extractedAreaFromApi.amps.includes(amp.id)), + amps: Object.values(ampLayers?.entities ?? []).filter(amp => extractedAreaFromApi.ampIds.includes(amp.id)), regulatoryAreas: Object.values(regulatoryLayers?.entities ?? []).filter(reg => - extractedAreaFromApi.regulatoryAreas.includes(reg.id) + extractedAreaFromApi.regulatoryAreaIds.includes(reg.id) ), reportings: Object.values(reportings?.entities ?? []), vigilanceAreas: Object.values(vigilanceAreas?.entities ?? []).filter(vigilanceArea => - extractedAreaFromApi.vigilanceAreas.includes(vigilanceArea.id) + extractedAreaFromApi.vigilanceAreaIds.includes(vigilanceArea.id) ) }