From 38a6ca6a82e960ba309b2195d4a279052f089aa8 Mon Sep 17 00:00:00 2001 From: corinaolariu Date: Thu, 5 Sep 2024 18:32:19 +0300 Subject: [PATCH] RED-9495 - Remove here for locally resized dictionary entry should remove the entry completly - update the merge of entity log for force redactions - add DICTIONARY engine to the local entry if based on DICT entry --- .../v1/processor/service/EntityLogMergeService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java index 5d832bc1a..b4495bd71 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java @@ -289,6 +289,9 @@ public class EntityLogMergeService { } return mergeRecategorization(manualRecategorization, entityLogEntry, dossier, analysisNumber); } else if (localChange instanceof ManualForceRedaction manualForceRedaction) { + if (manualForceRedaction.getBasedOnDictAnnotationId() != null) { + trackLocalChangesBasedOnDictEntriesMap.put(manualForceRedaction.getAnnotationId(), manualForceRedaction.getBasedOnDictAnnotationId()); + } mergeForceRedaction(manualForceRedaction, entityLogEntry, analysisNumber); return null; } else { @@ -551,6 +554,9 @@ public class EntityLogMergeService { entityLogEntry.setLegalBasis(forceRedaction.getLegalBasis()); entityLogEntry.setState(newState); entityLogEntry.getEngines().add(Engine.MANUAL); + if (forceRedaction.getBasedOnDictAnnotationId() != null) { + entityLogEntry.getEngines().add(Engine.DICTIONARY); + } addChanges(entityLogEntry, changes); entityLogEntry.getManualChanges().add(ManualChangeFactory.toLocalManualChange(forceRedaction, 0)); }