From 5d4ace9579a435c1edebdb26a3368ba5a1ea0a1e Mon Sep 17 00:00:00 2001 From: Loup Theron Date: Mon, 10 Jun 2024 09:56:17 +0200 Subject: [PATCH] Fix flag state required in mission action data input --- .../api/input/AddMissionActionDataInput.kt | 4 ++-- .../api/bff/MissionActionsControllerITests.kt | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/AddMissionActionDataInput.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/AddMissionActionDataInput.kt index 22035d1a0c..3808bfa11b 100644 --- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/AddMissionActionDataInput.kt +++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/AddMissionActionDataInput.kt @@ -12,7 +12,7 @@ data class AddMissionActionDataInput( var internalReferenceNumber: String? = null, var externalReferenceNumber: String? = null, var ircs: String? = null, - var flagState: CountryCode, + var flagState: CountryCode? = CountryCode.UNDEFINED, var districtCode: String? = null, var faoAreas: List = listOf(), var flightGoals: List = listOf(), @@ -63,7 +63,7 @@ data class AddMissionActionDataInput( internalReferenceNumber = internalReferenceNumber, externalReferenceNumber = externalReferenceNumber, ircs = ircs, - flagState = flagState, + flagState = flagState ?: CountryCode.UNDEFINED, districtCode = districtCode, faoAreas = faoAreas, flightGoals = flightGoals, diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/MissionActionsControllerITests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/MissionActionsControllerITests.kt index cfd0067365..03aa01fe97 100644 --- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/MissionActionsControllerITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/MissionActionsControllerITests.kt @@ -298,7 +298,12 @@ class MissionActionsControllerITests { } @Test - fun `Should not update a mission action with a missing flagState`() { + fun `Should update a mission action with a missing flagState`() { + // Given + val dateTime = ZonedDateTime.parse("2022-05-05T03:04:05.000Z") + val newMission = TestUtils.getDummyMissionAction(dateTime).copy(flagState = CountryCode.UNDEFINED) + given(updateMissionAction.execute(any(), any())).willReturn(newMission) + // When api.perform( put("/bff/v1/mission_actions/123") @@ -314,17 +319,19 @@ class MissionActionsControllerITests { "flagState": null, "districtCode": "AD", "faoAreas": [], + "userTrigram": "LTH", + "completion": "COMPLETED", "flightGoals": [], "missionId": 10556, - "actionType": "LAND_CONTROL", - "actionDatetimeUtc": "2024-02-01T14:29:00Z", + "actionType": "OBSERVATION", + "actionDatetimeUtc": "2024-02-01T14:29:00Z" } """.trimIndent(), ) .contentType(MediaType.APPLICATION_JSON), ) // Then - .andExpect(status().isBadRequest) + .andExpect(status().isCreated) } @Test