Préavis – Ajout du CFR dans la recherche de navires (#3497)

## Linked issues - Resolve #3456 ---- - [ ] Tests E2E (Cypress)
MTES-MCT · Aug 7, 2024 · b34ae94 · b34ae94
2 parents bd371d8 + 3521d37
commit b34ae94
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 4 deletions.
diff --git a/.../monitorfish/infrastructure/database/repositories/interfaces/DBLogbookReportRepository.kt b/.../monitorfish/infrastructure/database/repositories/interfaces/DBLogbookReportRepository.kt
@@ -54,7 +54,11 @@ interface DBLogbookReportRepository :
                     AND (:portLocodes IS NULL OR lr.value->>'port' IN (:portLocodes))
 
                     -- Search Query
-                    AND (:searchQuery IS NULL OR unaccent(lower(lr.vessel_name)) ILIKE CONCAT('%', unaccent(lower(:searchQuery)), '%'))
+                    AND (
+                        :searchQuery IS NULL OR
+                        unaccent(lower(lr.vessel_name)) ILIKE CONCAT('%', unaccent(lower(:searchQuery)), '%') OR
+                        lower(lr.cfr) ILIKE CONCAT('%', lower(:searchQuery), '%')
+                    )
 
                     -- Will Arrive After
                     AND lr.value->>'predictedArrivalDatetimeUtc' >= :willArriveAfter

diff --git a/...sh/infrastructure/database/repositories/interfaces/DBManualPriorNotificationRepository.kt b/...sh/infrastructure/database/repositories/interfaces/DBManualPriorNotificationRepository.kt
@@ -45,7 +45,11 @@ interface DBManualPriorNotificationRepository : JpaRepository<ManualPriorNotific
                     AND (:portLocodes IS NULL OR mpn.value->>'port' IN (:portLocodes))
 
                     -- Search Query
-                    AND (:searchQuery IS NULL OR unaccent(lower(mpn.vessel_name)) ILIKE CONCAT('%', unaccent(lower(:searchQuery)), '%'))
+                    AND (
+                        :searchQuery IS NULL OR
+                        unaccent(lower(mpn.vessel_name)) ILIKE CONCAT('%', unaccent(lower(:searchQuery)), '%') OR
+                        lower(mpn.cfr) ILIKE CONCAT('%', lower(:searchQuery), '%')
+                    )
 
                     -- Will Arrive After
                     AND mpn.value->>'predictedArrivalDatetimeUtc' >= :willArriveAfter

diff --git a/...cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepositoryITests.kt b/...cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepositoryITests.kt
@@ -728,7 +728,7 @@ class JpaLogbookReportRepositoryITests : AbstractDBTests() {
 
     @Test
     @Transactional
-    fun `findAllPriorNotifications Should return PNO logbook reports for PHENOMENE vessel`() {
+    fun `findAllPriorNotifications Should return PNO logbook reports When using a vessel name`() {
         // Given
         val firstFilter = PriorNotificationsFilter(
             searchQuery = "pheno",
@@ -770,6 +770,50 @@ class JpaLogbookReportRepositoryITests : AbstractDBTests() {
         assertThat(secondResultVessels.all { it.vesselName == "PHENOMENE" }).isTrue()
     }
 
+    @Test
+    @Transactional
+    fun `findAllPriorNotifications Should return PNO logbook reports When using a CFR`() {
+        // Given
+        val firstFilter = PriorNotificationsFilter(
+            searchQuery = "FAK000999999",
+            willArriveAfter = "2000-01-01T00:00:00Z",
+            willArriveBefore = "2100-01-01T00:00:00Z",
+        )
+
+        // When
+        val firstResult = jpaLogbookReportRepository.findAllPriorNotifications(firstFilter)
+
+        // Then
+        assertThat(firstResult).hasSizeGreaterThan(0)
+        val firstResultVessels = firstResult.mapNotNull {
+            jpaVesselRepository.findFirstByInternalReferenceNumber(
+                it.logbookMessageAndValue.logbookMessage.internalReferenceNumber!!,
+            )
+        }
+        assertThat(firstResultVessels).hasSize(firstResult.size)
+        assertThat(firstResultVessels.all { it.vesselName == "PHENOMENE" }).isTrue()
+
+        // Given
+        val secondFilter = PriorNotificationsFilter(
+            searchQuery = "999999",
+            willArriveAfter = "2000-01-01T00:00:00Z",
+            willArriveBefore = "2100-01-01T00:00:00Z",
+        )
+
+        // When
+        val secondResult = jpaLogbookReportRepository.findAllPriorNotifications(secondFilter)
+
+        // Then
+        assertThat(secondResult).hasSizeGreaterThan(0)
+        val secondResultVessels = secondResult.mapNotNull {
+            jpaVesselRepository.findFirstByInternalReferenceNumber(
+                it.logbookMessageAndValue.logbookMessage.internalReferenceNumber!!,
+            )
+        }
+        assertThat(secondResultVessels).hasSize(secondResult.size)
+        assertThat(secondResultVessels.all { it.vesselName == "PHENOMENE" }).isTrue()
+    }
+
     @Test
     @Transactional
     fun `findAllPriorNotifications Should return PNO logbook reports for COD & HKE species`() {

diff --git a/...orfish/infrastructure/database/repositories/JpaManualPriorNotificationRepositoryITests.kt b/...orfish/infrastructure/database/repositories/JpaManualPriorNotificationRepositoryITests.kt
@@ -202,7 +202,7 @@ class JpaManualPriorNotificationRepositoryITests : AbstractDBTests() {
 
     @Test
     @Transactional
-    fun `findAll Should return manual prior notifications for NAVIRE RENOMMÉ vessel`() {
+    fun `findAll Should return manual prior notifications When searching a vessel name`() {
         // Given
         val firstFilter = defaultPriorNotificationsFilter.copy(searchQuery = "renom")
 
@@ -242,6 +242,48 @@ class JpaManualPriorNotificationRepositoryITests : AbstractDBTests() {
         assertThat(secondResultVessels.all { it.vesselName == "NAVIRE RENOMMÉ (NOUVEAU NOM)" }).isTrue()
     }
 
+    @Test
+    @Transactional
+    fun `findAll Should return manual prior notifications When searching a vessel cfr`() {
+        // Given
+        val firstFilter = defaultPriorNotificationsFilter.copy(searchQuery = "CFR116")
+
+        // When
+        val firstResult = jpaManualPriorNotificationRepository.findAll(firstFilter)
+
+        // Then
+        assertThat(firstResult).hasSizeBetween(1, allManualPriorNotificationsLength - 1)
+        assertThat(
+            firstResult.all { it.logbookMessageAndValue.logbookMessage.vesselName == "NAVIRE RENOMMÉ (ANCIEN NOM)" },
+        ).isTrue()
+        val firstResultVessels = firstResult.mapNotNull {
+            jpaVesselRepository.findFirstByInternalReferenceNumber(
+                it.logbookMessageAndValue.logbookMessage.internalReferenceNumber!!,
+            )
+        }
+        assertThat(firstResultVessels).hasSize(firstResult.size)
+        assertThat(firstResultVessels.all { it.vesselName == "NAVIRE RENOMMÉ (NOUVEAU NOM)" }).isTrue()
+
+        // Given
+        val secondFilter = defaultPriorNotificationsFilter.copy(searchQuery = "116")
+
+        // When
+        val secondResult = jpaManualPriorNotificationRepository.findAll(secondFilter)
+
+        // Then
+        assertThat(secondResult).hasSizeBetween(1, allManualPriorNotificationsLength - 1)
+        assertThat(
+            secondResult.all { it.logbookMessageAndValue.logbookMessage.vesselName == "NAVIRE RENOMMÉ (ANCIEN NOM)" },
+        ).isTrue()
+        val secondResultVessels = secondResult.mapNotNull {
+            jpaVesselRepository.findFirstByInternalReferenceNumber(
+                it.logbookMessageAndValue.logbookMessage.internalReferenceNumber!!,
+            )
+        }
+        assertThat(secondResultVessels).hasSize(secondResult.size)
+        assertThat(secondResultVessels.all { it.vesselName == "NAVIRE RENOMMÉ (NOUVEAU NOM)" }).isTrue()
+    }
+
     @Test
     @Transactional
     fun `findAll Should return manual prior notifications for BIB & BFT species`() {