Préavis – Ajoute le statut 'Invalidé' et regroupe les états en attent…

…e dans le filtre des status de diffusion (#3627) ## Linked issues - Resolve #3578 - #3398 ---- - [x] Tests E2E (Cypress)
MTES-MCT · Sep 6, 2024 · 4c3db41 · 4c3db41
2 parents 0f608ed + 7a27558
commit 4c3db41
Show file tree

Hide file tree

Showing 18 changed files with 264 additions and 111 deletions.
diff --git a/...ouv/cnsp/monitorfish/domain/use_cases/prior_notification/CreatePriorNotificationUpload.kt b/...ouv/cnsp/monitorfish/domain/use_cases/prior_notification/CreatePriorNotificationUpload.kt
@@ -14,19 +14,25 @@ class CreatePriorNotificationUpload(
     private val manualPriorNotificationRepository: ManualPriorNotificationRepository,
     private val priorNotificationUploadRepository: PriorNotificationUploadRepository,
 ) {
-    fun execute(identifier: PriorNotificationIdentifier, content: ByteArray, fileName: String, mimeType: String) {
+    fun execute(
+        identifier: PriorNotificationIdentifier,
+        content: ByteArray,
+        fileName: String,
+        mimeType: String,
+    ) {
         val createdAt = CustomZonedDateTime.now()
 
-        val newPriorNotificationDocument = PriorNotificationDocument(
-            id = null,
-            content = content,
-            createdAt = createdAt,
-            fileName = fileName,
-            isManualPriorNotification = identifier.isManualPriorNotification,
-            mimeType = mimeType,
-            reportId = identifier.reportId,
-            updatedAt = createdAt,
-        )
+        val newPriorNotificationDocument =
+            PriorNotificationDocument(
+                id = null,
+                content = content,
+                createdAt = createdAt,
+                fileName = fileName,
+                isManualPriorNotification = identifier.isManualPriorNotification,
+                mimeType = mimeType,
+                reportId = identifier.reportId,
+                updatedAt = createdAt,
+            )
 
         priorNotificationUploadRepository.save(newPriorNotificationDocument)
 

diff --git a/...ouv/cnsp/monitorfish/domain/use_cases/prior_notification/DeletePriorNotificationUpload.kt b/...ouv/cnsp/monitorfish/domain/use_cases/prior_notification/DeletePriorNotificationUpload.kt
@@ -12,7 +12,10 @@ class DeletePriorNotificationUpload(
     private val manualPriorNotificationRepository: ManualPriorNotificationRepository,
     private val priorNotificationUploadRepository: PriorNotificationUploadRepository,
 ) {
-    fun execute(identifier: PriorNotificationIdentifier, priorNotificationUploadId: String) {
+    fun execute(
+        identifier: PriorNotificationIdentifier,
+        priorNotificationUploadId: String,
+    ) {
         priorNotificationUploadRepository.deleteById(priorNotificationUploadId)
 
         if (identifier.isManualPriorNotification) {

diff --git a/...lin/fr/gouv/cnsp/monitorfish/domain/use_cases/prior_notification/GetPriorNotifications.kt b/...lin/fr/gouv/cnsp/monitorfish/domain/use_cases/prior_notification/GetPriorNotifications.kt
@@ -30,6 +30,7 @@ class GetPriorNotifications(
 
     fun execute(
         filter: PriorNotificationsFilter,
+        isInvalidated: Boolean?,
         seafrontGroup: SeafrontGroup,
         states: List<PriorNotificationState>?,
         sortColumn: PriorNotificationsSortColumn,
@@ -90,7 +91,13 @@ class GetPriorNotifications(
                             compareByDescending<PriorNotification> { getSortKey(it, sortColumn) }
                                 .thenByDescending { it.logbookMessageAndValue.logbookMessage.id }, // Tie-breaker
                         )
-                }.filter { seafrontGroup.hasSeafront(it.seafront) && (states.isNullOrEmpty() || states.contains(it.state)) }
+                }.filter { priorNotification ->
+                    seafrontGroup.hasSeafront(priorNotification.seafront) && (
+                        (states.isNullOrEmpty() && isInvalidated == null) ||
+                            (!states.isNullOrEmpty() && states.contains(priorNotification.state)) ||
+                            (isInvalidated != null && priorNotification.logbookMessageAndValue.value.isInvalidated == isInvalidated)
+                    )
+                }
             }
         logger.info(
             "TIME_RECORD - 'sortedAndFilteredPriorNotifications' took $sortedAndFilteredPriorNotificationsTimeTaken.",

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
@@ -56,6 +56,9 @@ class PriorNotificationController(
         @Parameter(description = "Vessels that have one or more reportings.")
         @RequestParam(name = "hasOneOrMoreReportings")
         hasOneOrMoreReportings: Boolean? = null,
+        @Parameter(description = "Include or exclude invalidated prior notifications.")
+        @RequestParam(name = "isInvalidated")
+        isInvalidated: Boolean? = null,
         @Parameter(description = "Vessels that are less than 12 meters in length.")
         @RequestParam(name = "isLessThanTwelveMetersVessel")
         isLessThanTwelveMetersVessel: Boolean? = null,
@@ -129,6 +132,7 @@ class PriorNotificationController(
             getPriorNotifications
                 .execute(
                     priorNotificationsFilter,
+                    isInvalidated,
                     seafrontGroup,
                     states,
                     sortColumn,
@@ -378,10 +382,11 @@ class PriorNotificationController(
     ): ResponseEntity<ByteArray> {
         val document = getPriorNotificationUpload.execute(priorNotificationUploadId)
 
-        val headers = HttpHeaders().apply {
-            contentType = MediaType.parseMediaType(document.mimeType)
-            setContentDispositionFormData("attachment", document.fileName)
-        }
+        val headers =
+            HttpHeaders().apply {
+                contentType = MediaType.parseMediaType(document.mimeType)
+                setContentDispositionFormData("attachment", document.fileName)
+            }
 
         return ResponseEntity(document.content, headers, HttpStatus.OK)
     }
@@ -412,12 +417,15 @@ class PriorNotificationController(
         @RequestParam("file")
         file: MultipartFile,
     ): ResponseEntity<*> {
-        val content = file.bytes
-            ?: throw BackendRequestException(BackendRequestErrorCode.EMPTY_UPLOADED_FILE)
-        val fileName = file.originalFilename
-            ?: throw BackendRequestException(BackendRequestErrorCode.MISSING_UPLOADED_FILE_NAME)
-        val mimeType = file.contentType
-            ?: throw BackendRequestException(BackendRequestErrorCode.MISSING_UPLOADED_FILE_TYPE)
+        val content =
+            file.bytes
+                ?: throw BackendRequestException(BackendRequestErrorCode.EMPTY_UPLOADED_FILE)
+        val fileName =
+            file.originalFilename
+                ?: throw BackendRequestException(BackendRequestErrorCode.MISSING_UPLOADED_FILE_NAME)
+        val mimeType =
+            file.contentType
+                ?: throw BackendRequestException(BackendRequestErrorCode.MISSING_UPLOADED_FILE_TYPE)
 
         val identifier = PriorNotificationIdentifier(reportId, operationDate, isManualPriorNotification)
 

diff --git a/.../fr/gouv/cnsp/monitorfish/infrastructure/api/outputs/PriorNotificationUploadDataOutput.kt b/.../fr/gouv/cnsp/monitorfish/infrastructure/api/outputs/PriorNotificationUploadDataOutput.kt
@@ -13,10 +13,13 @@ class PriorNotificationUploadDataOutput(
     val updatedAt: CustomZonedDateTime,
 ) {
     companion object {
-        fun fromPriorNotificationDocument(priorNotificationDocument: PriorNotificationDocument): PriorNotificationUploadDataOutput {
-            val id = requireNotNull(priorNotificationDocument.id) {
-                "`id` is null."
-            }
+        fun fromPriorNotificationDocument(
+            priorNotificationDocument: PriorNotificationDocument,
+        ): PriorNotificationUploadDataOutput {
+            val id =
+                requireNotNull(priorNotificationDocument.id) {
+                    "`id` is null."
+                }
 
             return PriorNotificationUploadDataOutput(
                 id = id,

diff --git a/...r/gouv/cnsp/monitorfish/infrastructure/database/entities/PriorNotificationUploadEntity.kt b/...r/gouv/cnsp/monitorfish/infrastructure/database/entities/PriorNotificationUploadEntity.kt
@@ -14,30 +14,22 @@ data class PriorNotificationUploadEntity(
     @Column(name = "id", updatable = false)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     val id: String?,
-
     @Column(name = "content", nullable = false)
     @JdbcType(BinaryJdbcType::class)
     val content: ByteArray,
-
     @Column(name = "created_at", nullable = false)
     val createdAt: ZonedDateTime,
-
     @Column(name = "file_name", nullable = false)
     val fileName: String,
-
     @Column(name = "is_manual_prior_notification", nullable = false)
     val isManualPriorNotification: Boolean,
-
     @Column(name = "mime_type", nullable = false)
     val mimeType: String,
-
     @Column(name = "report_id", nullable = false)
     val reportId: String,
-
     @Column(name = "updated_at", nullable = false)
     val updatedAt: ZonedDateTime,
 ) {
-
     fun toDocument(): PriorNotificationDocument {
         return PriorNotificationDocument(
             id = id!!,

diff --git a/.../gouv/cnsp/monitorfish/domain/use_cases/prior_notification/GetPriorNotificationsITests.kt b/.../gouv/cnsp/monitorfish/domain/use_cases/prior_notification/GetPriorNotificationsITests.kt
@@ -52,6 +52,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             willArriveAfter = "2000-01-01T00:00:00Z",
             willArriveBefore = "2099-12-31T00:00:00Z",
         )
+    private val defaultIsInvalidated = null
     private val defaultSeafrontGroup = SeafrontGroup.ALL
     private val defaultStates = null
     private val defaultSortColumn = PriorNotificationsSortColumn.EXPECTED_ARRIVAL_DATE
@@ -71,6 +72,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -102,6 +104,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -133,6 +136,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -164,6 +168,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -195,6 +200,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -222,6 +228,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -249,6 +256,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -281,6 +289,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -313,6 +322,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -342,6 +352,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     defaultStates,
                     sortColumn,
@@ -370,6 +381,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     seafrontGroup,
                     defaultStates,
                     defaultSortColumn,
@@ -394,6 +406,7 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             getPriorNotifications
                 .execute(
                     defaultFilter,
+                    defaultIsInvalidated,
                     defaultSeafrontGroup,
                     states,
                     defaultSortColumn,
@@ -413,4 +426,61 @@ class GetPriorNotificationsITests : AbstractDBTests() {
             },
         ).isTrue()
     }
+
+    @Test
+    @Transactional
+    fun `execute should return a list of invalidated prior notifications`() {
+        // Given
+        val isInvalidated = true
+
+        // When
+        val result =
+            getPriorNotifications
+                .execute(
+                    defaultFilter,
+                    isInvalidated,
+                    defaultSeafrontGroup,
+                    defaultStates,
+                    defaultSortColumn,
+                    defaultSortDirection,
+                    defaultPageNumber,
+                    defaultPageSize,
+                )
+
+        // Then
+        assertThat(result.data).hasSizeGreaterThan(0)
+        assertThat(result.data.all { it.logbookMessageAndValue.value.isInvalidated == true }).isTrue()
+    }
+
+    @Test
+    @Transactional
+    fun `execute should return a list of either pending send or invalidated prior notifications`() {
+        // Given
+        val isInvalidated = true
+        val states = listOf(PriorNotificationState.PENDING_SEND)
+
+        // When
+        val result =
+            getPriorNotifications
+                .execute(
+                    defaultFilter,
+                    isInvalidated,
+                    defaultSeafrontGroup,
+                    states,
+                    defaultSortColumn,
+                    defaultSortDirection,
+                    defaultPageNumber,
+                    defaultPageSize,
+                )
+
+        // Then
+        val invalidatedPriorNotifications = result.data.filter { it.logbookMessageAndValue.value.isInvalidated == true }
+        val pendingSendPriorNotifications = result.data.filter { it.state == PriorNotificationState.PENDING_SEND }
+        val pendingSendPriorNotificationReportIds = pendingSendPriorNotifications.map { it.reportId!! }
+        assertThat(invalidatedPriorNotifications).hasSizeGreaterThan(0)
+        assertThat(pendingSendPriorNotifications).hasSizeGreaterThan(0)
+        assertThat(
+            invalidatedPriorNotifications.none { pendingSendPriorNotificationReportIds.contains(it.reportId!!) },
+        ).isTrue()
+    }
 }
diff --git a/.../gouv/cnsp/monitorfish/domain/use_cases/prior_notification/GetPriorNotificationsUTests.kt b/.../gouv/cnsp/monitorfish/domain/use_cases/prior_notification/GetPriorNotificationsUTests.kt
@@ -50,6 +50,7 @@ class GetPriorNotificationsUTests {
             willArriveAfter = "2000-01-01T00:00:00Z",
             willArriveBefore = "2099-12-31T00:00:00Z",
         )
+    private val defaultIsInvalidated = null
     private val defaultSeafrontGroup = SeafrontGroup.ALL
     private val defaultStates = null
     private val defaultSortColumn = PriorNotificationsSortColumn.EXPECTED_ARRIVAL_DATE
@@ -144,6 +145,7 @@ class GetPriorNotificationsUTests {
                 vesselRepository,
             ).execute(
                 defaultFilter,
+                defaultIsInvalidated,
                 defaultSeafrontGroup,
                 defaultStates,
                 defaultSortColumn,

diff --git a/...tlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/PriorNotificationControllerUTests.kt b/...tlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/PriorNotificationControllerUTests.kt
@@ -85,7 +85,18 @@ class PriorNotificationControllerUTests {
         val secondFakePriorNotification = PriorNotificationFaker.fakePriorNotification(2)
 
         // Given
-        given(getPriorNotifications.execute(any(), any(), anyOrNull(), any(), any(), any(), any())).willReturn(
+        given(
+            getPriorNotifications.execute(
+                any(),
+                anyOrNull(),
+                any(),
+                anyOrNull(),
+                any(),
+                any(),
+                any(),
+                any(),
+            ),
+        ).willReturn(
             PaginatedList(
                 data = listOf(firstFakePriorNotification, secondFakePriorNotification),
                 extraData = PriorNotificationStats(perSeafrontGroupCount = emptyMap()),

diff --git a/...h/infrastructure/database/repositories/JpaPriorNotificationPdfDocumentRepositoryITests.kt b/...h/infrastructure/database/repositories/JpaPriorNotificationPdfDocumentRepositoryITests.kt
@@ -40,9 +40,10 @@ class JpaPriorNotificationPdfDocumentRepositoryITests : AbstractDBTests() {
         jpaPriorNotificationPdfDocumentRepository.deleteByReportId(reportId)
 
         // Then
-        val throwable = catchThrowable {
-            jpaPriorNotificationPdfDocumentRepository.findByReportId(reportId)
-        }
+        val throwable =
+            catchThrowable {
+                jpaPriorNotificationPdfDocumentRepository.findByReportId(reportId)
+            }
         assertThat(throwable).isNotNull()
         assertThat((throwable as BackendUsageException).code).isEqualTo(BackendUsageErrorCode.NOT_FOUND)
     }