Add year to compute fleet segment

MTES-MCT · Jan 21, 2025 · e55ff69 · e55ff69
1 parent 9932459
commit e55ff69
Show file tree

Hide file tree

Showing 22 changed files with 87 additions and 87 deletions.
diff --git a/...in/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/fleet_segment/ComputeFleetSegments.kt b/...in/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/fleet_segment/ComputeFleetSegments.kt
@@ -8,8 +8,6 @@ import fr.gouv.cnsp.monitorfish.domain.repositories.FleetSegmentRepository
 import fr.gouv.cnsp.monitorfish.domain.repositories.VesselRepository
 import fr.gouv.cnsp.monitorfish.domain.use_cases.fleet_segment.dtos.SpeciesCatchForSegmentCalculation
 import org.slf4j.LoggerFactory
-import java.time.Clock
-import java.time.ZonedDateTime
 
 /**
  * Return the computed fleet segments from the species catches.
@@ -18,19 +16,18 @@ import java.time.ZonedDateTime
 class ComputeFleetSegments(
     private val fleetSegmentRepository: FleetSegmentRepository,
     private val vesselRepository: VesselRepository,
-    private val clock: Clock,
 ) {
     private val logger = LoggerFactory.getLogger(ComputeFleetSegments::class.java)
 
     fun execute(
+        year: Int,
         vesselId: Int,
         speciesCatches: List<SpeciesCatchForSegmentCalculation>,
     ): List<FleetSegment> {
         logger.info("Got ${speciesCatches.size} catches to assign fleet segments")
 
-        val currentYear = ZonedDateTime.now(clock).year
         val vesselType = vesselRepository.findVesselById(vesselId)?.vesselType
-        val fleetSegments = fleetSegmentRepository.findAllByYear(currentYear)
+        val fleetSegments = fleetSegmentRepository.findAllByYear(year)
 
         val controlledPelagicSpeciesWeight =
             speciesCatches

diff --git a/...r/gouv/cnsp/monitorfish/domain/use_cases/fleet_segment/ComputeFleetSegmentsFromControl.kt b/...r/gouv/cnsp/monitorfish/domain/use_cases/fleet_segment/ComputeFleetSegmentsFromControl.kt
@@ -19,11 +19,12 @@ class ComputeFleetSegmentsFromControl(
         faoAreas: List<String>,
         gears: List<GearControl>,
         species: List<SpeciesControl>,
+        year: Int,
     ): List<FleetSegment> {
         val allSpecies = speciesRepository.findAll()
 
         val speciesCatches = getSpeciesCatchesForSegmentCalculation(faoAreas, gears, species, allSpecies)
 
-        return computeFleetSegments.execute(vesselId, speciesCatches)
+        return computeFleetSegments.execute(year, vesselId, speciesCatches)
     }
 }
diff --git a/...uv/cnsp/monitorfish/domain/use_cases/prior_notification/ComputeManualPriorNotification.kt b/...uv/cnsp/monitorfish/domain/use_cases/prior_notification/ComputeManualPriorNotification.kt
@@ -26,6 +26,7 @@ class ComputeManualPriorNotification(
         portLocode: String,
         tripGearCodes: List<String>,
         vesselId: Int,
+        year: Int,
     ): ManualPriorNotificationComputedValues {
         val vessel = vesselRepository.findVesselById(vesselId)
         requireNotNull(vessel) {
@@ -41,7 +42,7 @@ class ComputeManualPriorNotification(
         val vesselFlagCountryCode = vessel.flagState
 
         val speciesCatch = getSpeciesCatchesForSegmentCalculation(tripGearCodes, fishingCatchesWithFaoArea, species)
-        val tripSegments = computeFleetSegments.execute(vessel.id, speciesCatch)
+        val tripSegments = computeFleetSegments.execute(year, vessel.id, speciesCatch)
         val types = computePnoTypes.execute(fishingCatchesWithFaoArea, tripGearCodes, vesselFlagCountryCode)
         val vesselRiskFactor = computeRiskFactor.execute(portLocode, tripSegments, vesselCfr)
 
@@ -56,10 +57,10 @@ class ComputeManualPriorNotification(
 
         return ManualPriorNotificationComputedValues(
             isVesselUnderCharter = vessel.underCharter,
-            nextState,
-            tripSegments,
-            types,
-            vesselRiskFactor,
+            nextState = nextState,
+            tripSegments = tripSegments,
+            types = types,
+            vesselRiskFactor = vesselRiskFactor,
         )
     }
 }
diff --git a/.../monitorfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotification.kt b/.../monitorfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotification.kt
@@ -63,11 +63,12 @@ class CreateOrUpdateManualPriorNotification(
         // The Backend should NEVER update `risk_factors` DB table, only the pipeline is allowed to update it.
         val computedValues =
             computeManualPriorNotification.execute(
-                fishingCatches,
-                globalFaoArea,
-                portLocode,
-                tripGearCodes,
-                vesselId,
+                fishingCatches = fishingCatches,
+                globalFaoArea = globalFaoArea,
+                portLocode = portLocode,
+                tripGearCodes = tripGearCodes,
+                vesselId = vesselId,
+                year = expectedLandingDate.year,
             )
 
         val isPartOfControlUnitSubscriptions =

diff --git a/...src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/FleetSegmentController.kt b/...src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/FleetSegmentController.kt
@@ -28,7 +28,7 @@ class FleetSegmentController(
         }
 
     @PostMapping("/compute")
-    @Operation(summary = "compute fleet segments for the current year")
+    @Operation(summary = "compute fleet segments for the given year")
     fun computeFleetSegments(
         @RequestBody
         computeFleetSegmentsDataInput: ComputeFleetSegmentsDataInput,
@@ -39,6 +39,7 @@ class FleetSegmentController(
                 computeFleetSegmentsDataInput.faoAreas,
                 computeFleetSegmentsDataInput.gears.map { it.toGearControl() },
                 computeFleetSegmentsDataInput.species.map { it.toSpeciesControl() },
+                computeFleetSegmentsDataInput.year,
             )
         return fleetSegments.map {
             FleetSegmentDataOutput.fromFleetSegment(it)

diff --git a/...ain/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/PriorNotificationController.kt b/...ain/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/PriorNotificationController.kt
@@ -207,6 +207,7 @@ class PriorNotificationController(
                 portLocode = manualPriorNotificationComputeDataInput.portLocode,
                 tripGearCodes = manualPriorNotificationComputeDataInput.tripGearCodes,
                 vesselId = manualPriorNotificationComputeDataInput.vesselId,
+                year = manualPriorNotificationComputeDataInput.year,
             )
 
         return ManualPriorNotificationComputedValuesDataOutput

diff --git a/...kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/ComputeFleetSegmentsDataInput.kt b/...kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/ComputeFleetSegmentsDataInput.kt
@@ -5,4 +5,5 @@ data class ComputeFleetSegmentsDataInput(
     val vesselId: Int,
     val gears: List<GearControlDataInput>,
     val species: List<SpeciesControlDataInput>,
+    val year: Int,
 )
diff --git a/...gouv/cnsp/monitorfish/infrastructure/api/input/ManualPriorNotificationComputeDataInput.kt b/...gouv/cnsp/monitorfish/infrastructure/api/input/ManualPriorNotificationComputeDataInput.kt
@@ -6,4 +6,5 @@ data class ManualPriorNotificationComputeDataInput(
     val portLocode: String,
     val tripGearCodes: List<String>,
     val vesselId: Int,
+    val year: Int,
 )
diff --git a/...lin/fr/gouv/cnsp/monitorfish/domain/use_cases/fleet_segment/ComputeFleetSegmentsUTests.kt b/...lin/fr/gouv/cnsp/monitorfish/domain/use_cases/fleet_segment/ComputeFleetSegmentsUTests.kt
@@ -2,6 +2,7 @@ package fr.gouv.cnsp.monitorfish.domain.use_cases.fleet_segment
 
 import com.neovisionaries.i18n.CountryCode
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.given
 import fr.gouv.cnsp.monitorfish.domain.entities.fleet_segment.ScipSpeciesType
 import fr.gouv.cnsp.monitorfish.domain.entities.vessel.Vessel
@@ -14,8 +15,6 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
-import java.time.Clock
-import java.time.ZonedDateTime
 
 @ExtendWith(SpringExtension::class)
 class ComputeFleetSegmentsUTests {
@@ -25,10 +24,6 @@ class ComputeFleetSegmentsUTests {
     @MockBean
     private lateinit var vesselRepository: VesselRepository
 
-    companion object {
-        val fixedClock: Clock = Clock.systemUTC()
-    }
-
     @Test
     fun `execute Should compute Lines segment`() {
         // Given
@@ -115,7 +110,7 @@ class ComputeFleetSegmentsUTests {
                     scipSpeciesType = ScipSpeciesType.TUNA,
                 ),
             )
-        given(fleetSegmentRepository.findAllByYear(ZonedDateTime.now().year)).willReturn(fleetSegmentsForComputation)
+        given(fleetSegmentRepository.findAllByYear(eq(2025))).willReturn(fleetSegmentsForComputation)
         given(vesselRepository.findVesselById(any())).willReturn(
             Vessel(
                 id = 1,
@@ -134,8 +129,7 @@ class ComputeFleetSegmentsUTests {
             ComputeFleetSegments(
                 fleetSegmentRepository,
                 vesselRepository,
-                fixedClock,
-            ).execute(1, speciesCatches)
+            ).execute(2025, 1, speciesCatches)
 
         // Then
         assertThat(fleetSegments).hasSize(1)
@@ -164,7 +158,7 @@ class ComputeFleetSegmentsUTests {
                     scipSpeciesType = ScipSpeciesType.PELAGIC,
                 ),
             )
-        given(fleetSegmentRepository.findAllByYear(ZonedDateTime.now().year)).willReturn(fleetSegmentsForComputation)
+        given(fleetSegmentRepository.findAllByYear(eq(2025))).willReturn(fleetSegmentsForComputation)
         given(vesselRepository.findVesselById(any())).willReturn(
             Vessel(
                 id = 1,
@@ -183,8 +177,7 @@ class ComputeFleetSegmentsUTests {
             ComputeFleetSegments(
                 fleetSegmentRepository,
                 vesselRepository,
-                fixedClock,
-            ).execute(1, speciesCatches)
+            ).execute(2025, 1, speciesCatches)
 
         // Then
         assertThat(fleetSegments).hasSize(1)
@@ -221,7 +214,7 @@ class ComputeFleetSegmentsUTests {
                     scipSpeciesType = null,
                 ),
             )
-        given(fleetSegmentRepository.findAllByYear(ZonedDateTime.now().year)).willReturn(fleetSegmentsForComputation)
+        given(fleetSegmentRepository.findAllByYear(eq(2025))).willReturn(fleetSegmentsForComputation)
         given(vesselRepository.findVesselById(any())).willReturn(
             Vessel(
                 id = 1,
@@ -240,8 +233,7 @@ class ComputeFleetSegmentsUTests {
             ComputeFleetSegments(
                 fleetSegmentRepository,
                 vesselRepository,
-                fixedClock,
-            ).execute(1, speciesCatches)
+            ).execute(2025, 1, speciesCatches)
 
         // Then
         assertThat(fleetSegments).hasSize(1)
@@ -278,7 +270,7 @@ class ComputeFleetSegmentsUTests {
                     scipSpeciesType = null,
                 ),
             )
-        given(fleetSegmentRepository.findAllByYear(ZonedDateTime.now().year)).willReturn(fleetSegmentsForComputation)
+        given(fleetSegmentRepository.findAllByYear(eq(2025))).willReturn(fleetSegmentsForComputation)
         given(vesselRepository.findVesselById(any())).willReturn(
             Vessel(
                 id = 1,
@@ -297,8 +289,7 @@ class ComputeFleetSegmentsUTests {
             ComputeFleetSegments(
                 fleetSegmentRepository,
                 vesselRepository,
-                fixedClock,
-            ).execute(1, speciesCatches)
+            ).execute(2025, 1, speciesCatches)
 
         // Then
         assertThat(fleetSegments).hasSize(1)
@@ -327,7 +318,7 @@ class ComputeFleetSegmentsUTests {
                     scipSpeciesType = ScipSpeciesType.DEMERSAL,
                 ),
             )
-        given(fleetSegmentRepository.findAllByYear(ZonedDateTime.now().year)).willReturn(fleetSegmentsForComputation)
+        given(fleetSegmentRepository.findAllByYear(eq(2025))).willReturn(fleetSegmentsForComputation)
         given(vesselRepository.findVesselById(any())).willReturn(
             Vessel(
                 id = 1,
@@ -346,8 +337,7 @@ class ComputeFleetSegmentsUTests {
             ComputeFleetSegments(
                 fleetSegmentRepository,
                 vesselRepository,
-                fixedClock,
-            ).execute(1, speciesCatches)
+            ).execute(2025, 1, speciesCatches)
 
         // Then
         assertThat(fleetSegments).hasSize(1)
@@ -376,7 +366,7 @@ class ComputeFleetSegmentsUTests {
                     scipSpeciesType = ScipSpeciesType.DEMERSAL,
                 ),
             )
-        given(fleetSegmentRepository.findAllByYear(ZonedDateTime.now().year)).willReturn(fleetSegmentsForComputation)
+        given(fleetSegmentRepository.findAllByYear(eq(2025))).willReturn(fleetSegmentsForComputation)
         given(vesselRepository.findVesselById(any())).willReturn(
             Vessel(
                 id = 1,
@@ -395,8 +385,7 @@ class ComputeFleetSegmentsUTests {
             ComputeFleetSegments(
                 fleetSegmentRepository,
                 vesselRepository,
-                fixedClock,
-            ).execute(1, speciesCatches)
+            ).execute(2025, 1, speciesCatches)
 
         // Then
         assertThat(fleetSegments).hasSize(1)
@@ -406,7 +395,7 @@ class ComputeFleetSegmentsUTests {
     @Test
     fun `execute Should compute no segment`() {
         // Given
-        given(fleetSegmentRepository.findAllByYear(ZonedDateTime.now().year)).willReturn(fleetSegmentsForComputation)
+        given(fleetSegmentRepository.findAllByYear(eq(2025))).willReturn(fleetSegmentsForComputation)
         given(vesselRepository.findVesselById(any())).willReturn(
             Vessel(
                 id = 1,
@@ -425,8 +414,7 @@ class ComputeFleetSegmentsUTests {
             ComputeFleetSegments(
                 fleetSegmentRepository,
                 vesselRepository,
-                fixedClock,
-            ).execute(1, listOf())
+            ).execute(2025, 1, listOf())
 
         // Then
         assertThat(fleetSegments).hasSize(0)

diff --git a/...orfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotificationITests.kt b/...orfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotificationITests.kt
@@ -341,7 +341,7 @@ class CreateOrUpdateManualPriorNotificationITests : AbstractDBTests() {
         // Given
         val reportId = testCase.reportId
 
-        given { computeManualPriorNotification.execute(any(), any(), any(), any(), any()) }
+        given { computeManualPriorNotification.execute(any(), any(), any(), any(), any(), any()) }
             .willReturn(
                 ManualPriorNotificationComputedValues(
                     isVesselUnderCharter = false,
@@ -390,7 +390,7 @@ class CreateOrUpdateManualPriorNotificationITests : AbstractDBTests() {
         // Given
         val reportId = testCase.reportId
 
-        given { computeManualPriorNotification.execute(any(), any(), any(), any(), any()) }
+        given { computeManualPriorNotification.execute(any(), any(), any(), any(), any(), any()) }
             .willReturn(
                 ManualPriorNotificationComputedValues(
                     isVesselUnderCharter = false,

diff --git a/...orfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotificationUTests.kt b/...orfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotificationUTests.kt
@@ -53,7 +53,7 @@ class CreateOrUpdateManualPriorNotificationUTests {
 
         // Given
         given(vesselRepository.findVesselById(any())).willReturn(VesselFaker.fakeVessel())
-        given(computeManualPriorNotification.execute(any(), any(), any(), any(), any())).willReturn(
+        given(computeManualPriorNotification.execute(any(), any(), any(), any(), any(), any())).willReturn(
             ManualPriorNotificationComputedValues(
                 isVesselUnderCharter = null,
                 nextState = PriorNotificationState.OUT_OF_VERIFICATION_SCOPE,
@@ -116,7 +116,7 @@ class CreateOrUpdateManualPriorNotificationUTests {
             existingFakePriorNotification,
         )
         given(vesselRepository.findVesselById(any())).willReturn(VesselFaker.fakeVessel())
-        given(computeManualPriorNotification.execute(any(), any(), any(), any(), any())).willReturn(
+        given(computeManualPriorNotification.execute(any(), any(), any(), any(), any(), any())).willReturn(
             ManualPriorNotificationComputedValues(
                 isVesselUnderCharter = null,
                 nextState = PriorNotificationState.OUT_OF_VERIFICATION_SCOPE,

diff --git a/...st/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/FleetSegmentControllerITests.kt b/...st/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/FleetSegmentControllerITests.kt
@@ -77,7 +77,7 @@ class FleetSegmentControllerITests {
     @Test
     fun `Should compute fleet segments`() {
         // Given
-        given(this.computeFleetSegmentsFromControl.execute(any(), any(), any(), any())).willReturn(
+        given(this.computeFleetSegmentsFromControl.execute(any(), any(), any(), any(), any())).willReturn(
             listOf(
                 FleetSegment(
                     segment = "SWW01",
@@ -106,6 +106,7 @@ class FleetSegmentControllerITests {
                             ComputeFleetSegmentsDataInput(
                                 faoAreas = listOf("27.1.c", "27.1.b"),
                                 vesselId = 123,
+                                year = 2021,
                                 gears =
                                     listOf(
                                         GearControlDataInput(

diff --git a/...tlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/PriorNotificationControllerUTests.kt b/...tlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/PriorNotificationControllerUTests.kt
@@ -168,7 +168,7 @@ class PriorNotificationControllerUTests {
     @Test
     fun `getManualComputation Should get a manual prior notification computed values`() {
         // Given
-        given(this.computeManualPriorNotification.execute(any(), any(), any(), any(), any()))
+        given(this.computeManualPriorNotification.execute(any(), any(), any(), any(), any(), any()))
             .willReturn(
                 ManualPriorNotificationComputedValues(
                     isVesselUnderCharter = null,
@@ -188,6 +188,7 @@ class PriorNotificationControllerUTests {
                     portLocode = "FRABC",
                     tripGearCodes = emptyList(),
                     vesselId = 42,
+                    year = 2025,
                 ),
             )
         api

diff --git a/frontend/cypress/e2e/side_window/mission_form/sea_control.spec.ts b/frontend/cypress/e2e/side_window/mission_form/sea_control.spec.ts
@@ -141,6 +141,13 @@ context('Side Window > Mission Form > Sea Control', () => {
     cy.fill('Sous-taille', true)
     cy.fill('Observations (hors infraction) sur les espèces', 'Une observation hors infraction sur les espèces.')
 
+    // This should trigger a computation of the fleet segment
+    cy.intercept('POST', 'bff/v1/fleet_segments/compute').as(
+      'computeFleetSegments'
+    )
+    cy.fill('Date et heure du contrôle', now.utcDateTupleWithTime)
+    cy.wait('@computeFleetSegments')
+
     // Appréhension et déroutement
     cy.fill('Appréhension d’engin(s)', true)
     cy.fill('Appréhension d’espèce(s)', true)

diff --git a/frontend/src/features/FleetSegment/apis.ts b/frontend/src/features/FleetSegment/apis.ts
@@ -10,6 +10,7 @@ export type ComputeFleetSegmentsParams = {
   gears: MissionAction.GearControl[]
   species: MissionAction.SpeciesControl[]
   vesselId: number
+  year: number
 }
 
 export const fleetSegmentApi = monitorfishApi.injectEndpoints({