From b1f73fb5b169710a56a74a9ecb55b7e0cc4b7b88 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Fri, 13 Aug 2021 13:25:42 +0300
Subject: [PATCH] logs

---
 .../service/RedactionLogMergeService.java     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 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..09477503 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
@@ -37,6 +37,7 @@ public class RedactionLogMergeService {
 
                 processRedactionLogEntry(manualRedactionWrappers.stream().filter(mr -> entry.getId().equals(mr.getId()))
                         .collect(Collectors.toList()), dossierTemplateId, entry);
+
                 entry.setComments(manualRedactions.getComments().get(entry.getId()));
             }
 
@@ -48,27 +49,26 @@ 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 -> {
+
+        manualRedactions.getImageRecategorizations().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 -> {
+
+        manualRedactions.getForceRedacts().forEach(item -> {
             if (item.getSoftDeletedTime() != null) {
                 manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
             }
         });
-        manualRedactions.getImageRecategorizations().forEach(item -> {
+
+        manualRedactions.getManualLegalBasisChanges().forEach(item -> {
             if (item.getSoftDeletedTime() != null) {
                 manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
             }
@@ -76,12 +76,15 @@ public class RedactionLogMergeService {
 
 
         Collections.sort(manualRedactionWrappers);
+        log.info("Obtained manual redaction wrappers: {}", manualRedactionWrappers);
         return manualRedactionWrappers;
     }
 
     private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers, String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
 
 
+        log.info("Processing: {} for: {}", manualRedactionWrappers, redactionLogEntry);
+
         manualRedactionWrappers.forEach(mrw -> {
 
             if (mrw.getItem() instanceof ManualImageRecategorization) {