From af46bdca90aab6aab9e3ac5c5a9808f8eea8c760 Mon Sep 17 00:00:00 2001 From: Timo Date: Tue, 13 Jul 2021 11:35:18 +0300 Subject: [PATCH] handling add to dict requests --- .../service/RedactionLogCreatorService.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java index fe4e95c1..aa60d857 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java @@ -635,24 +635,26 @@ public class RedactionLogCreatorService { for (var manualRedaction : manualRedactions.getEntriesToAdd()) { - if (manualRedaction.isAddToDictionary() || manualRedaction.isAddToDossierDictionary()) { - var redactionLogEntry = createRedactionLogEntry(manualRedaction, manualRedaction.getId(), dossierTemplateId); - redactionLogEntry.setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - redactionLogEntry.setPositions(manualRedaction.getPositions()); + if (manualRedaction.getProcessedDate() == null) { + + if (manualRedaction.isAddToDictionary() || manualRedaction.isAddToDossierDictionary()) { + var redactionLogEntry = createRedactionLogEntry(manualRedaction, manualRedaction.getId(), dossierTemplateId); + redactionLogEntry.setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + redactionLogEntry.setPositions(manualRedaction.getPositions()); + + + var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny(); + if (found.isPresent()) { + found.get().setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + found.get().setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + found.get().setPositions(manualRedaction.getPositions()); + } else { + redactionLog.getRedactionLogEntry().add(redactionLogEntry); + } - manualRedaction. - var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny(); - if (found.isPresent()) { - found.get().setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - found.get().setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - found.get().setPositions(manualRedaction.getPositions()); - } else { - redactionLog.getRedactionLogEntry().add(redactionLogEntry); } - - } } }