Merge branch 'RED-8306' into 'master'

RED-8306 - An unprocessed remove from dict should not lead to a local remove

Closes RED-8306

See merge request redactmanager/persistence-service!315
This commit is contained in:
Corina Olariu 2024-01-19 13:04:09 +01:00
commit e17f577064

View File

@ -186,7 +186,7 @@ public class EntityLogMergeService {
addChanges(entityLogEntry.getChanges(), ChangeType.REMOVED, analysisNumber, idRemoval.getRequestDate());
entityLogEntry.getManualChanges()
.add(ManualChange.builder()
.manualRedactionType(ManualRedactionType.REMOVE_LOCALLY)
.manualRedactionType(idRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY)
.requestedDate(idRemoval.getRequestDate())
.processedDate(null)
.userId(idRemoval.getUser())