Add acknowledgment

Author: louptheron

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/prior_notification/PriorNotification.kt

@@ -146,13 +146,6 @@ data class PriorNotification(
         )
     }
 
-    fun markAsDeleted() {
-        logbookMessageAndValue = LogbookMessageAndValue(
-            logbookMessageAndValue.logbookMessage.copy(isDeleted = true),
-            PNO::class.java,
-        )
-    }
-
     companion object {
         private val logger = LoggerFactory.getLogger(PriorNotification::class.java)
 
@@ -187,11 +180,11 @@ data class PriorNotification(
          * Used within the prior notification form to display the next state of the prior notification in real-time.
          */
         fun getNextState(
-            isInverificationScope: Boolean,
+            isInVerificationScope: Boolean,
             isPartOfControlUnitSubscriptions: Boolean,
         ): PriorNotificationState {
             return when {
-                isInverificationScope -> PriorNotificationState.PENDING_VERIFICATION
+                isInVerificationScope -> PriorNotificationState.PENDING_VERIFICATION
                 isPartOfControlUnitSubscriptions -> PriorNotificationState.AUTO_SEND_REQUESTED
                 else -> PriorNotificationState.OUT_OF_VERIFICATION_SCOPE
             }

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaLogbookReportRepository.kt

@@ -61,7 +61,11 @@ class JpaLogbookReportRepository(
                 }
             }.filter { it.operationType != LogbookOperationType.DEL }
             .map {
-                PriorNotification.fromLogbookMessage(it.toLogbookMessage(objectMapper))
+                val pno = PriorNotification.fromLogbookMessage(it.toLogbookMessage(objectMapper))
+                // All messages returned from the SQL query are acknowledged
+                pno.markAsAcknowledged()
+
+                return@map pno
             }
     }
 
@@ -343,7 +347,10 @@ class JpaLogbookReportRepository(
         isVerified: Boolean,
     ) {
         val logbookReport = dbLogbookReportRepository
-            .findAcknowledgedNonDeletedPnoDatAndCorsByReportId(reportId, operationDate.withZoneSameInstant(UTC).toString()).firstOrNull()
+            .findAcknowledgedNonDeletedPnoDatAndCorsByReportId(
+                reportId,
+                operationDate.withZoneSameInstant(UTC).toString(),
+            ).firstOrNull()
             ?: throw BackendUsageException(BackendUsageErrorCode.NOT_FOUND)
 
         val pnoValue = objectMapper.readValue(logbookReport.message, PNO::class.java)
@@ -367,7 +374,10 @@ class JpaLogbookReportRepository(
         note: String?,
     ) {
         val logbookReport = dbLogbookReportRepository
-            .findAcknowledgedNonDeletedPnoDatAndCorsByReportId(reportId, operationDate.withZoneSameInstant(UTC).toString()).firstOrNull()
+            .findAcknowledgedNonDeletedPnoDatAndCorsByReportId(
+                reportId,
+                operationDate.withZoneSameInstant(UTC).toString(),
+            ).firstOrNull()
             ?: throw BackendUsageException(BackendUsageErrorCode.NOT_FOUND)
 
         val pnoValue = objectMapper.readValue(logbookReport.message, PNO::class.java)
@@ -399,7 +409,10 @@ class JpaLogbookReportRepository(
     @CacheEvict(value = ["pno_to_verify"], allEntries = true)
     override fun invalidate(reportId: String, operationDate: ZonedDateTime) {
         val logbookReport = dbLogbookReportRepository
-            .findAcknowledgedNonDeletedPnoDatAndCorsByReportId(reportId, operationDate.withZoneSameInstant(UTC).toString()).firstOrNull()
+            .findAcknowledgedNonDeletedPnoDatAndCorsByReportId(
+                reportId,
+                operationDate.withZoneSameInstant(UTC).toString(),
+            ).firstOrNull()
             ?: throw BackendUsageException(BackendUsageErrorCode.NOT_FOUND)
 
         val pnoValue = objectMapper.readValue(logbookReport.message, PNO::class.java)