From 2db7128b3a04ce258030498e499d0cf2e2fa2c92 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Wed, 16 Aug 2023 10:37:41 +0200 Subject: [PATCH 1/2] RED-7400: added @Builder.Default for engines and reference --- .../v1/api/shared/model/redactionlog/RedactionLogEntry.java | 2 ++ 1 file changed, 2 insertions(+) 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..e54459cff 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 @@ -70,8 +70,10 @@ public class RedactionLogEntry { @Builder.Default private List manualChanges = new ArrayList<>(); + @Builder.Default private Set engines = new HashSet<>(); + @Builder.Default private Set reference = new HashSet<>(); @Builder.Default -- 2.47.2 From 3384e9106711780a425bdc3ebc35692ce7dbb433 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Wed, 16 Aug 2023 12:12:35 +0200 Subject: [PATCH 2/2] RED-7400: added @Builder.Default for engines and reference --- .../redactionlog/RedactionLogMergeService.java | 18 ++++++++++++------ .../model/redactionlog/RedactionLogEntry.java | 8 -------- 2 files changed, 12 insertions(+), 14 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..327673023 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 @@ -78,11 +78,7 @@ public class RedactionLogMergeService { } - private RedactionLog mergeRedactionLogData(RedactionLog redactionLog, - ManualRedactions manualRedactions, - Set excludedPages, - List types, - Colors colors) { + private RedactionLog mergeRedactionLogData(RedactionLog redactionLog, ManualRedactions manualRedactions, Set excludedPages, List types, Colors colors) { var skippedImportedRedactions = new HashSet<>(); log.info("Merging Redaction log with manual redactions"); @@ -102,7 +98,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 +128,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 e54459cff..d620dea80 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 @@ -86,14 +86,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