diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepository.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepository.kt index 0566a0d38e..031d688085 100644 --- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepository.kt @@ -97,7 +97,11 @@ class JpaLogbookReportRepository( } }.filter { it.logbookMessageAndValue.value.isInVerificationScope == true && - it.logbookMessageAndValue.value.isVerified == false + it.logbookMessageAndValue.value.isVerified == false && + ( + it.logbookMessageAndValue.value.isInvalidated == null || + it.logbookMessageAndValue.value.isInvalidated == false + ) } } diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaManualPriorNotificationRepository.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaManualPriorNotificationRepository.kt index afba18dc85..c12d5e4040 100644 --- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaManualPriorNotificationRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaManualPriorNotificationRepository.kt @@ -58,7 +58,9 @@ class JpaManualPriorNotificationRepository( willArriveAfter = CustomZonedDateTime(ZonedDateTime.now()).toString(), willArriveBefore = CustomZonedDateTime(ZonedDateTime.now().plusHours(24)).toString(), ).filter { - it.value.isInVerificationScope == true && it.value.isVerified == false + it.value.isInVerificationScope == true && + it.value.isVerified == false && + (it.value.isInvalidated == null || it.value.isInvalidated == false) } .map { it.toPriorNotification() diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepositoryITests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepositoryITests.kt index 1aadaae585..32bb1cc3bb 100644 --- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepositoryITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepositoryITests.kt @@ -996,6 +996,7 @@ class JpaLogbookReportRepositoryITests : AbstractDBTests() { assertThat(result).hasSizeGreaterThan(0) assertThat(result.all { it.logbookMessageAndValue.value.isVerified == false }).isTrue() assertThat(result.all { it.logbookMessageAndValue.value.isInVerificationScope == true }).isTrue() + assertThat(result.all { it.logbookMessageAndValue.value.isInvalidated == null }).isTrue() } @Test diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaManualPriorNotificationRepositoryITests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaManualPriorNotificationRepositoryITests.kt index c71b00a581..88a7b2f115 100644 --- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaManualPriorNotificationRepositoryITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaManualPriorNotificationRepositoryITests.kt @@ -577,6 +577,7 @@ class JpaManualPriorNotificationRepositoryITests : AbstractDBTests() { assertThat(result).hasSizeGreaterThan(0) assertThat(result.filter { it.logbookMessageAndValue.value.isVerified == false }).hasSize(1) assertThat(result.filter { it.logbookMessageAndValue.value.isInVerificationScope == true }).hasSize(1) + assertThat(result.filter { it.logbookMessageAndValue.value.isInvalidated == null }).hasSize(1) } @Test