From ba14eee6efb7b4faea805a94df52a5d8de6b9c1b Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Fri, 13 Aug 2021 13:27:17 +0300 Subject: [PATCH] fixed minor issue --- .../service/RedactionLogMergeService.java | 15 +++++++-------- 1 file changed, 7 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 ff7d2636..9f57940f 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 @@ -49,27 +49,26 @@ public class RedactionLogMergeService { private List createManualRedactionWrappers(ManualRedactions manualRedactions) { List 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)); }