Préavis – Corrige plusieurs petits bugs (#3619)

## Linked issues - Resolve #3590 - Resolve #3564 - Resolve #3335 ---- - [ ] Tests E2E (Cypress)
MTES-MCT · Sep 4, 2024 · 217b625 · 217b625
2 parents 511bfe9 + ce7b320
commit 217b625
Show file tree

Hide file tree

Showing 366 changed files with 9,594 additions and 8,487 deletions.
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -97,18 +97,19 @@ springBoot {
 
     buildInfo {
         properties {
-            additional = mapOf(
-                "commit.hash" to "COMMIT_TO_CHANGE",
-            )
+            additional =
+                mapOf(
+                    "commit.hash" to "COMMIT_TO_CHANGE",
+                )
         }
     }
 }
 
-tasks.withType<JavaCompile>() {
+tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 }
 
-tasks.withType<Javadoc>() {
+tasks.withType<Javadoc> {
     options.encoding = "UTF-8"
 }
 

diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/Utils.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/Utils.kt
@@ -7,7 +7,10 @@ class Utils {
          *
          * If both strings are null or empty, they are considered equivalent.
          */
-        fun areStringsEqual(leftString: String?, rightString: String?): Boolean {
+        fun areStringsEqual(
+            leftString: String?,
+            rightString: String?,
+        ): Boolean {
             val normalizedLeftString = leftString?.trim().takeUnless { it.isNullOrEmpty() || it == " " }
             val normalizedRightString = rightString?.trim().takeUnless { it.isNullOrEmpty() || it == " " }
 

diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/config/ApiClient.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/config/ApiClient.kt
@@ -10,15 +10,16 @@ import org.springframework.context.annotation.Configuration
 
 @Configuration
 class ApiClient(engine: HttpClientEngine = Java.create()) {
-    val httpClient = HttpClient(engine) {
-        install(ContentNegotiation) {
-            json(
-                Json {
-                    prettyPrint = true
-                    isLenient = true
-                    ignoreUnknownKeys = true
-                },
-            )
+    val httpClient =
+        HttpClient(engine) {
+            install(ContentNegotiation) {
+                json(
+                    Json {
+                        prettyPrint = true
+                        isLenient = true
+                        ignoreUnknownKeys = true
+                    },
+                )
+            }
         }
-    }
 }
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/config/SecurityConfig.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/config/SecurityConfig.kt
@@ -82,11 +82,12 @@ class SecurityConfig(
 
     @Bean
     fun corsConfigurationSource(): CorsConfigurationSource {
-        val configuration = CorsConfiguration().apply {
-            allowedOrigins = listOf("*")
-            allowedMethods = listOf("HEAD", "GET", "POST", "PUT", "DELETE", "OPTIONS")
-            allowedHeaders = listOf("Authorization", "Cache-Control", "Content-Type")
-        }
+        val configuration =
+            CorsConfiguration().apply {
+                allowedOrigins = listOf("*")
+                allowedMethods = listOf("HEAD", "GET", "POST", "PUT", "DELETE", "OPTIONS")
+                allowedHeaders = listOf("Authorization", "Cache-Control", "Content-Type")
+            }
 
         val source = UrlBasedCorsConfigurationSource()
         source.registerCorsConfiguration("/**", configuration)

diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/config/SwaggerConfig.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/config/SwaggerConfig.kt
@@ -10,7 +10,6 @@ import org.springframework.context.annotation.Configuration
 
 @Configuration
 class SwaggerConfig {
-
     @Autowired
     private val hostProperties: HostProperties? = null
 

diff --git a/...uv/cnsp/monitorfish/domain/entities/beacon_malfunctions/VesselBeaconMalfunctionsResume.kt b/...uv/cnsp/monitorfish/domain/entities/beacon_malfunctions/VesselBeaconMalfunctionsResume.kt
@@ -14,21 +14,25 @@ data class VesselBeaconMalfunctionsResume(
         ): VesselBeaconMalfunctionsResume {
             val oneYearBefore = ZonedDateTime.now().minusYears(1)
 
-            val lastBeaconMalfunction = beaconMalfunctionsWithDetails
-                .maxByOrNull { it.beaconMalfunction.malfunctionStartDateTime }
+            val lastBeaconMalfunction =
+                beaconMalfunctionsWithDetails
+                    .maxByOrNull { it.beaconMalfunction.malfunctionStartDateTime }
 
-            val lastYearBeaconMalfunctionsWithDetails = beaconMalfunctionsWithDetails.filter {
-                it.beaconMalfunction.malfunctionStartDateTime > oneYearBefore
-            }
+            val lastYearBeaconMalfunctionsWithDetails =
+                beaconMalfunctionsWithDetails.filter {
+                    it.beaconMalfunction.malfunctionStartDateTime > oneYearBefore
+                }
 
-            val numberOfBeaconsAtSea = getNumberOfBeaconsMalfunctionsAt(
-                VesselStatus.AT_SEA,
-                lastYearBeaconMalfunctionsWithDetails,
-            )
-            val numberOfBeaconsAtPort = getNumberOfBeaconsMalfunctionsAt(
-                VesselStatus.AT_PORT,
-                lastYearBeaconMalfunctionsWithDetails,
-            )
+            val numberOfBeaconsAtSea =
+                getNumberOfBeaconsMalfunctionsAt(
+                    VesselStatus.AT_SEA,
+                    lastYearBeaconMalfunctionsWithDetails,
+                )
+            val numberOfBeaconsAtPort =
+                getNumberOfBeaconsMalfunctionsAt(
+                    VesselStatus.AT_PORT,
+                    lastYearBeaconMalfunctionsWithDetails,
+                )
 
             return VesselBeaconMalfunctionsResume(
                 numberOfBeaconsAtSea = numberOfBeaconsAtSea,
@@ -48,8 +52,9 @@ data class VesselBeaconMalfunctionsResume(
         }
 
         private fun getFirstVesselStatus(beaconMalfunctionsWithDetails: BeaconMalfunctionWithDetails): VesselStatus {
-            val beaconMalfunctionVesselStatusActions = beaconMalfunctionsWithDetails.actions
-                .filter { action -> action.propertyName == BeaconMalfunctionActionPropertyName.VESSEL_STATUS }
+            val beaconMalfunctionVesselStatusActions =
+                beaconMalfunctionsWithDetails.actions
+                    .filter { action -> action.propertyName == BeaconMalfunctionActionPropertyName.VESSEL_STATUS }
 
             return when (beaconMalfunctionVesselStatusActions.isEmpty()) {
                 true -> beaconMalfunctionsWithDetails.beaconMalfunction.vesselStatus
@@ -62,9 +67,10 @@ data class VesselBeaconMalfunctionsResume(
         }
 
         private fun getLastVesselStatus(beaconMalfunction: BeaconMalfunctionWithDetails?): VesselStatus? {
-            val lastVesselStatus = beaconMalfunction?.actions?.filter { action ->
-                action.propertyName == BeaconMalfunctionActionPropertyName.VESSEL_STATUS
-            }?.maxByOrNull { action -> action.dateTime }?.nextValue
+            val lastVesselStatus =
+                beaconMalfunction?.actions?.filter { action ->
+                    action.propertyName == BeaconMalfunctionActionPropertyName.VESSEL_STATUS
+                }?.maxByOrNull { action -> action.dateTime }?.nextValue
 
             return lastVesselStatus?.let {
                 VesselStatus.valueOf(lastVesselStatus)

diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/facade/SeafrontGroup.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/facade/SeafrontGroup.kt
@@ -12,16 +12,17 @@ enum class SeafrontGroup {
     ;
 
     companion object {
-        private val groupToSeafronts = mapOf(
-            ALL to Seafront.entries,
-            MED to listOf(Seafront.CORSE, Seafront.MED),
-            MEMN to listOf(Seafront.MEMN),
-            NAMO to listOf(Seafront.NAMO),
-            OUTREMEROA to listOf(Seafront.GUADELOUPE, Seafront.GUYANE, Seafront.MARTINIQUE),
-            OUTREMEROI to listOf(Seafront.MAYOTTE, Seafront.SUD_OCEAN_INDIEN),
-            SA to listOf(Seafront.SA),
-            NONE to emptyList(),
-        )
+        private val groupToSeafronts =
+            mapOf(
+                ALL to Seafront.entries,
+                MED to listOf(Seafront.CORSE, Seafront.MED),
+                MEMN to listOf(Seafront.MEMN),
+                NAMO to listOf(Seafront.NAMO),
+                OUTREMEROA to listOf(Seafront.GUADELOUPE, Seafront.GUYANE, Seafront.MARTINIQUE),
+                OUTREMEROI to listOf(Seafront.MAYOTTE, Seafront.SUD_OCEAN_INDIEN),
+                SA to listOf(Seafront.SA),
+                NONE to emptyList(),
+            )
 
         fun fromSeafront(seafront: Seafront?): SeafrontGroup {
             return seafront?.let { groupToSeafronts.entries.first { it.key != ALL && it.value.contains(seafront) }.key }

diff --git a/...nd/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/last_position/LastPosition.kt b/...nd/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/last_position/LastPosition.kt
@@ -8,8 +8,7 @@ import java.time.ZonedDateTime
 
 data class LastPosition(
     val id: Int? = null,
-
-    /* Vessel identification properties */
+    // Vessel identification properties
     val vesselId: Int? = null,
     // Unique code composed by the contracting party/cooperating non-contracting party expressed as 3-alpha
     // country code followed by the vessel registration number as recorded in the national fleet register
@@ -23,7 +22,6 @@ data class LastPosition(
     val vesselName: String? = null,
     val flagState: CountryCode,
     val positionType: PositionType,
-
     val latitude: Double? = null,
     val longitude: Double? = null,
     val estimatedCurrentLatitude: Double? = null,
@@ -32,7 +30,6 @@ data class LastPosition(
     val course: Double? = null,
     val dateTime: ZonedDateTime,
     val tripNumber: String? = null,
-
     val emissionPeriod: Duration? = null,
     val lastLogbookMessageDateTime: ZonedDateTime? = null,
     val departureDateTime: ZonedDateTime? = null,