From 8c4e06cf24ce611cd09821d5aa66d296039f780d Mon Sep 17 00:00:00 2001
From: Loup Theron <loup-rodney@hotmail.fr>
Date: Tue, 13 Aug 2024 18:09:58 +0200
Subject: [PATCH] Simplify logic

---
 .../database/repositories/JpaLogbookReportRepository.kt      | 5 +----
 .../repositories/JpaManualPriorNotificationRepository.kt     | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

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 031d688085..9bccc52c89 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
@@ -98,10 +98,7 @@ class JpaLogbookReportRepository(
             }.filter {
                 it.logbookMessageAndValue.value.isInVerificationScope == true &&
                     it.logbookMessageAndValue.value.isVerified == false &&
-                    (
-                        it.logbookMessageAndValue.value.isInvalidated == null ||
-                            it.logbookMessageAndValue.value.isInvalidated == false
-                        )
+                    it.logbookMessageAndValue.value.isInvalidated != true
             }
     }
 
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 e7270958ed..3a95e3517b 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
@@ -60,7 +60,7 @@ class JpaManualPriorNotificationRepository(
             ).filter {
                 it.value.isInVerificationScope == true &&
                     it.value.isVerified == false &&
-                    (it.value.isInvalidated == null || it.value.isInvalidated == false)
+                    it.value.isInvalidated != true
             }
             .map {
                 it.toPriorNotification()