From 4865cfb8d86ff7e0b7374066664f7b56f8ec4ddf Mon Sep 17 00:00:00 2001 From: lwih Date: Tue, 20 Aug 2024 18:34:49 +0200 Subject: [PATCH] [MissionAction] - make start datetime patchable --- .../mission/mission_actions/MissionAction.kt | 3 +- .../mission_actions/PatchableMissionAction.kt | 1 + .../input/PatchableMissionActionDataInput.kt | 2 + .../PatchMissionActionUTests.kt | 55 +++++++++++++++++-- 4 files changed, 56 insertions(+), 5 deletions(-) diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/MissionAction.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/MissionAction.kt index c98aef8c99..8399f22951 100644 --- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/MissionAction.kt +++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/MissionAction.kt @@ -17,7 +17,8 @@ data class MissionAction( val districtCode: String? = null, val faoAreas: List = listOf(), val actionType: MissionActionType, - val actionDatetimeUtc: ZonedDateTime, + @Patchable + var actionDatetimeUtc: ZonedDateTime, @Patchable var actionEndDatetimeUtc: ZonedDateTime? = null, val emitsVms: ControlCheck? = null, diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/PatchableMissionAction.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/PatchableMissionAction.kt index 0e5490b00d..72e950e723 100644 --- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/PatchableMissionAction.kt +++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/PatchableMissionAction.kt @@ -4,6 +4,7 @@ import java.time.ZonedDateTime import java.util.* data class PatchableMissionAction( + val actionDatetimeUtc : Optional?, val actionEndDatetimeUtc: Optional?, val observationsByUnit: Optional?, ) diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/public_api/input/PatchableMissionActionDataInput.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/public_api/input/PatchableMissionActionDataInput.kt index 2828bb7b0e..d611b9a1c0 100644 --- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/public_api/input/PatchableMissionActionDataInput.kt +++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/public_api/input/PatchableMissionActionDataInput.kt @@ -5,11 +5,13 @@ import java.time.ZonedDateTime import java.util.* data class PatchableMissionActionDataInput( + val actionDatetimeUtc: Optional?, val actionEndDatetimeUtc: Optional?, val observationsByUnit: Optional?, ) { fun toPatchableMissionAction(): PatchableMissionAction { return PatchableMissionAction( + actionDatetimeUtc = actionDatetimeUtc, actionEndDatetimeUtc = actionEndDatetimeUtc, observationsByUnit = observationsByUnit, ) diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/PatchMissionActionUTests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/PatchMissionActionUTests.kt index 3ebbf9f4c9..6b673fb1d4 100644 --- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/PatchMissionActionUTests.kt +++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/PatchMissionActionUTests.kt @@ -30,11 +30,14 @@ class PatchMissionActionUTests { @Test fun `execute Should patch an existing action`() { // Given + val originalDateTime = ZonedDateTime.now() + val expectedDateTime = originalDateTime.plusDays(1) + val expectedEndDateTime = originalDateTime.plusDays(2) val action = MissionAction( id = null, vesselId = null, missionId = 1, - actionDatetimeUtc = ZonedDateTime.now(), + actionDatetimeUtc = originalDateTime, portLocode = "AEFAT", actionType = MissionActionType.LAND_CONTROL, gearOnboard = listOf(), @@ -49,9 +52,10 @@ class PatchMissionActionUTests { completion = Completion.TO_COMPLETE, ) given(missionActionsRepository.findById(any())).willReturn(action) - val expectedDateTime = ZonedDateTime.now() + val patch = PatchableMissionAction( - actionEndDatetimeUtc = Optional.of(expectedDateTime), + actionDatetimeUtc = Optional.of(expectedDateTime), + actionEndDatetimeUtc = Optional.of(expectedEndDateTime), observationsByUnit = Optional.of("An observation"), ) @@ -63,9 +67,52 @@ class PatchMissionActionUTests { verify(missionActionsRepository).save(capture()) assertThat(allValues.first().observationsByUnit).isEqualTo("An observation") - assertThat(allValues.first().actionEndDatetimeUtc).isEqualTo(expectedDateTime) + assertThat(allValues.first().actionDatetimeUtc).isEqualTo(expectedDateTime) + assertThat(allValues.first().actionEndDatetimeUtc).isEqualTo(expectedEndDateTime) assertThat(allValues.first().userTrigram).isEqualTo("LTH") assertThat(allValues.first().actionType).isEqualTo(MissionActionType.LAND_CONTROL) } } + + @Test + fun `execute Should patch an existing action without overriding the start datetime if not provided`() { + // Given + val originalDateTime = ZonedDateTime.now() + val expectedEndDateTime = originalDateTime.plusDays(2) + val action = MissionAction( + id = null, + vesselId = null, + missionId = 1, + actionDatetimeUtc = originalDateTime, + portLocode = "AEFAT", + actionType = MissionActionType.LAND_CONTROL, + gearOnboard = listOf(), + seizureAndDiversion = true, + isDeleted = false, + hasSomeGearsSeized = false, + hasSomeSpeciesSeized = false, + completedBy = "XYZ", + isFromPoseidon = false, + flagState = CountryCode.FR, + userTrigram = "LTH", + completion = Completion.TO_COMPLETE, + ) + given(missionActionsRepository.findById(any())).willReturn(action) + + val patch = PatchableMissionAction( + actionDatetimeUtc = null, + actionEndDatetimeUtc = Optional.of(expectedEndDateTime), + observationsByUnit = null, + ) + + // When + PatchMissionAction(missionActionsRepository, patchMissionAction).execute(123, patch) + + // Then + argumentCaptor().apply { + verify(missionActionsRepository).save(capture()) + assertThat(allValues.first().actionDatetimeUtc).isEqualTo(originalDateTime) + assertThat(allValues.first().actionEndDatetimeUtc).isEqualTo(expectedEndDateTime) + } + } }