From 42d97bccc946c6c9957ec9451d7ba19e90550fc7 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Wed, 21 Dec 2022 09:45:37 +0100 Subject: [PATCH 1/4] RED-5809: updated processedTime when declining a requested force redaction --- .../v1/server/service/ManualRedactionService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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..161e62889 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 @@ -48,6 +48,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.LegalBasisChangePersistenceService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.RemoveRedactionPersistenceService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ResizeRedactionPersistenceService; +import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ForceRedactionRepository; import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest; import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus; import com.iqser.red.service.persistence.service.v1.api.model.annotations.CommentRequest; @@ -96,6 +97,7 @@ public class ManualRedactionService { private final RabbitTemplate rabbitTemplate; private final ObjectMapper objectMapper; private final RedactionLogService redactionLogService; + private final ForceRedactionRepository forceRedactionRepository; private final HashFunction hashFunction = Hashing.murmur3_128(); @@ -618,7 +620,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) { + forceRedactionRepository.markAsProcessed(new AnnotationEntityId(annotationId, fileId), OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); + } } if (actionPerformed) { From 78bdb954e0da34e660fc7ae707b8ce0e83913000 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Wed, 21 Dec 2022 09:55:40 +0100 Subject: [PATCH 2/4] RED-5809: updated processedTime when declining a requested force redaction --- .../annotations/ForceRedactionPersistenceService.java | 6 +++--- .../v1/server/service/ManualRedactionService.java | 5 ++--- 2 files changed, 5 insertions(+), 6 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/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-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 161e62889..9a6281085 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 @@ -97,7 +97,6 @@ public class ManualRedactionService { private final RabbitTemplate rabbitTemplate; private final ObjectMapper objectMapper; private final RedactionLogService redactionLogService; - private final ForceRedactionRepository forceRedactionRepository; private final HashFunction hashFunction = Hashing.murmur3_128(); @@ -623,7 +622,7 @@ public class ManualRedactionService { boolean isDeclined = forceRedaction.getStatus() == AnnotationStatus.REQUESTED && annotationStatus == AnnotationStatus.DECLINED; actionPerformed = actionPerformed || !isDeclined; if (isDeclined) { - forceRedactionRepository.markAsProcessed(new AnnotationEntityId(annotationId, fileId), OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); + forceRedactionPersistenceService.markAsProcessed(annotationId, fileId); } } @@ -758,7 +757,7 @@ 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()); } }); } From bf5989e101ede846be54cb9d5e70ea967ca8ed2e Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Wed, 21 Dec 2022 10:20:37 +0100 Subject: [PATCH 3/4] 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()); } }); } From a074180241ac4a8dd359e0a9e8988092475f3dea Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Wed, 21 Dec 2022 10:23:42 +0100 Subject: [PATCH 4/4] RED-5809: removed unnecessary import --- .../peristence/v1/server/service/ManualRedactionService.java | 1 - 1 file changed, 1 deletion(-) 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 15ad326a6..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 @@ -48,7 +48,6 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.LegalBasisChangePersistenceService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.RemoveRedactionPersistenceService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ResizeRedactionPersistenceService; -import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ForceRedactionRepository; import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest; import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus; import com.iqser.red.service.persistence.service.v1.api.model.annotations.CommentRequest;