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