diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java index 68e169ad..8af3f6e4 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java @@ -31,6 +31,11 @@ public class RedactionLogEntry { private String section; private float[] color; + private boolean hasBeenRecategorized; + private boolean hasLegalBasisChanged; + private boolean hasBeenForced; + private boolean hasBeenRemovedByManualOverride; + @Builder.Default private List positions = new ArrayList<>(); private int sectionNumber; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java index 3b2d921e..53e073f7 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java @@ -107,6 +107,7 @@ public class RedactionLogMergeService { if (imageRecategorization.getStatus().equals(Status.APPROVED)) { redactionLogEntry.setStatus(Status.APPROVED); redactionLogEntry.setType(imageRecategorization.getType()); + redactionLogEntry.setHasBeenRecategorized(true); // RED-2622 redactionLogEntry.setSection("Image:" + redactionLogEntry.getType()); manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override"); @@ -135,6 +136,7 @@ public class RedactionLogMergeService { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override"); redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry .isRedacted(), true)); + redactionLogEntry.setHasBeenRemovedByManualOverride(true); } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove"); redactionLogEntry.setStatus(Status.REQUESTED); @@ -162,6 +164,7 @@ public class RedactionLogMergeService { .isRedacted(), false)); manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override"); redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis()); + redactionLogEntry.setHasBeenForced(true); } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact"); redactionLogEntry.setStatus(Status.REQUESTED); @@ -193,6 +196,7 @@ public class RedactionLogMergeService { if (redactionLogEntry.isRectangle() && manualLegalBasisChange.getValue() != null) { redactionLogEntry.setValue(manualLegalBasisChange.getValue()); } + redactionLogEntry.setHasLegalBasisChanged(true); } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested"); redactionLogEntry.setStatus(Status.REQUESTED);