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

hotfix: Hints should never be applied

Browse Source
This commit is contained in:
Kilian Schuettler 2024-01-09 13:52:02 +01:00
parent 4fea65f982
commit 5168f1d8a7
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,14 +49,19 @@ public class ManualChangeOverwrite {
Boolean recategorized; Boolean recategorized;
EntityType entityType; EntityType entityType;
public ManualChangeOverwrite() { public ManualChangeOverwrite() {
this(EntityType.ENTITY); this(EntityType.ENTITY);
} }
public ManualChangeOverwrite (EntityType entityType) {
public ManualChangeOverwrite(EntityType entityType) {
this.entityType = entityType; this.entityType = entityType;
} }
public void calculateCurrentOverride() { public void calculateCurrentOverride() {
if (!changed) { if (!changed) {
@ -95,19 +100,13 @@ public class ManualChangeOverwrite {
} }
} }
if(manualChange instanceof ManualRedactionEntry manualRedactionEntry){ if (manualChange instanceof ManualRedactionEntry manualRedactionEntry) {
removed = false; setToApplied();
ignored = false;
applied = true;
legalBasis = manualRedactionEntry.getLegalBasis(); legalBasis = manualRedactionEntry.getLegalBasis();
} }
if (manualChange instanceof ManualForceRedaction manualForceRedaction) { if (manualChange instanceof ManualForceRedaction manualForceRedaction) {
removed = false; setToApplied();
ignored = false;
if (!isHint(entityType)) {
applied = true;
}
legalBasis = manualForceRedaction.getLegalBasis(); legalBasis = manualForceRedaction.getLegalBasis();
} }
@ -138,6 +137,16 @@ public class ManualChangeOverwrite {
} }
private void setToApplied() {
removed = false;
ignored = false;
if (!isHint(entityType)) {
applied = true;
}
}
public void addChange(BaseAnnotation manualChange) { public void addChange(BaseAnnotation manualChange) {
changed = true; changed = true;
@ -228,6 +237,7 @@ public class ManualChangeOverwrite {
return positions == null ? Optional.empty() : Optional.of(positions); return positions == null ? Optional.empty() : Optional.of(positions);
} }
private boolean isHint(EntityType entityType) { private boolean isHint(EntityType entityType) {
return entityType.equals(EntityType.HINT); return entityType.equals(EntityType.HINT);