From bf5989e101ede846be54cb9d5e70ea967ca8ed2e Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Wed, 21 Dec 2022 10:20:37 +0100 Subject: [PATCH] RED-5809: updated processedTime when declining a requested image recategoration redaction --- .../ImageRecategorizationPersistenceService.java | 6 +++--- .../v1/server/service/ManualRedactionService.java | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) 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 9a6281085..15ad326a6 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 @@ -659,7 +659,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) { @@ -764,7 +768,7 @@ public class ManualRedactionService { 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()); } }); }