From 6cc50ef949a73a30b58889ec15da251d82553206 Mon Sep 17 00:00:00 2001 From: Maverick Studer Date: Thu, 23 May 2024 10:47:30 +0200 Subject: [PATCH] RED-5870: Enable force redaction of hints --- .../model/document/entity/ManualChangeOverwrite.java | 11 +++++++++-- .../server/manualchanges/ManualChangesUnitTest.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java index d68ab337..47b345d4 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java @@ -110,7 +110,7 @@ public class ManualChangeOverwrite { } if (manualChange instanceof ManualRedactionEntry manualRedactionEntry) { - setToApplied(); + setToAppliedIfNotHint(); legalBasis = manualRedactionEntry.getLegalBasis(); } @@ -158,7 +158,7 @@ public class ManualChangeOverwrite { } - private void setToApplied() { + private void setToAppliedIfNotHint() { removed = false; ignored = false; @@ -167,6 +167,13 @@ public class ManualChangeOverwrite { } } + private void setToApplied() { + + removed = false; + ignored = false; + applied = true; + } + public void addChange(BaseAnnotation manualChange) { diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java index 4e12dd27..5957ff08 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java @@ -184,7 +184,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest { .legalBasis("coolio") .build(); entity.getManualOverwrite().addChange(forceRedaction); - assertFalse(entity.applied()); + assertTrue(entity.applied()); assertFalse(entity.ignored()); assertFalse(entity.removed()); assertEquals(reason + ", removed by manual override, forced by manual override", entity.buildReasonWithManualChangeDescriptions());