Merge pull request #86 from MTES-MCT/close-status

Back & Front - remove isStart for status action

.github/workflows/codeql.yml

@@ -55,7 +55,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +68,7 @@ jobs:
       # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -81,6 +81,6 @@ jobs:
       #     ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/release.yml

@@ -1,8 +1,8 @@
 name: "[Release] Mirror push to gitlab"
 
 on:
-  push:
-    branches: [ "main" ]
+  #  push:
+  #    branches: [ "main" ]
   release:
     types: [ published ]
   workflow_dispatch:
@@ -19,20 +19,20 @@ jobs:
         with:
           fetch-depth: 0
 
-      #      - name: Get frontend version
-      #        uses: avides/[email protected]
-      #        id: frontend_version
-      #        with:
-      #          token: ${{ secrets.GITHUB_TOKEN }}
-      #          file-to-check: frontend/package.json
-      #          only-return-version: true
-      #
-      #      - name: Upload Frontend sourcemaps
-      #        uses: ./.github/actions/upload-sourcemaps
-      #        with:
-      #          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-      #          VERSION: ${{ steps.frontend_version.outputs.version }}
-      #test
+      - name: Get frontend version
+        uses: avides/[email protected]
+        id: frontend_version
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          file-to-check: frontend/package.json
+          only-return-version: true
+
+      - name: Upload Frontend sourcemaps
+        uses: ./.github/actions/upload-sourcemaps
+        with:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          VERSION: ${{ steps.frontend_version.outputs.version }}
+
       - uses: yesolutions/mirror-action@master
         with:
           REMOTE: https://gitlab-sml.din.developpement-durable.gouv.fr/rapportnav-v2/rapportnav_v2.git

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/action/ActionStatusEntity.kt

@@ -12,7 +12,6 @@ data class ActionStatusEntity(
     val startDateTimeUtc: ZonedDateTime,
     val status: ActionStatusType,
     val reason: ActionStatusReason? = null,
-    val isStart: Boolean,
     val observations: String? = null,
 ) {
     fun toNavAction(): NavActionEntity {
@@ -33,9 +32,7 @@ data class ActionStatusEntity(
             startDateTimeUtc = startDateTimeUtc,
             status = status,
             reason = reason,
-            isStart = isStart,
             observations = observations,
-
-            )
+        )
     }
 }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/action/GetStatusForAction.kt

@@ -22,23 +22,8 @@ class GetStatusForAction(
         val lastActionStatus = actions
             .filter { it.startDateTimeUtc <= actionStartDateTimeUtc }
             .maxByOrNull { it.startDateTimeUtc }
-        val lastStartedActionStatus = actions
-            .filter { it.isStart && it.startDateTimeUtc <= actionStartDateTimeUtc }
-            .maxByOrNull { it.startDateTimeUtc }
-
 
-        // case where there are 2 statuses at the same timestamp, one starting, one ending:
-        if (lastActionStatus != null && lastStartedActionStatus != null && lastStartedActionStatus.startDateTimeUtc == lastActionStatus.startDateTimeUtc) {
-            return lastStartedActionStatus.status
-        }
-        // return unknown if no action or if last action is a status of type finishing and no other starting action at that timestamp
-        else if (lastActionStatus == null || (!lastActionStatus.isStart && lastStartedActionStatus?.startDateTimeUtc != lastActionStatus.startDateTimeUtc)) {
-            return ActionStatusType.UNKNOWN
-        }
-        // return status of last status, it implies it is a starting status
-        else {
-            return lastActionStatus.status
-        }
+        return lastActionStatus?.status ?: ActionStatusType.UNKNOWN
     }
 
 }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/bff/adapters/action/ActionStatusInput.kt

@@ -14,7 +14,6 @@ data class ActionStatusInput(
     val startDateTimeUtc: String?,
     val status: ActionStatusType,
     val reason: ActionStatusReason?,
-    val isStart: Boolean,
     val observations: String?
 ) {
     fun toActionStatus(): ActionStatusEntity {
@@ -26,7 +25,6 @@ data class ActionStatusInput(
             } ?: ZonedDateTime.now(ZoneId.of("UTC")),
             status = status,
             reason = reason,
-            isStart = isStart,
             observations = observations
         )
     }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/bff/model/action/Action.kt

@@ -154,8 +154,6 @@ data class Action(
         fun sortForTimeline(allActions: List<Action>?): List<Action>? {
             return allActions?.sortedWith(compareByDescending<Action> { it.startDateTimeUtc }
                 .thenBy { it.data is NavActionStatus }
-                .thenBy { (it.data as? NavActionStatus)?.isStart == false }
-                .thenBy { (it.data as? NavActionStatus)?.isStart == true }
             )
         }
 

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/bff/model/action/ActionData.kt

@@ -105,7 +105,6 @@ data class NavActionStatus(
     val startDateTimeUtc: ZonedDateTime,
     val status: ActionStatusType,
     val reason: ActionStatusReason? = null,
-    val isStart: Boolean,
     val observations: String? = null
 ) : ActionData()
 

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/database/model/mission/action/ActionStatusModel.kt

@@ -30,9 +30,6 @@ class ActionStatusModel(
     @Column(name = "reason", nullable = true)
     var reason: String?,
 
-    @Column(name = "is_start", nullable = false)
-    var isStart: Boolean,
-
     @Column(name = "observations", nullable = true)
     var observations: String?,
 
@@ -44,7 +41,6 @@ class ActionStatusModel(
             startDateTimeUtc = startDateTimeUtc,
             status = mapStringToActionStatusType(status),
             reason = mapStringToActionStatusReason(reason),
-            isStart = isStart,
             observations = observations,
         )
     }
@@ -56,7 +52,6 @@ class ActionStatusModel(
             startDateTimeUtc = statusAction.startDateTimeUtc,
             status = statusAction.status.toString(),
             reason = statusAction.reason.toStringOrNull(),
-            isStart = statusAction.isStart,
             observations = statusAction.observations,
         )
     }

backend/src/main/resources/db/migration/V1.2024.01.30.11.54__status_drop_isstart.sql

@@ -0,0 +1,10 @@
+DO
+$$
+  BEGIN
+
+    -- Remove the isStart column from the mission_action_status table
+    ALTER TABLE mission_action_status
+      DROP COLUMN is_start;
+
+  END
+$$;

backend/src/main/resources/graphql/action.graphqls

@@ -25,7 +25,6 @@ input ActionStatusInput {
   startDateTimeUtc: String
   status: ActionStatusType!
   reason: ActionStatusReason
-  isStart: Boolean!
   observations: String
 }
 
@@ -63,7 +62,6 @@ type NavActionStatus {
   startDateTimeUtc: String!
   status: ActionStatusType!
   reason: ActionStatusReason
-  isStart: Boolean!
   observations: String
 }
 

backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/status/GetStatusForActionTests.kt

@@ -43,47 +43,20 @@ class GetStatusForActionTests {
     @Autowired
     private lateinit var getStatusForAction: GetStatusForAction
 
-    //    @Test
-//    fun `execute Should return Unknown when action is null for a mission`() {
-//        given(this.statusActionsRepository.findAllByMissionId(missionId)).willReturn(null);
-//        val statusForAction = getStatusForAction.execute(missionId=missionId, actionStartDateTimeUtc=null);
-//        assertThat(statusForAction).isEqualTo(ActionStatusType.UNKNOWN);
-//    }
     @Test
     fun `execute Should return Unknown when action is empty list for a mission`() {
         given(this.statusActionsRepository.findAllByMissionId(missionId = 1)).willReturn(listOf<ActionStatusModel>());
         val statusForAction = getStatusForAction.execute(missionId = missionId, actionStartDateTimeUtc = null);
         assertThat(statusForAction).isEqualTo(ActionStatusType.UNKNOWN);
     }
 
-    @Test
-    fun `execute Should return Unknown if only finishing actions`() {
-        val startDatetime = ZonedDateTime.of(2023, 6, 19, 10, 0, 0, 0, ZoneId.of("Europe/Berlin"))
-        val finishingAction = ActionStatusEntity(
-            id = UUID.randomUUID(),
-            missionId = missionId,
-            startDateTimeUtc = startDatetime,
-            isStart = false,
-            status = ActionStatusType.UNAVAILABLE,
-        )
-        val actions = listOf(finishingAction)
-        given(this.statusActionsRepository.findAllByMissionId(missionId = 1)).willReturn(actions.map {
-            ActionStatusModel.fromActionStatusEntity(
-                it
-            )
-        });
-        val statusForAction = getStatusForAction.execute(missionId = missionId, actionStartDateTimeUtc = startDatetime);
-        assertThat(statusForAction).isEqualTo(ActionStatusType.UNKNOWN);
-    }
-
     @Test
     fun `execute Should return the last action status if the last action is a starting status`() {
         val startDatetime = ZonedDateTime.of(2023, 6, 19, 10, 0, 0, 0, ZoneId.of("Europe/Berlin"))
         val startingAction = ActionStatusEntity(
             id = UUID.randomUUID(),
             missionId = missionId,
             startDateTimeUtc = startDatetime,
-            isStart = true,
             status = ActionStatusType.UNAVAILABLE,
         )
         val actions = listOf(startingAction)
@@ -95,31 +68,4 @@ class GetStatusForActionTests {
         val statusForAction = getStatusForAction.execute(missionId = missionId, actionStartDateTimeUtc = startDatetime);
         assertThat(statusForAction).isEqualTo(ActionStatusType.UNAVAILABLE);
     }
-
-    @Test
-    fun `execute Should return the last started action status if last action is ending but at the same timestamp as a starting status action`() {
-        val startDatetime = ZonedDateTime.of(2023, 6, 19, 10, 0, 0, 0, ZoneId.of("Europe/Berlin"))
-        val startingAction = ActionStatusEntity(
-            id = UUID.randomUUID(),
-            missionId = missionId,
-            startDateTimeUtc = startDatetime,
-            isStart = true,
-            status = ActionStatusType.UNAVAILABLE,
-        )
-        val finishingAction = ActionStatusEntity(
-            id = UUID.randomUUID(),
-            missionId = missionId,
-            startDateTimeUtc = startDatetime,
-            isStart = false,
-            status = ActionStatusType.DOCKED,
-        )
-        val actions = listOf(finishingAction, startingAction)
-        given(this.statusActionsRepository.findAllByMissionId(missionId = 1)).willReturn(actions.map {
-            ActionStatusModel.fromActionStatusEntity(
-                it
-            )
-        });
-        val statusForAction = getStatusForAction.execute(missionId = missionId, actionStartDateTimeUtc = startDatetime);
-        assertThat(statusForAction).isEqualTo(startingAction.status);
-    }
 }