From 787ef98b76c968699cd297e086db7ce4ea5ba834 Mon Sep 17 00:00:00 2001
From: Corina Olariu <corina.olariu.ext@knecon.com>
Date: Thu, 23 Nov 2023 08:46:57 +0100
Subject: [PATCH] RED-7918 - RM-62: "Last Modified" date not updated after
 change

---
 .../v1/server/redaction/service/RedactionLogMergeService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
index f6dfef4f..a854becb 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
@@ -285,7 +285,7 @@ public class RedactionLogMergeService {
     private void processIdRemoval(RedactionLogEntry redactionLogEntry, List<Type> types, Colors colors, IdRemoval manualRemoval) {
 
         boolean isApprovedRedaction = manualRemoval.getStatus().equals(AnnotationStatus.APPROVED);
-        if (isApprovedRedaction && manualRemoval.isRemoveFromDictionary() && isBasedOnDictionaryOnly(redactionLogEntry)) {
+        if (isApprovedRedaction && manualRemoval.isRemoveFromDictionary() && manualRemoval.getProcessedDate() != null && isBasedOnDictionaryOnly(redactionLogEntry)) {
             log.debug("Skipping merge for dictionary-modifying entry");
         } else {
             String redactionLogEntryType = redactionLogEntry.getType();