Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Merge branch 'RED-5870-rollback' into 'master'

Browse Source 
Revert "RED-5870: Enable force redaction of hints"

Closes RED-5870

See merge request redactmanager/redaction-service!410
This commit is contained in:
Maverick Studer 2024-05-24 13:30:22 +02:00
commit 1728738ae3
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java
View File

@ -110,7 +110,7 @@ public class ManualChangeOverwrite {
}
if (manualChange instanceof ManualRedactionEntry manualRedactionEntry) {
setToAppliedIfNotHint();
setToApplied();
legalBasis = manualRedactionEntry.getLegalBasis();
}
@ -158,7 +158,7 @@ public class ManualChangeOverwrite {
}
private void setToAppliedIfNotHint() {
private void setToApplied() {
removed = false;
ignored = false;
@ -167,13 +167,6 @@ public class ManualChangeOverwrite {
}
}
private void setToApplied() {
removed = false;
ignored = false;
applied = true;
}
public void addChange(BaseAnnotation manualChange) {

2
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java
View File

@ -184,7 +184,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest {
.legalBasis("coolio")
.build();
entity.getManualOverwrite().addChange(forceRedaction);
assertTrue(entity.applied());
assertFalse(entity.applied());
assertFalse(entity.ignored());
assertFalse(entity.removed());
assertEquals(reason + ", removed by manual override, forced by manual override", entity.buildReasonWithManualChangeDescriptions());