From cf82406e695fbdc36445bf52967debaa471da4df Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Thu, 17 Aug 2023 12:07:53 +0200 Subject: [PATCH] RED-7400: changed place of isLocalManualRedaction as it is not needed in RedactionLogEntry anymore --- .../redactionlog/RedactionLogMergeService.java | 12 +++++++++++- .../shared/model/redactionlog/RedactionLogEntry.java | 8 -------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java index 5f15ccd71..1840ed8f9 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java @@ -102,7 +102,7 @@ public class RedactionLogMergeService { if (excludedPages != null && !excludedPages.isEmpty()) { entry.getPositions().forEach(pos -> { - if (!entry.isLocalManualRedaction() && excludedPages.contains(pos.getPage())) { + if (!isLocalManualRedaction(entry) && excludedPages.contains(pos.getPage())) { entry.setExcluded(true); } }); @@ -132,6 +132,16 @@ public class RedactionLogMergeService { } + private boolean isLocalManualRedaction(RedactionLogEntry entry) { + + return entry.getManualChanges() != null && entry.getManualChanges() + .stream() + .anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY || mc.getManualRedactionType() == ManualRedactionType.RESIZE && mc.getAnnotationStatus() == AnnotationStatus.APPROVED && entry.getEngines() + .contains(Engine.RULE) && !entry.getEngines().contains(Engine.DICTIONARY)); + + } + + private List createManualRedactionWrappers(ManualRedactions manualRedactions) { List manualRedactionWrappers = new ArrayList<>(); diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/RedactionLogEntry.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/RedactionLogEntry.java index fe71c8605..ec6e01c1d 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/RedactionLogEntry.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/RedactionLogEntry.java @@ -84,14 +84,6 @@ public class RedactionLogEntry { } - public boolean isLocalManualRedaction() { - - return manualChanges != null && manualChanges.stream() - .anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY && mc.getAnnotationStatus() == AnnotationStatus.APPROVED - || mc.getManualRedactionType() == ManualRedactionType.RESIZE && mc.getAnnotationStatus() == AnnotationStatus.APPROVED && engines.contains(Engine.RULE) && !engines.contains(Engine.DICTIONARY)); - } - - public boolean isManuallyRemoved() { return manualChanges != null && manualChanges.stream() -- 2.47.2