From 5e50c0bfde741c7780bb9048c03830cf05bbf4a8 Mon Sep 17 00:00:00 2001 From: Timo Date: Tue, 13 Jul 2021 16:34:44 +0300 Subject: [PATCH 1/2] added logs for dict --- .../redaction/v1/server/redaction/service/DictionaryService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java index 71cd08b2..fd460dbd 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java @@ -33,6 +33,7 @@ public class DictionaryService { public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) { + log.info("Updating dictionary data for: {} / {}", dossierTemplateId, dossierId); long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId, GLOBAL_DOSSIER); var dossierTemplateDictionary = dictionariesByDossierTemplate.get(dossierTemplateId); if (dossierTemplateDictionary == null || dossierTemplateDictionaryVersion > dossierTemplateDictionary.getDictionaryVersion()) { From 71ba89306715d88ddadaa7780f4935a99bd107d6 Mon Sep 17 00:00:00 2001 From: Timo Date: Wed, 14 Jul 2021 11:20:37 +0300 Subject: [PATCH 2/2] id removal modifying dict flag --- .../server/redaction/service/RedactionLogCreatorService.java | 5 +++++ 1 file changed, 5 insertions(+) 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 6c989a9e..cd5416ae 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 @@ -146,6 +146,8 @@ public class RedactionLogCreatorService { redactionLogEntry.setReason(manualOverrideReason); redactionLogEntry.setManual(true); redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE); + redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary()); + redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary()); } } } @@ -298,6 +300,8 @@ public class RedactionLogCreatorService { redactionLogEntry.setReason(manualOverrideReason); redactionLogEntry.setManual(true); redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE); + redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary()); + redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary()); } } } @@ -326,6 +330,7 @@ public class RedactionLogCreatorService { redactionLogEntry.setReason(manualOverrideReason); redactionLogEntry.setManual(true); redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT); + } } }