From f6b0d734f311cc94b1fcb680d8908a7a9e3d6aa6 Mon Sep 17 00:00:00 2001 From: devplant Date: Fri, 25 Feb 2022 15:15:31 +0200 Subject: [PATCH] RED-3382 - Manual redaction controller needs to support bulk requests - update according to rules --- .../service/ManualRedactionService.java | 40 +------------------ 1 file changed, 1 insertion(+), 39 deletions(-) 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 92e7438d5..10c7a3d6b 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 @@ -512,8 +512,7 @@ public class ManualRedactionService { ManualImageRecategorizationEntity imageRecategorization = recategorizationPersistenceService.findRecategorization(fileId, annotationId); actionPerformed = actionPerformed || - (AnnotationStatus.DECLINED.equals(annotationStatus) - && AnnotationStatus.APPROVED.equals(imageRecategorization.getStatus())); + AnnotationStatus.DECLINED.equals(annotationStatus) && AnnotationStatus.APPROVED.equals(imageRecategorization.getStatus()); actionPerformed = actionPerformed || AnnotationStatus.APPROVED.equals(annotationStatus); recategorizationPersistenceService.updateStatus(fileId, annotationId, annotationStatus); @@ -712,43 +711,6 @@ public class ManualRedactionService { } - private boolean calculateHasSuggestions(String fileId) { - - ManualRedactions manualRedactions = getManualRedactions(fileId); - - for (var manualRedaction : manualRedactions.getEntriesToAdd()) { - if (manualRedaction.getStatus().equals(AnnotationStatus.REQUESTED)) { - return true; - } - } - - for (var manualRedaction : manualRedactions.getIdsToRemove()) { - if (manualRedaction.getStatus().equals(AnnotationStatus.REQUESTED)) { - return true; - } - } - - for (var manualRedaction : manualRedactions.getForceRedactions()) { - if (manualRedaction.getStatus().equals(AnnotationStatus.REQUESTED)) { - return true; - } - } - - for (var manualRedaction : manualRedactions.getImageRecategorization()) { - if (manualRedaction.getStatus().equals(AnnotationStatus.REQUESTED)) { - return true; - } - } - - for (var manualRedaction : manualRedactions.getLegalBasisChanges()) { - if (manualRedaction.getStatus().equals(AnnotationStatus.REQUESTED)) { - return true; - } - } - return false; - } - - private boolean handleAddToDictionary(String fileId, String annotationId, String typeId, String value, AnnotationStatus status, boolean addToDictionary, boolean addToDossierDictionary, boolean revert, String dossierId) {