diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ForceRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ForceRedactionPersistenceService.java index 2f7d71092..1687606fd 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ForceRedactionPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ForceRedactionPersistenceService.java @@ -77,10 +77,10 @@ public class ForceRedactionPersistenceService { return new HashSet<>(forceRedactionRepository.findByFileIdIncludeDeletions(fileId, includeDeletions)); } + @Transactional + public void markAsProcessed(String annotationId, String fileId) { - public void markAsProcessed(ManualForceRedaction e) { - - forceRedactionRepository.markAsProcessed(new AnnotationEntityId(e.getAnnotationId(), e.getFileId()), OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); + forceRedactionRepository.markAsProcessed(new AnnotationEntityId(annotationId, fileId), OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); } } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ImageRecategorizationPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ImageRecategorizationPersistenceService.java index c50c45d3f..62863f025 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ImageRecategorizationPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ImageRecategorizationPersistenceService.java @@ -78,10 +78,10 @@ public class ImageRecategorizationPersistenceService { } + @Transactional + public void markAsProcessed(String annotationId, String fileId) { - public void markAsProcessed(ManualImageRecategorization e) { - - imageRecategorizationRepository.markAsProcessed(new AnnotationEntityId(e.getAnnotationId(), e.getFileId()), OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); + imageRecategorizationRepository.markAsProcessed(new AnnotationEntityId(annotationId, fileId), OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); } } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java index cd9eb9202..cb567c58f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java @@ -618,7 +618,11 @@ public class ManualRedactionService { for (var annotationId : annotationIds) { var forceRedaction = forceRedactionPersistenceService.findForceRedaction(fileId, annotationId); forceRedactionPersistenceService.updateStatus(fileId, annotationId, annotationStatus); - actionPerformed = actionPerformed || !(forceRedaction.getStatus() == AnnotationStatus.REQUESTED && annotationStatus == AnnotationStatus.DECLINED); + boolean isDeclined = forceRedaction.getStatus() == AnnotationStatus.REQUESTED && annotationStatus == AnnotationStatus.DECLINED; + actionPerformed = actionPerformed || !isDeclined; + if (isDeclined) { + forceRedactionPersistenceService.markAsProcessed(annotationId, fileId); + } } if (actionPerformed) { @@ -654,7 +658,11 @@ public class ManualRedactionService { for (var annotationId : annotationIds) { var imageRecategorization = recategorizationPersistenceService.findRecategorization(fileId, annotationId); recategorizationPersistenceService.updateStatus(fileId, annotationId, annotationStatus); - actionPerformed = actionPerformed || !(imageRecategorization.getStatus() == AnnotationStatus.REQUESTED && annotationStatus == AnnotationStatus.DECLINED); + boolean isDeclined = imageRecategorization.getStatus() == AnnotationStatus.REQUESTED && annotationStatus == AnnotationStatus.DECLINED; + actionPerformed = actionPerformed || !isDeclined; + if (isDeclined) { + recategorizationPersistenceService.markAsProcessed(annotationId, fileId); + } } if (actionPerformed) { @@ -752,14 +760,14 @@ public class ManualRedactionService { if (manualRedactions.getForceRedactions() != null) { manualRedactions.getForceRedactions().forEach(e -> { if (!e.getStatus().equals(AnnotationStatus.REQUESTED) && e.getProcessedDate() == null) { - forceRedactionPersistenceService.markAsProcessed(e); + forceRedactionPersistenceService.markAsProcessed(e.getAnnotationId(), e.getFileId()); } }); } if (manualRedactions.getImageRecategorization() != null) { manualRedactions.getImageRecategorization().forEach(e -> { if (!e.getStatus().equals(AnnotationStatus.REQUESTED) && e.getProcessedDate() == null) { - recategorizationPersistenceService.markAsProcessed(e); + recategorizationPersistenceService.markAsProcessed(e.getAnnotationId(), e.getFileId()); } }); }