diff --git a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidator.kt b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidator.kt index 02894c61a..07a9ca8e2 100644 --- a/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidator.kt +++ b/backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidator.kt @@ -74,7 +74,7 @@ class MissionValidator : Validator { private fun validateControl( control: EnvActionControlEntity, mission: MissionEntity, - isMissionEnded: Boolean + isMissionEnded: Boolean, ) { validateEnvAction(control, mission) @@ -95,7 +95,6 @@ class MissionValidator : Validator { ) } - control.infractions?.forEach { infraction -> if (infraction.infractionType !== InfractionTypeEnum.WAITING && infraction.natinf?.isEmpty() == true) { throw BackendUsageException( @@ -131,8 +130,8 @@ class MissionValidator : Validator { mission: MissionEntity, ) { val actionType = if (envAction.actionType === ActionTypeEnum.CONTROL) "du contrôle" else "de la surveillance" - if (envAction.actionStartDateTimeUtc?.isAfter(mission.startDateTimeUtc) == false - && envAction.actionStartDateTimeUtc?.isEqual(mission.startDateTimeUtc) == false + if (envAction.actionStartDateTimeUtc?.isAfter(mission.startDateTimeUtc) == false && + envAction.actionStartDateTimeUtc?.isEqual(mission.startDateTimeUtc) == false ) { throw BackendUsageException( BackendUsageErrorCode.UNVALID_PROPERTY, diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/actions/fixtures/EnvActionFixture.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/actions/fixtures/EnvActionFixture.kt index f73f4f9cd..dc43369ed 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/actions/fixtures/EnvActionFixture.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/actions/fixtures/EnvActionFixture.kt @@ -72,7 +72,7 @@ class EnvActionFixture { infractions = infractions, actionNumberOfControls = actionNumberOfControls, actionTargetType = actionTargetTypeEnum, - vehicleType = vehicleTypeEnum + vehicleType = vehicleTypeEnum, ) } diff --git a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidatorUTest.kt b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidatorUTest.kt index 8f0839c26..7c7afa9b3 100644 --- a/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidatorUTest.kt +++ b/backend/src/test/kotlin/fr/gouv/cacem/monitorenv/domain/validators/mission/MissionValidatorUTest.kt @@ -47,7 +47,6 @@ class MissionValidatorUTest { assertThat(assertThrows.message).isEqualTo("Le type de mission est requis") } - @ParameterizedTest @ValueSource(strings = ["A", "AA", "AAAA"]) fun `validate should throw an exception if openBy is not a trigram`(openBy: String) { @@ -120,11 +119,12 @@ class MissionValidatorUTest { val endDateTimeUtc = ZonedDateTime.parse("2021-03-04T00:00:00.000Z") val anEnvActionControl = anEnvActionControl(endTime = startDateTimeUtc.minusSeconds(1)) - val mission = aMissionEntity( - startDateTimeUtc = startDateTimeUtc, - endDateTimeUtc = endDateTimeUtc, - envAction = listOf(anEnvActionControl) - ) + val mission = + aMissionEntity( + startDateTimeUtc = startDateTimeUtc, + endDateTimeUtc = endDateTimeUtc, + envAction = listOf(anEnvActionControl), + ) val assertThrows = assertThrows(BackendUsageException::class.java) { missionValidator.validate(mission) } assertThat( @@ -137,11 +137,12 @@ class MissionValidatorUTest { val startDateTimeUtc = ZonedDateTime.parse("2020-03-04T00:00:00.000Z") val endDateTimeUtc = ZonedDateTime.parse("2021-03-04T00:00:00.000Z") val anEnvActionControl = anEnvActionControl(startTime = startDateTimeUtc, endTime = endDateTimeUtc) - val mission = aMissionEntity( - startDateTimeUtc = startDateTimeUtc, - endDateTimeUtc = endDateTimeUtc, - envAction = listOf(anEnvActionControl) - ) + val mission = + aMissionEntity( + startDateTimeUtc = startDateTimeUtc, + endDateTimeUtc = endDateTimeUtc, + envAction = listOf(anEnvActionControl), + ) missionValidator.validate(mission) } @@ -214,8 +215,7 @@ class MissionValidatorUTest { } @Test - fun `validate should throw an exception if there is a control actionTargetType as VEHICULE without vehiculeType when mission has ended`( - ) { + fun `validate should throw an exception if there is a control actionTargetType as VEHICULE without vehiculeType when mission has ended`() { val endDateTimeUtc = ZonedDateTime.now().plusSeconds(1) val anEnvActionControl = anEnvActionControl(actionTargetTypeEnum = ActionTargetTypeEnum.VEHICLE) val mission = aMissionEntity(endDateTimeUtc = endDateTimeUtc, envAction = listOf(anEnvActionControl)) @@ -224,7 +224,6 @@ class MissionValidatorUTest { assertThat(assertThrows.message).isEqualTo("Le type de véhicule est obligatoire") } - @ParameterizedTest @EnumSource(value = ActionTargetTypeEnum::class, names = ["VEHICLE"], mode = EnumSource.Mode.EXCLUDE) fun `validate should pass if there is a control actionTargetType as targetType other than VEHICLE without vehiculeType when mission has ended`( @@ -291,11 +290,12 @@ class MissionValidatorUTest { val endDateTimeUtc = ZonedDateTime.parse("2021-03-04T00:00:00.000Z") val anEnvActionSurveillance = anEnvActionSurveillance(endTime = startDateTimeUtc.minusSeconds(1)) - val mission = aMissionEntity( - startDateTimeUtc = startDateTimeUtc, - endDateTimeUtc = endDateTimeUtc, - envAction = listOf(anEnvActionSurveillance) - ) + val mission = + aMissionEntity( + startDateTimeUtc = startDateTimeUtc, + endDateTimeUtc = endDateTimeUtc, + envAction = listOf(anEnvActionSurveillance), + ) val assertThrows = assertThrows(BackendUsageException::class.java) { missionValidator.validate(mission) } assertThat( @@ -308,11 +308,12 @@ class MissionValidatorUTest { val startDateTimeUtc = ZonedDateTime.parse("2020-03-04T00:00:00.000Z") val endDateTimeUtc = ZonedDateTime.parse("2020-03-04T00:00:00.000Z") val anEnvActionSurveillance = anEnvActionSurveillance(startTime = startDateTimeUtc, endTime = endDateTimeUtc) - val mission = aMissionEntity( - startDateTimeUtc = startDateTimeUtc, - endDateTimeUtc = endDateTimeUtc, - envAction = listOf(anEnvActionSurveillance) - ) + val mission = + aMissionEntity( + startDateTimeUtc = startDateTimeUtc, + endDateTimeUtc = endDateTimeUtc, + envAction = listOf(anEnvActionSurveillance), + ) missionValidator.validate(mission) }