Merge branch 'main' into fix-codeql

MTES-MCT · May 30, 2024 · de35172 · de35172
2 parents 48331ff + 9fc5244
commit de35172
Show file tree

Hide file tree

Showing 29 changed files with 750 additions and 269 deletions.
diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/MissionEntity.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/MissionEntity.kt
@@ -24,7 +24,6 @@ data class MissionEntity(
     val geom: MultiPolygon? = null,
     val startDateTimeUtc: ZonedDateTime,
     val endDateTimeUtc: ZonedDateTime? = null,
-    val isClosed: Boolean,
     val isDeleted: Boolean,
     val isGeometryComputedFromControls: Boolean,
     val missionSource: MissionSourceEnum,
@@ -55,7 +54,6 @@ data class MissionEntity(
         geom = envMission.mission.geom,
         startDateTimeUtc = envMission.mission.startDateTimeUtc,
         endDateTimeUtc = envMission.mission.endDateTimeUtc,
-        isClosed = envMission.mission.isClosed,
         isDeleted = envMission.mission.isDeleted,
         isGeometryComputedFromControls = envMission.mission.isGeometryComputedFromControls,
         missionSource = envMission.mission.missionSource,
@@ -70,7 +68,6 @@ data class MissionEntity(
         crew = navMission?.crew,
     ) {
         this.status = this.calculateMissionStatus(
-            isClosed = envMission.mission.isClosed,
             startDateTimeUtc = envMission.mission.startDateTimeUtc,
             endDateTimeUtc = envMission.mission.endDateTimeUtc,
         )
@@ -101,13 +98,12 @@ data class MissionEntity(
     }
 
     private fun calculateMissionStatus(
-        isClosed: Boolean,
         startDateTimeUtc: ZonedDateTime,
         endDateTimeUtc: ZonedDateTime? = null,
     ): MissionStatusEnum {
         val compareDate = ZonedDateTime.now()
 
-        if (isClosed) {
+        if (endDateTimeUtc != null && ZonedDateTime.parse(endDateTimeUtc.toString()).isBefore(compareDate)) {
             return MissionStatusEnum.ENDED
         }
 

diff --git a/...nd/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/env/MissionEntity.kt b/...nd/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/env/MissionEntity.kt
@@ -18,7 +18,6 @@ data class MissionEntity(
     val startDateTimeUtc: ZonedDateTime,
     val endDateTimeUtc: ZonedDateTime? = null,
     var envActions: List<EnvActionEntity>? = listOf(),
-    val isClosed: Boolean,
     val isDeleted: Boolean,
     val isGeometryComputedFromControls: Boolean,
     val missionSource: MissionSourceEnum,

diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/fish/Mission.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/fish/Mission.kt
@@ -10,15 +10,13 @@ data class Mission(
     val id: Int,
     val missionTypes: List<MissionType>,
     val openBy: String? = null,
-    val closedBy: String? = null,
     val observationsCacem: String? = null,
     val observationsCnsp: String? = null,
     val facade: String? = null,
     val geom: MultiPolygon? = null,
     val startDateTimeUtc: ZonedDateTime,
     val endDateTimeUtc: ZonedDateTime? = null,
     val missionSource: MissionSource,
-    val isClosed: Boolean,
     val hasMissionOrder: Boolean? = false,
     val isUnderJdp: Boolean? = false,
     val controlUnits: List<ControlUnit> = listOf(),

diff --git a/...end/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/FakeMissionData.kt b/...end/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/FakeMissionData.kt
@@ -113,7 +113,6 @@ class FakeMissionData(
             missionSource = MissionSourceEnum.RAPPORTNAV,
             startDateTimeUtc = ZonedDateTime.parse("2024-01-09T09:00:00Z"),
             endDateTimeUtc = ZonedDateTime.parse("2024-01-09T15:00:00Z"),
-            isClosed = false,
             isDeleted = false,
             isGeometryComputedFromControls = false,
             hasMissionOrder = false,
@@ -130,7 +129,6 @@ class FakeMissionData(
             missionSource = MissionSourceEnum.RAPPORTNAV,
             startDateTimeUtc = ZonedDateTime.parse("2024-01-09T09:00:00Z"),
             endDateTimeUtc = ZonedDateTime.parse("2024-01-09T15:00:00Z"),
-            isClosed = false,
             isDeleted = false,
             isGeometryComputedFromControls = false,
             hasMissionOrder = false,

diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/GetEnvMissions.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/GetEnvMissions.kt
@@ -24,7 +24,6 @@ class GetEnvMissions(
         observationsCacem = null,
         startDateTimeUtc = ZonedDateTime.parse("2022-03-15T04:50:09Z"),
 //            endDateTimeUtc = ZonedDateTime.parse("2022-03-23T20:29:03Z"),
-        isClosed = true,
         isDeleted = false,
         missionSource = MissionSourceEnum.RAPPORTNAV,
         hasMissionOrder = false,
@@ -38,7 +37,6 @@ class GetEnvMissions(
         observationsCacem = null,
         startDateTimeUtc = ZonedDateTime.parse("2022-02-15T04:50:09Z"),
         endDateTimeUtc = ZonedDateTime.parse("2022-02-23T20:29:03Z"),
-        isClosed = true,
         isDeleted = false,
         missionSource = MissionSourceEnum.MONITORENV,
         hasMissionOrder = false,
@@ -52,7 +50,6 @@ class GetEnvMissions(
         observationsCacem = null,
         startDateTimeUtc = ZonedDateTime.parse("2022-01-15T04:50:09Z"),
         endDateTimeUtc = ZonedDateTime.parse("2022-01-23T20:29:03Z"),
-        isClosed = true,
         isDeleted = false,
         missionSource = MissionSourceEnum.MONITORFISH,
         hasMissionOrder = false,
@@ -66,7 +63,6 @@ class GetEnvMissions(
         observationsCacem = null,
         startDateTimeUtc = ZonedDateTime.parse("2024-03-11T07:00:00Z"),
         endDateTimeUtc = ZonedDateTime.parse("2024-03-22T18:00:00Z"),
-        isClosed = true,
         isDeleted = false,
         missionSource = MissionSourceEnum.MONITORFISH,
         hasMissionOrder = false,
@@ -82,7 +78,6 @@ class GetEnvMissions(
         observationsCacem = null,
         startDateTimeUtc = ZonedDateTime.parse("2026-04-11T07:00:00Z"),
         endDateTimeUtc = ZonedDateTime.parse("2026-03-22T18:00:00Z"),
-        isClosed = false,
         isDeleted = false,
         missionSource = MissionSourceEnum.RAPPORTNAV,
         hasMissionOrder = false,
@@ -98,7 +93,6 @@ class GetEnvMissions(
         observationsCacem = null,
         startDateTimeUtc = ZonedDateTime.parse("2024-04-17T07:00:00Z"),
         endDateTimeUtc = ZonedDateTime.parse("2026-03-22T18:00:00Z"),
-        isClosed = false,
         isDeleted = false,
         missionSource = MissionSourceEnum.MONITORENV,
         hasMissionOrder = false,

diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/Mission.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/Mission.kt
@@ -12,7 +12,6 @@ import java.time.ZonedDateTime
 
 data class Mission(
     val id: Int,
-    val isClosed: Boolean,
     val missionSource: MissionSourceEnum,
     val startDateTimeUtc: ZonedDateTime,
     val endDateTimeUtc: ZonedDateTime?,
@@ -43,7 +42,6 @@ data class Mission(
 
             return Mission(
                 id = mission.id,
-                isClosed = mission.isClosed,
                 missionSource = mission.missionSource,
                 startDateTimeUtc = mission.startDateTimeUtc,
                 endDateTimeUtc = mission.endDateTimeUtc,

diff --git a/...n/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/outputs/MissionDataOutput.kt b/...n/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/monitorenv/outputs/MissionDataOutput.kt
@@ -23,7 +23,6 @@ data class MissionDataOutput @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) co
     val endDateTimeUtc: ZonedDateTime? = null,
     val envActions: List<EnvActionEntity>? = null,
     val missionSource: MissionSourceEnum,
-    val isClosed: Boolean,
     val hasMissionOrder: Boolean,
     val isUnderJdp: Boolean,
     val isGeometryComputedFromControls: Boolean,
@@ -44,7 +43,6 @@ data class MissionDataOutput @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) co
             endDateTimeUtc = endDateTimeUtc,
             envActions = envActions,
             missionSource = missionSource,
-            isClosed = isClosed,
             hasMissionOrder = hasMissionOrder,
             isUnderJdp = isUnderJdp,
             isGeometryComputedFromControls = isGeometryComputedFromControls,
@@ -70,7 +68,6 @@ data class MissionDataOutput @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) co
                 endDateTimeUtc = mission.endDateTimeUtc,
                 envActions = mission.envActions,
                 missionSource = mission.missionSource,
-                isClosed = mission.isClosed,
                 hasMissionOrder = mission.hasMissionOrder,
                 isUnderJdp = mission.isUnderJdp,
                 isGeometryComputedFromControls = mission.isGeometryComputedFromControls,

diff --git a/backend/src/main/resources/graphql/mission.graphqls b/backend/src/main/resources/graphql/mission.graphqls
@@ -23,7 +23,6 @@ input MissionInput {
 
 type Mission {
   id: ID!
-  isClosed: Boolean!
   missionSource: String!
   startDateTimeUtc: String!
   endDateTimeUtc: String

diff --git a/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/domain/entities/MissionEntityTests.kt b/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/domain/entities/MissionEntityTests.kt
@@ -25,9 +25,14 @@ class MissionEntityTests {
     @Nested
     inner class CalculateMissionStatus {
         @Test
-        fun `should return ENDED when isClosed is true`() {
+        fun `should return ENDED when the endDate is prior than now`() {
             val mission = MissionEntity(
-                envMission = ExtendedEnvMissionEntity.fromEnvMission(EnvMissionMock.create(isClosed = true)),
+                envMission = ExtendedEnvMissionEntity.fromEnvMission(
+                    EnvMissionMock.create(
+                        startDateTimeUtc = ZonedDateTime.now().minusDays(14),
+                        endDateTimeUtc = ZonedDateTime.now().minusDays(2)
+                    )
+                ),
                 fishMissionActions = listOf(FishActionControlMock.create()).map {
                     ExtendedFishActionEntity.fromMissionAction(
                         it

diff --git a/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/mocks/mission/EnvMissionMock.kt b/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/mocks/mission/EnvMissionMock.kt
@@ -23,7 +23,6 @@ object EnvMissionMock {
         geom: MultiPolygon? = null,
         startDateTimeUtc: ZonedDateTime = ZonedDateTime.of(LocalDateTime.of(2022, 1, 2, 12, 0), ZoneOffset.UTC),
         endDateTimeUtc: ZonedDateTime? = null,
-        isClosed: Boolean = false,
         isDeleted: Boolean = false,
         isGeometryComputedFromControls: Boolean = false,
         missionSource: MissionSourceEnum = MissionSourceEnum.MONITORENV,
@@ -43,7 +42,6 @@ object EnvMissionMock {
             geom = geom,
             startDateTimeUtc = startDateTimeUtc,
             endDateTimeUtc = endDateTimeUtc,
-            isClosed = isClosed,
             isDeleted = isDeleted,
             isGeometryComputedFromControls = isGeometryComputedFromControls,
             missionSource = missionSource,

diff --git a/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/mocks/mission/FishMissionMock.kt b/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/mocks/mission/FishMissionMock.kt
@@ -18,7 +18,6 @@ object FishMissionMock {
         geom: MultiPolygon? = null,
         startDateTimeUtc: ZonedDateTime = ZonedDateTime.of(LocalDateTime.of(2022, 1, 2, 12, 0), ZoneOffset.UTC),
         endDateTimeUtc: ZonedDateTime? = null,
-        isClosed: Boolean = false,
         missionSource: MissionSource = MissionSource.MONITORENV,
         hasMissionOrder: Boolean = false,
         isUnderJdp: Boolean = false,
@@ -36,7 +35,6 @@ object FishMissionMock {
                 geom = geom,
                 startDateTimeUtc = startDateTimeUtc,
                 endDateTimeUtc = endDateTimeUtc,
-                isClosed = isClosed,
                 missionSource = missionSource,
                 hasMissionOrder = hasMissionOrder,
                 isUnderJdp = isUnderJdp,

diff --git a/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/mocks/mission/MissionEntityMock.kt b/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/mocks/mission/MissionEntityMock.kt
@@ -23,7 +23,6 @@ object MissionEntityMock {
         geom: MultiPolygon? = null,
         startDateTimeUtc: ZonedDateTime = ZonedDateTime.of(LocalDateTime.of(2022, 1, 2, 12, 0), ZoneOffset.UTC),
         endDateTimeUtc: ZonedDateTime? = null,
-        isClosed: Boolean = false,
         isDeleted: Boolean = false,
         isGeometryComputedFromControls: Boolean = false,
         missionSource: MissionSourceEnum = MissionSourceEnum.MONITORENV,
@@ -43,7 +42,6 @@ object MissionEntityMock {
             geom = geom,
             startDateTimeUtc = startDateTimeUtc,
             endDateTimeUtc = endDateTimeUtc,
-            isClosed = isClosed,
             isDeleted = isDeleted,
             isGeometryComputedFromControls = isGeometryComputedFromControls,
             missionSource = missionSource,

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -40,7 +40,8 @@
     "type-fest": "^4.16.0",
     "unleash-proxy-client": "^3.3.1",
     "uuid": "^9.0.1",
-    "web-vitals": "^2.1.4"
+    "web-vitals": "^2.1.4",
+    "yup": "^1.4.0"
   },
   "devDependencies": {
     "@import-meta-env/cli": "^0.6.8",

diff --git a/frontend/src/apollo-client.ts b/frontend/src/apollo-client.ts
@@ -1,9 +1,12 @@
 import { ApolloClient, ApolloLink, createHttpLink, InMemoryCache } from '@apollo/client'
 import { loadDevMessages, loadErrorMessages } from '@apollo/client/dev'
-import AuthToken from './auth/token'
 import { setContext } from '@apollo/client/link/context'
-import { RetryLink } from '@apollo/client/link/retry'
 import { ErrorResponse, onError } from '@apollo/client/link/error'
+import { removeTypenameFromVariables } from '@apollo/client/link/remove-typename'
+import { RetryLink } from '@apollo/client/link/retry'
+import AuthToken from './auth/token'
+
+const removeTypenameLink = removeTypenameFromVariables()
 
 const authToken = new AuthToken()
 
@@ -63,7 +66,7 @@ export const apolloCache = new InMemoryCache({})
 
 const client = new ApolloClient({
   cache: apolloCache,
-  link: ApolloLink.from([authLink, errorLink, logTimeLink, retryLink, httpLink]),
+  link: ApolloLink.from([removeTypenameLink, authLink, errorLink, logTimeLink, retryLink, httpLink]),
   credentials: 'include',
   connectToDevTools: true
 })