From 50d9f4fec22768310232988ee01f9e9aa3ba9dc8 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 21 Mar 2022 11:19:26 +0200 Subject: [PATCH] pending add to dict --- .../redaction/service/RedactionLogMergeService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 effd9a6c..3bfd312e 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 @@ -277,7 +277,7 @@ public class RedactionLogMergeService { for (ManualRedactionEntry manualRedactionEntry : manualAdds) { - if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) { + if (shouldCreateManualEntry(manualRedactionEntry)) { RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId); redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions())); redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId())); @@ -303,10 +303,10 @@ public class RedactionLogMergeService { } - private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) { - - return manualRedactionEntry.getStatus().equals(AnnotationStatus.APPROVED) && - (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary()); + @SuppressWarnings("PMD.UselessParentheses") + private boolean shouldCreateManualEntry(ManualRedactionEntry manualRedactionEntry) { + return (!manualRedactionEntry.isAddToDictionary() && !manualRedactionEntry.isAddToDossierDictionary()) + || ((manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDictionary()) && manualRedactionEntry.getProcessedDate() == null); }