[Moyens et unités] Finalisation de la fiche unité

Makefile

@@ -221,4 +221,7 @@ logs-db:
 
 # ALIASES
 
+.PHONY: dev lint-back
+
 dev: dev-run-back-with-infra
+lint-back: dev-lint-backend

backend/pom.xml

@@ -407,7 +407,7 @@
 					<dependency>
 						<groupId>com.pinterest</groupId>
 						<artifactId>ktlint</artifactId>
-						<version>0.48.2</version>
+						<version>0.50.0</version>
 					</dependency>
 					<!-- additional 3rd party ruleset(s) can be specified here -->
 				</dependencies>

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/EnvActionControlProperties.kt

@@ -13,7 +13,14 @@ data class EnvActionControlProperties(
     val vehicleType: VehicleTypeEnum? = null,
     val infractions: List<InfractionEntity>? = listOf(),
 ) {
-    fun toEnvActionControlEntity(id: UUID, actionStartDateTimeUtc: ZonedDateTime?, actionEndDateTimeUtc: ZonedDateTime?, facade: String?, department: String?, geom: Geometry?) = EnvActionControlEntity(
+    fun toEnvActionControlEntity(
+        id: UUID,
+        actionStartDateTimeUtc: ZonedDateTime?,
+        actionEndDateTimeUtc: ZonedDateTime?,
+        facade: String?,
+        department: String?,
+        geom: Geometry?,
+    ) = EnvActionControlEntity(
         id = id,
         actionStartDateTimeUtc = actionStartDateTimeUtc,
         actionEndDateTimeUtc = actionEndDateTimeUtc,

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/EnvActionNoteProperties.kt

@@ -6,7 +6,11 @@ import java.util.*
 data class EnvActionNoteProperties(
     val observations: String? = null,
 ) {
-    fun toEnvActionNoteEntity(id: UUID, actionStartDateTimeUtc: ZonedDateTime?, actionEndDateTimeUtc: ZonedDateTime?) = EnvActionNoteEntity(
+    fun toEnvActionNoteEntity(
+        id: UUID,
+        actionStartDateTimeUtc: ZonedDateTime?,
+        actionEndDateTimeUtc: ZonedDateTime?,
+    ) = EnvActionNoteEntity(
         id = id,
         actionStartDateTimeUtc = actionStartDateTimeUtc,
         actionEndDateTimeUtc = actionEndDateTimeUtc,

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/EnvActionSurveillanceProperties.kt

@@ -9,7 +9,14 @@ data class EnvActionSurveillanceProperties(
     val observations: String? = null,
     val coverMissionZone: Boolean? = null,
 ) {
-    fun toEnvActionSurveillanceEntity(id: UUID, actionStartDateTimeUtc: ZonedDateTime?, actionEndDateTimeUtc: ZonedDateTime?, facade: String?, department: String?, geom: Geometry?) = EnvActionSurveillanceEntity(
+    fun toEnvActionSurveillanceEntity(
+        id: UUID,
+        actionStartDateTimeUtc: ZonedDateTime?,
+        actionEndDateTimeUtc: ZonedDateTime?,
+        facade: String?,
+        department: String?,
+        geom: Geometry?,
+    ) = EnvActionSurveillanceEntity(
         id = id,
         actionStartDateTimeUtc = actionStartDateTimeUtc,
         actionEndDateTimeUtc = actionEndDateTimeUtc,

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/mission/VesselSizeEnum.kt

@@ -1,10 +1,10 @@
+@file:Suppress("ktlint:standard:enum-entry-name-case")
+
 package fr.gouv.cacem.monitorenv.domain.entities.mission
 
-/* ktlint-disable enum-entry-name-case */
 enum class VesselSizeEnum {
     LESS_THAN_12m,
     FROM_12_TO_24m,
     FROM_24_TO_46m,
     MORE_THAN_46m,
 }
-/* ktlint-enable enum-entry-name-case */

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/mappers/EnvActionMapper.kt

@@ -23,9 +23,32 @@ object EnvActionMapper {
         return try {
             if (!value.isNullOrEmpty() && value != jsonbNullString) {
                 when (actionType) {
-                    ActionTypeEnum.SURVEILLANCE -> mapper.readValue(value, EnvActionSurveillanceProperties::class.java).toEnvActionSurveillanceEntity(id, actionStartDateTimeUtc, actionEndDateTimeUtc, facade, department, geom)
-                    ActionTypeEnum.CONTROL -> mapper.readValue(value, EnvActionControlProperties::class.java).toEnvActionControlEntity(id, actionStartDateTimeUtc, actionEndDateTimeUtc, facade, department, geom)
-                    ActionTypeEnum.NOTE -> mapper.readValue(value, EnvActionNoteProperties::class.java).toEnvActionNoteEntity(id, actionStartDateTimeUtc, actionEndDateTimeUtc)
+                    ActionTypeEnum.SURVEILLANCE -> mapper.readValue(
+                        value,
+                        EnvActionSurveillanceProperties::class.java,
+                    ).toEnvActionSurveillanceEntity(
+                        id,
+                        actionStartDateTimeUtc,
+                        actionEndDateTimeUtc,
+                        facade,
+                        department,
+                        geom,
+                    )
+                    ActionTypeEnum.CONTROL -> mapper.readValue(
+                        value,
+                        EnvActionControlProperties::class.java,
+                    ).toEnvActionControlEntity(
+                        id,
+                        actionStartDateTimeUtc,
+                        actionEndDateTimeUtc,
+                        facade,
+                        department,
+                        geom,
+                    )
+                    ActionTypeEnum.NOTE -> mapper.readValue(
+                        value,
+                        EnvActionNoteProperties::class.java,
+                    ).toEnvActionNoteEntity(id, actionStartDateTimeUtc, actionEndDateTimeUtc)
                 }
             } else {
                 throw EntityConversionException("No action value found.")

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

@@ -3,19 +3,19 @@ package fr.gouv.cacem.monitorenv.domain.repositories
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingEntity
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.ReportingTypeEnum
 import fr.gouv.cacem.monitorenv.domain.entities.reporting.SourceTypeEnum
-import java.time.Instant
 import org.springframework.data.domain.Pageable
+import java.time.Instant
 
 interface IReportingRepository {
     fun findById(reportingId: Int): ReportingEntity
     fun findAll(
-            pageable: Pageable,
-            reportingType: List<ReportingTypeEnum>?,
-            seaFronts: List<String>?,
-            sourcesType: List<SourceTypeEnum>?,
-            startedAfter: Instant,
-            startedBefore: Instant?,
-            status: List<String>?,
+        pageable: Pageable,
+        reportingType: List<ReportingTypeEnum>?,
+        seaFronts: List<String>?,
+        sourcesType: List<SourceTypeEnum>?,
+        startedAfter: Instant,
+        startedBefore: Instant?,
+        status: List<String>?,
     ): List<ReportingEntity>
     fun save(reporting: ReportingEntity): ReportingEntity
     fun delete(reportingId: Int)

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/controlThemes/GetAllControlThemes.kt

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.controlThemes // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.controlThemes
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.controlTheme.ControlThemeEntity

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/controlThemes/GetControlThemeById.kt

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.controlThemes // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.controlThemes
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.controlTheme.ControlThemeEntity

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/DeleteControlUnitContact.kt

@@ -0,0 +1,11 @@
+package fr.gouv.cacem.monitorenv.domain.use_cases.controlUnit
+
+import fr.gouv.cacem.monitorenv.config.UseCase
+import fr.gouv.cacem.monitorenv.domain.repositories.IControlUnitContactRepository
+
+@UseCase
+class DeleteControlUnitContact(private val controlUnitContactRepository: IControlUnitContactRepository) {
+    fun execute(controlUnitContactId: Int) {
+        return controlUnitContactRepository.deleteById(controlUnitContactId)
+    }
+}

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/DeleteControlUnitResource.kt

@@ -0,0 +1,11 @@
+package fr.gouv.cacem.monitorenv.domain.use_cases.controlUnit
+
+import fr.gouv.cacem.monitorenv.config.UseCase
+import fr.gouv.cacem.monitorenv.domain.repositories.IControlUnitResourceRepository
+
+@UseCase
+class DeleteControlUnitResource(private val controlUnitResourceRepository: IControlUnitResourceRepository) {
+    fun execute(controlUnitResourceId: Int) {
+        return controlUnitResourceRepository.deleteById(controlUnitResourceId)
+    }
+}

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/healthcheck/GetHealthcheck.kt

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.healthcheck // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.healthcheck
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.health.Health

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/CreateOrUpdateMission.kt

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.missions // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.missions
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.mission.*
@@ -14,7 +16,7 @@ class CreateOrUpdateMission(
     private val missionRepository: IMissionRepository,
     private val facadeRepository: IFacadeAreasRepository,
 
-    ) {
+) {
     @Throws(IllegalArgumentException::class)
     fun execute(mission: MissionEntity?): MissionEntity {
         require(mission != null) {
@@ -24,10 +26,14 @@ class CreateOrUpdateMission(
             when (it.actionType) {
                 ActionTypeEnum.CONTROL -> {
                     (it as EnvActionControlEntity).copy(
-                        facade = (it.geom
-                            ?: mission.geom)?.let { geom -> facadeRepository.findFacadeFromGeometry(geom) },
-                        department = (it.geom
-                            ?: mission.geom)?.let { geom -> departmentRepository.findDepartmentFromGeometry(geom) },
+                        facade = (
+                            it.geom
+                                ?: mission.geom
+                            )?.let { geom -> facadeRepository.findFacadeFromGeometry(geom) },
+                        department = (
+                            it.geom
+                                ?: mission.geom
+                            )?.let { geom -> departmentRepository.findDepartmentFromGeometry(geom) },
                     )
                 }
 
@@ -39,9 +45,15 @@ class CreateOrUpdateMission(
                     Ideally the fallbacks should not be needed, but if coverMissionZone is true and the mission geom
                     is null, or if coverMissionZone is false and the action geom is null, then rather that nothing,
                     better use the geometry that is available, if any.
-                    */
-                    val geometry = if (surveillance.coverMissionZone == true) (mission.geom
-                        ?: surveillance.geom) else (surveillance.geom ?: mission.geom)
+                     */
+                    val geometry = if (surveillance.coverMissionZone == true) {
+                        (
+                            mission.geom
+                                ?: surveillance.geom
+                            )
+                    } else {
+                        (surveillance.geom ?: mission.geom)
+                    }
                     surveillance.copy(
                         facade = geometry?.let { geom -> facadeRepository.findFacadeFromGeometry(geom) },
                         department = geometry?.let { geom -> departmentRepository.findDepartmentFromGeometry(geom) },

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/DeleteMission.kt

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.missions // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.missions
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.repositories.IMissionRepository

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissionById.kt

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.missions // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.missions
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMissions.kt

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.missions // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.missions
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
@@ -30,7 +32,14 @@ class GetMissions(private val missionRepository: IMissionRepository) {
             missionTypes = missionTypes,
             missionStatuses = missionStatuses,
             seaFronts = seaFronts,
-            pageable = if (pageNumber != null && pageSize != null) PageRequest.of(pageNumber, pageSize) else Pageable.unpaged(),
+            pageable = if (pageNumber != null && pageSize != null) {
+                PageRequest.of(
+                    pageNumber,
+                    pageSize,
+                )
+            } else {
+                Pageable.unpaged()
+            },
         )
 
         logger.info("Found ${missions.size} mission(s)")

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/missions/GetMonitorEnvMissions.kt

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.missions // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.missions
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.mission.MissionEntity
@@ -30,10 +32,14 @@ class GetMonitorEnvMissions(private val missionRepository: IMissionRepository) {
             missionStatuses = missionStatuses,
             missionSources = missionSources ?: listOf(MissionSourceEnum.MONITORENV, MissionSourceEnum.MONITORFISH),
             seaFronts = seaFronts,
-            pageable = if (pageNumber != null && pageSize != null) PageRequest.of(
-                pageNumber,
-                pageSize
-            ) else Pageable.unpaged(),
+            pageable = if (pageNumber != null && pageSize != null) {
+                PageRequest.of(
+                    pageNumber,
+                    pageSize,
+                )
+            } else {
+                Pageable.unpaged()
+            },
         )
 
         logger.info("Found ${missions.size} mission(s)")

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/natinfs/GetAllNatinfs.kt

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.natinfs // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.natinfs
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.natinf.NatinfEntity

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

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.regulatoryAreas // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.regulatoryAreas
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.regulatoryArea.RegulatoryAreaEntity

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

@@ -1,4 +1,6 @@
-package fr.gouv.cacem.monitorenv.domain.use_cases.regulatoryAreas // ktlint-disable package-name
+@file:Suppress("ktlint:standard:package-name")
+
+package fr.gouv.cacem.monitorenv.domain.use_cases.regulatoryAreas
 
 import fr.gouv.cacem.monitorenv.config.UseCase
 import fr.gouv.cacem.monitorenv.domain.entities.regulatoryArea.RegulatoryAreaEntity

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/ArchiveOutdatedReportings.kt

@@ -8,7 +8,7 @@ import org.springframework.scheduling.annotation.Scheduled
 
 @UseCase
 class ArchiveOutdatedReportings(
-        private val reportingRepository: IReportingRepository,
+    private val reportingRepository: IReportingRepository,
 ) {
     private val logger: Logger = LoggerFactory.getLogger(ArchiveOutdatedReportings::class.java)
 

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/ArchiveReportings.kt

@@ -10,13 +10,13 @@ class ArchiveReportings(
     private val reportingRepository: IReportingRepository,
 ) {
 
-  private val logger: Logger = LoggerFactory.getLogger(ArchiveReportings::class.java)
+    private val logger: Logger = LoggerFactory.getLogger(ArchiveReportings::class.java)
 
-  @Throws(IllegalArgumentException::class)
-  fun execute(ids: List<Int>) {
-    logger.info("Archive reportings: $ids")
+    @Throws(IllegalArgumentException::class)
+    fun execute(ids: List<Int>) {
+        logger.info("Archive reportings: $ids")
 
-    require(ids.isNotEmpty()) { "No reportings to archive" }
-    return reportingRepository.archiveReportings(ids)
-  }
+        require(ids.isNotEmpty()) { "No reportings to archive" }
+        return reportingRepository.archiveReportings(ids)
+    }
 }

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/reportings/DeleteReportings.kt

@@ -10,13 +10,13 @@ class DeleteReportings(
     private val reportingRepository: IReportingRepository,
 ) {
 
-  private val logger: Logger = LoggerFactory.getLogger(DeleteReportings::class.java)
+    private val logger: Logger = LoggerFactory.getLogger(DeleteReportings::class.java)
 
-  @Throws(IllegalArgumentException::class)
-  fun execute(ids: List<Int>) {
-    logger.info("Delete reportings: $ids")
+    @Throws(IllegalArgumentException::class)
+    fun execute(ids: List<Int>) {
+        logger.info("Delete reportings: $ids")
 
-    require(ids.isNotEmpty()) { "No reportings to delete" }
-    return reportingRepository.deleteReportings(ids)
-  }
+        require(ids.isNotEmpty()) { "No reportings to delete" }
+        return reportingRepository.deleteReportings(ids)
+    }
 }

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/api/adapters/publicapi/inputs/CreateOrUpdateControlUnitDataInput.kt

@@ -11,8 +11,7 @@ data class CreateOrUpdateControlUnitDataInput(
     val name: String,
     val termsNote: String? = null,
 ) {
-    fun toControlUnit(
-    ): ControlUnitEntity {
+    fun toControlUnit(): ControlUnitEntity {
         return ControlUnitEntity(
             id = this.id,
             areaNote = this.areaNote,