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
This commit is contained in:
parent
d7694b37a2
commit
38a6ca6a82
@ -289,6 +289,9 @@ public class EntityLogMergeService {
|
|||||||
}
|
}
|
||||||
return mergeRecategorization(manualRecategorization, entityLogEntry, dossier, analysisNumber);
|
return mergeRecategorization(manualRecategorization, entityLogEntry, dossier, analysisNumber);
|
||||||
} else if (localChange instanceof ManualForceRedaction manualForceRedaction) {
|
} else if (localChange instanceof ManualForceRedaction manualForceRedaction) {
|
||||||
|
if (manualForceRedaction.getBasedOnDictAnnotationId() != null) {
|
||||||
|
trackLocalChangesBasedOnDictEntriesMap.put(manualForceRedaction.getAnnotationId(), manualForceRedaction.getBasedOnDictAnnotationId());
|
||||||
|
}
|
||||||
mergeForceRedaction(manualForceRedaction, entityLogEntry, analysisNumber);
|
mergeForceRedaction(manualForceRedaction, entityLogEntry, analysisNumber);
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
@ -551,6 +554,9 @@ public class EntityLogMergeService {
|
|||||||
entityLogEntry.setLegalBasis(forceRedaction.getLegalBasis());
|
entityLogEntry.setLegalBasis(forceRedaction.getLegalBasis());
|
||||||
entityLogEntry.setState(newState);
|
entityLogEntry.setState(newState);
|
||||||
entityLogEntry.getEngines().add(Engine.MANUAL);
|
entityLogEntry.getEngines().add(Engine.MANUAL);
|
||||||
|
if (forceRedaction.getBasedOnDictAnnotationId() != null) {
|
||||||
|
entityLogEntry.getEngines().add(Engine.DICTIONARY);
|
||||||
|
}
|
||||||
addChanges(entityLogEntry, changes);
|
addChanges(entityLogEntry, changes);
|
||||||
entityLogEntry.getManualChanges().add(ManualChangeFactory.toLocalManualChange(forceRedaction, 0));
|
entityLogEntry.getManualChanges().add(ManualChangeFactory.toLocalManualChange(forceRedaction, 0));
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user