From 1b2bd7fa209cba7e635bbaad7962396d931576ff Mon Sep 17 00:00:00 2001 From: deiflaender Date: Thu, 29 Oct 2020 15:16:30 +0100 Subject: [PATCH] RED-510: Do not add annotations for manual redactions that are approved and should be already in a dictionary --- .../visualization/service/AnnotationHighlightService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 e0b4acc8..f5456747 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 @@ -223,7 +223,7 @@ public class AnnotationHighlightService { } } - if (!rectanglesOnPage.isEmpty()) { + if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) { annotations.addAll(createAnnotation(rectanglesOnPage, prefixId(manualRedactionEntry, id), createAnnotationContent(manualRedactionEntry), getColorForManualAdd(manualRedactionEntry .getType(), manualRedactionEntry.getStatus()), manualRedactions.getComments().get(id), true)); classifiedDoc.getRedactionLogEntities().add(redactionLogEntry); @@ -232,6 +232,12 @@ public class AnnotationHighlightService { } + private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) { + + return manualRedactionEntry.getStatus().equals(Status.APPROVED) && manualRedactionEntry.isAddToDictionary(); + } + + private String prefixId(ManualRedactionEntry manualRedactionEntry, String id) { if (manualRedactionEntry.getStatus().equals(Status.APPROVED)) {