From e43e8bccbf283ccb5ea1eeb405020229fb66ea3c Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Fri, 13 Aug 2021 13:00:32 +0200
Subject: [PATCH] RedactionLogMergeService.java edited online with Bitbucket

---
 .../service/RedactionLogMergeService.java     | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

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 8d1b734a..ce09f06c 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
@@ -48,34 +48,36 @@ public class RedactionLogMergeService {
 
     private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {
         List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();
-        manualRedactions.getForceRedacts().forEach(item -> {
-            if (item.getSoftDeletedTime() != null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
-            }
-        });
-        manualRedactions.getEntriesToAdd().forEach(item -> {
-            if (item.getSoftDeletedTime() != null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
-            }
-        });
-        manualRedactions.getIdsToRemove().forEach(item -> {
-            if (item.getSoftDeletedTime() != null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
-            }
-        });
-        manualRedactions.getManualLegalBasisChanges().forEach(item -> {
-            if (item.getSoftDeletedTime() != null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
-            }
-        });
+
+        log.info("Processing Manual Redactions: {}", manualRedactions);
+
         manualRedactions.getImageRecategorizations().forEach(item -> {
-            if (item.getSoftDeletedTime() != null) {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getIdsToRemove().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getForceRedacts().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getManualLegalBasisChanges().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
                 manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
             }
         });
 
 
         Collections.sort(manualRedactionWrappers);
+        log.info("Obtained manual redaction wrappers: {}", manualRedactionWrappers);
         return manualRedactionWrappers;
     }