Remove left authorTrigram param in CreateOrUpdateManualPriorNotification

MTES-MCT · Oct 16, 2024 · 0d47cef · 0d47cef
1 parent c59076b
commit 0d47cef
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 24 deletions.
diff --git a/.../monitorfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotification.kt b/.../monitorfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotification.kt
@@ -29,7 +29,6 @@ class CreateOrUpdateManualPriorNotification(
 
     fun execute(
         reportId: String?,
-        authorTrigram: String,
         didNotFishAfterZeroNotice: Boolean,
         expectedArrivalDate: ZonedDateTime,
         expectedLandingDate: ZonedDateTime,
@@ -75,7 +74,6 @@ class CreateOrUpdateManualPriorNotification(
         val priorNotificationTypes = computedValues.types.map { it.toPriorNotificationType() }
         val message =
             getMessage(
-                authorTrigram = authorTrigram,
                 expectedArrivalDate = expectedArrivalDate,
                 expectedLandingDate = expectedLandingDate,
                 // At the moment, manual prior notifications only have a single global FAO area field in Frontend,
@@ -166,7 +164,6 @@ class CreateOrUpdateManualPriorNotification(
     }
 
     private fun getMessage(
-        authorTrigram: String,
         purpose: LogbookMessagePurpose,
         expectedArrivalDate: ZonedDateTime,
         expectedLandingDate: ZonedDateTime,

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
@@ -220,14 +220,13 @@ class PriorNotificationController(
     ): ManualPriorNotificationFormDataOutput {
         val createdPriorNotification =
             createOrUpdateManualPriorNotification.execute(
-                hasPortEntranceAuthorization = manualPriorNotificationFormDataInput.hasPortEntranceAuthorization,
-                hasPortLandingAuthorization = manualPriorNotificationFormDataInput.hasPortLandingAuthorization,
-                authorTrigram = manualPriorNotificationFormDataInput.authorTrigram,
                 didNotFishAfterZeroNotice = manualPriorNotificationFormDataInput.didNotFishAfterZeroNotice,
                 expectedArrivalDate = manualPriorNotificationFormDataInput.expectedArrivalDate,
                 expectedLandingDate = manualPriorNotificationFormDataInput.expectedLandingDate,
-                globalFaoArea = manualPriorNotificationFormDataInput.globalFaoArea,
                 fishingCatches = manualPriorNotificationFormDataInput.fishingCatches.map { it.toLogbookFishingCatch() },
+                globalFaoArea = manualPriorNotificationFormDataInput.globalFaoArea,
+                hasPortEntranceAuthorization = manualPriorNotificationFormDataInput.hasPortEntranceAuthorization,
+                hasPortLandingAuthorization = manualPriorNotificationFormDataInput.hasPortLandingAuthorization,
                 note = manualPriorNotificationFormDataInput.note,
                 portLocode = manualPriorNotificationFormDataInput.portLocode,
                 reportId = null,
@@ -253,14 +252,13 @@ class PriorNotificationController(
     ): ManualPriorNotificationFormDataOutput {
         val updatedPriorNotification =
             createOrUpdateManualPriorNotification.execute(
-                hasPortEntranceAuthorization = manualPriorNotificationFormDataInput.hasPortEntranceAuthorization,
-                hasPortLandingAuthorization = manualPriorNotificationFormDataInput.hasPortLandingAuthorization,
-                authorTrigram = manualPriorNotificationFormDataInput.authorTrigram,
                 didNotFishAfterZeroNotice = manualPriorNotificationFormDataInput.didNotFishAfterZeroNotice,
                 expectedArrivalDate = manualPriorNotificationFormDataInput.expectedArrivalDate,
                 expectedLandingDate = manualPriorNotificationFormDataInput.expectedLandingDate,
-                globalFaoArea = manualPriorNotificationFormDataInput.globalFaoArea,
                 fishingCatches = manualPriorNotificationFormDataInput.fishingCatches.map { it.toLogbookFishingCatch() },
+                globalFaoArea = manualPriorNotificationFormDataInput.globalFaoArea,
+                hasPortEntranceAuthorization = manualPriorNotificationFormDataInput.hasPortEntranceAuthorization,
+                hasPortLandingAuthorization = manualPriorNotificationFormDataInput.hasPortLandingAuthorization,
                 note = manualPriorNotificationFormDataInput.note,
                 portLocode = manualPriorNotificationFormDataInput.portLocode,
                 reportId = reportId,

diff --git a/...orfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotificationITests.kt b/...orfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotificationITests.kt
@@ -356,20 +356,19 @@ class CreateOrUpdateManualPriorNotificationITests : AbstractDBTests() {
         val afterPriorNotification =
             createOrUpdateManualPriorNotification.execute(
                 reportId = reportId,
-                authorTrigram = "ABC",
                 didNotFishAfterZeroNotice = false,
                 expectedArrivalDate = ZonedDateTime.now(),
                 expectedLandingDate = ZonedDateTime.now(),
-                globalFaoArea = "FAKE_FAO_AREA",
                 fishingCatches = emptyList(),
+                globalFaoArea = "FAKE_FAO_AREA",
                 hasPortEntranceAuthorization = false,
                 hasPortLandingAuthorization = false,
                 note = null,
                 portLocode = "FRVNE",
                 purpose = LogbookMessagePurpose.LAN,
                 sentAt = ZonedDateTime.now(),
                 tripGearCodes = emptyList(),
-                updatedBy = "bob@example.org",
+                updatedBy = "editor@example.org",
                 vesselId = 1,
             )
 
@@ -406,7 +405,6 @@ class CreateOrUpdateManualPriorNotificationITests : AbstractDBTests() {
         val afterPriorNotification =
             createOrUpdateManualPriorNotification.execute(
                 reportId = reportId,
-                authorTrigram = "ABC",
                 didNotFishAfterZeroNotice = false,
                 expectedArrivalDate = ZonedDateTime.now(),
                 expectedLandingDate = ZonedDateTime.now(),
@@ -419,7 +417,7 @@ class CreateOrUpdateManualPriorNotificationITests : AbstractDBTests() {
                 purpose = LogbookMessagePurpose.LAN,
                 sentAt = ZonedDateTime.now(),
                 tripGearCodes = emptyList(),
-                updatedBy = "bob@example.org",
+                updatedBy = "editor@example.org",
                 vesselId = 1,
             )
 

diff --git a/...orfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotificationUTests.kt b/...orfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotificationUTests.kt
@@ -85,21 +85,20 @@ class CreateOrUpdateManualPriorNotificationUTests {
                 computeManualPriorNotification,
                 getPriorNotification,
             ).execute(
-                hasPortEntranceAuthorization = true,
-                hasPortLandingAuthorization = true,
                 purpose = LogbookMessagePurpose.LAN,
-                authorTrigram = "ABC",
                 didNotFishAfterZeroNotice = false,
                 expectedArrivalDate = ZonedDateTime.parse("2024-01-01T00:00:00Z"),
                 expectedLandingDate = ZonedDateTime.parse("2024-01-01T00:00:00Z"),
-                globalFaoArea = "FAKE_FAO_AREA",
                 fishingCatches = emptyList(),
+                globalFaoArea = "FAKE_FAO_AREA",
+                hasPortEntranceAuthorization = true,
+                hasPortLandingAuthorization = true,
                 note = null,
                 portLocode = "FAKE_PORT_LOCODE",
                 reportId = fakePriorNotification.reportId!!,
                 sentAt = ZonedDateTime.parse("2024-01-01T00:00:00Z"),
                 tripGearCodes = emptyList(),
-                updatedBy = "bob@example.org",
+                updatedBy = "editor@example.org",
                 vesselId = 1,
             )
 

diff --git a/...tlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/PriorNotificationControllerUTests.kt b/...tlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/PriorNotificationControllerUTests.kt
@@ -218,7 +218,6 @@ class PriorNotificationControllerUTests {
                 anyOrNull(),
                 anyOrNull(),
                 anyOrNull(),
-                anyOrNull(),
             ),
         )
             .willReturn(fakePriorNotification)
@@ -262,12 +261,11 @@ class PriorNotificationControllerUTests {
         given(
             createOrUpdateManualPriorNotification.execute(
                 reportId = any(),
-                authorTrigram = anyOrNull(),
                 didNotFishAfterZeroNotice = anyOrNull(),
                 expectedArrivalDate = anyOrNull(),
                 expectedLandingDate = anyOrNull(),
-                globalFaoArea = anyOrNull(),
                 fishingCatches = anyOrNull(),
+                globalFaoArea = anyOrNull(),
                 hasPortEntranceAuthorization = anyOrNull(),
                 hasPortLandingAuthorization = anyOrNull(),
                 note = anyOrNull(),