From ae5e05e341eb3964dca47080a142ce76f6df8a0c Mon Sep 17 00:00:00 2001
From: aoezyetimoglu <ali.oezyetimoglu@iqser.com>
Date: Fri, 8 Jul 2022 12:10:38 +0200
Subject: [PATCH] RED-4497: Refactored method to remove resizeRedactions with
 addToDictionary

---
 .../service/ManualRedactionService.java       | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java
index 0a02ecff5..2ec13d456 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java
@@ -816,15 +816,7 @@ public class ManualRedactionService {
                     removeFromDictionary(buildTypeId(redactionLogEntry, dossier), redactionLogEntry.getValue(), dossier.getId(), fileId, DictionaryEntryType.ENTRY);
 
                     // This is needed to remove resizeRedactions with addToDictionary.
-                    var resizeRedactionsWithSameValue = resizeRedactionPersistenceService.findByAnnotationStatusAndValue(AnnotationStatus.APPROVED, redactionLogEntry.getValue());
-                    resizeRedactionsWithSameValue.forEach(resizeRedaction -> {
-                        var file = fileStatusPersistenceService.getStatus(resizeRedaction.getId().getFileId());
-                        var dossierForResizeRedaction = dossierPersistenceService.findByDossierId(file.getDossierId());
-                        if(!file.getWorkflowStatus().equals(WorkflowStatus.APPROVED) && dossier.getDossierTemplateId().equals(dossierForResizeRedaction.getDossierTemplateId())) {
-                            resizeRedactionPersistenceService.hardDelete(resizeRedaction.getId()
-                                    .getFileId(), resizeRedaction.getId().getAnnotationId());
-                        }
-                    });
+                    removeResizeRedactionsWithAddToDictionary(dossier.getDossierTemplateId(), redactionLogEntry.getValue());
                 }
                 return true;
             }
@@ -832,6 +824,17 @@ public class ManualRedactionService {
         return false;
     }
 
+    private void removeResizeRedactionsWithAddToDictionary(String dossierTemplateId, String redactionLogEntryValue) {
+        var resizeRedactionsWithSameValue = resizeRedactionPersistenceService.findByAnnotationStatusAndValue(AnnotationStatus.APPROVED, redactionLogEntryValue);
+        resizeRedactionsWithSameValue.forEach(resizeRedaction -> {
+            var file = fileStatusPersistenceService.getStatus(resizeRedaction.getId().getFileId());
+            var dossierForResizeRedaction = dossierPersistenceService.findByDossierId(file.getDossierId());
+            if(!file.getWorkflowStatus().equals(WorkflowStatus.APPROVED) && dossierTemplateId.equals(dossierForResizeRedaction.getDossierTemplateId())) {
+                resizeRedactionPersistenceService.hardDelete(resizeRedaction.getId()
+                        .getFileId(), resizeRedaction.getId().getAnnotationId());
+            }
+        });
+    }
 
     private void addToDictionary(String typeId, String value, String dossierId, String fileId,
                                  DictionaryEntryType dictionaryEntryType) {