diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionType.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionType.java new file mode 100644 index 00000000..dfc44616 --- /dev/null +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionType.java @@ -0,0 +1,5 @@ +package com.iqser.red.service.redaction.v1.model; + +public enum ManualRedactionType { + ADD, REMOVE +} 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 689aba23..a24cc4d1 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 @@ -29,5 +29,6 @@ public class RedactionLogEntry { private int sectionNumber; private boolean manual; private Status status; + private ManualRedactionType manualRedactionType; } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java index d652ffc6..ebd355d4 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java @@ -26,6 +26,7 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.redaction.v1.model.Comment; import com.iqser.red.service.redaction.v1.model.IdRemoval; import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry; +import com.iqser.red.service.redaction.v1.model.ManualRedactionType; import com.iqser.red.service.redaction.v1.model.ManualRedactions; import com.iqser.red.service.redaction.v1.model.Rectangle; import com.iqser.red.service.redaction.v1.model.RedactionLogEntry; @@ -118,11 +119,13 @@ public class AnnotationHighlightService { } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) { requestedToRemove = true; manualOverrideReason = entity.getRedactionReason() + ", requested to remove"; + redactionLogEntry.setStatus(Status.REQUESTED); } entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason()); redactionLogEntry.setReason(manualOverrideReason); redactionLogEntry.setManual(true); + redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE); } } @@ -228,6 +231,7 @@ public class AnnotationHighlightService { .sectionNumber(manualRedactionEntry.getSectionNumber()) .manual(true) .status(manualRedactionEntry.getStatus()) + .manualRedactionType(ManualRedactionType.ADD) .build(); }