From 2eecf7c4288f4538bafc6252bd6bd97f24e8b03b Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Mon, 14 Aug 2023 15:15:21 +0200 Subject: [PATCH 1/2] RED-7400: fixed error of breaking redaction log with removing engine-check for resize redactions --- .../v1/api/shared/model/redactionlog/RedactionLogEntry.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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..2af6fb4ec 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 @@ -88,7 +88,11 @@ public class RedactionLogEntry { 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)); + || isResizeRedaction(mc)); + } + + private boolean isResizeRedaction(ManualChange mc) { + return mc.getManualRedactionType() == ManualRedactionType.RESIZE && mc.getAnnotationStatus() == AnnotationStatus.APPROVED; } -- 2.47.2 From 067fb8a8140c4c08984fc7f0c6564d9bee525b48 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Tue, 15 Aug 2023 12:33:37 +0200 Subject: [PATCH 2/2] RED-7400: changed logic for flag isLocalManualRedaction --- .../service/redactionlog/RedactionLogMergeService.java | 7 +++++++ .../api/shared/model/redactionlog/RedactionLogEntry.java | 7 +------ 2 files changed, 8 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/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..27806293e 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 @@ -103,6 +103,7 @@ public class RedactionLogMergeService { if (excludedPages != null && !excludedPages.isEmpty()) { entry.getPositions().forEach(pos -> { if (!entry.isLocalManualRedaction() && excludedPages.contains(pos.getPage())) { +// if (!isLocalManualRedaction(entry.getManualChanges()) && excludedPages.contains(pos.getPage())) { entry.setExcluded(true); } }); @@ -131,6 +132,12 @@ public class RedactionLogMergeService { return redactionLog; } +// private boolean isLocalManualRedaction(List manualChanges) { +// +// return manualChanges != null && manualChanges.stream() +// .anyMatch(mc -> (mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY || mc.getManualRedactionType() == ManualRedactionType.RESIZE) && mc.getAnnotationStatus() == AnnotationStatus.APPROVED); +// } + private List createManualRedactionWrappers(ManualRedactions manualRedactions) { 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 2af6fb4ec..02b327078 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 @@ -87,12 +87,7 @@ public class RedactionLogEntry { public boolean isLocalManualRedaction() { return manualChanges != null && manualChanges.stream() - .anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY && mc.getAnnotationStatus() == AnnotationStatus.APPROVED - || isResizeRedaction(mc)); - } - - private boolean isResizeRedaction(ManualChange mc) { - return mc.getManualRedactionType() == ManualRedactionType.RESIZE && mc.getAnnotationStatus() == AnnotationStatus.APPROVED; + .anyMatch(mc -> (mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY || mc.getManualRedactionType() == ManualRedactionType.RESIZE) && mc.getAnnotationStatus() == AnnotationStatus.APPROVED); } -- 2.47.2