From a6a17f3621ee32f90d5831b94bbc096d7b42c731 Mon Sep 17 00:00:00 2001
From: Ali Oezyetimoglu <ali.oezyetimoglu@iqser.com>
Date: Mon, 15 Aug 2022 09:27:23 +0200
Subject: [PATCH] RED-4891: Rectangle redactions not listed in DELTA view

---
 .../redaction/service/RedactionLogMergeService.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 994e07c3..2abc2419 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
@@ -25,6 +25,8 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.entity
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+import com.iqser.red.service.redaction.v1.model.Change;
+import com.iqser.red.service.redaction.v1.model.ChangeType;
 import com.iqser.red.service.redaction.v1.model.ManualChange;
 import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
 import com.iqser.red.service.redaction.v1.model.Point;
@@ -225,6 +227,8 @@ public class RedactionLogMergeService {
                         .add(ManualChange.from(imageRecategorization)
                                 .withManualRedactionType(ManualRedactionType.RECATEGORIZE)
                                 .withChange("type", imageRecategorization.getType()));
+
+                redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, imageRecategorization.getRequestDate()));
             }
 
             if (mrw.getItem() instanceof IdRemoval) {
@@ -251,6 +255,8 @@ public class RedactionLogMergeService {
                     redactionLogEntry.getManualChanges()
                             .add(ManualChange.from(manualRemoval)
                                     .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
+
+                    redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, manualRemoval.getRequestDate()));
                 }
             }
 
@@ -283,6 +289,8 @@ public class RedactionLogMergeService {
 
                 redactionLogEntry.getManualChanges().add(manualChange);
 
+                redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, manualForceRedact.getRequestDate()));
+
             }
 
             if (mrw.getItem() instanceof ManualLegalBasisChange) {
@@ -317,6 +325,8 @@ public class RedactionLogMergeService {
                     manualChange.withChange("value", manualLegalBasisChange.getValue());
                 }
                 redactionLogEntry.getManualChanges().add(manualChange);
+
+                redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, manualLegalBasisChange.getRequestDate()));
             }
 
             if (mrw.getItem() instanceof ManualResizeRedaction) {
@@ -350,6 +360,8 @@ public class RedactionLogMergeService {
                         .add(ManualChange.from(manualResizeRedact)
                                 .withManualRedactionType(ManualRedactionType.RESIZE)
                                 .withChange("value", manualResizeRedact.getValue()));
+
+                redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, manualResizeRedact.getRequestDate()));
             }
 
         });
@@ -445,6 +457,7 @@ public class RedactionLogMergeService {
                 .sectionNumber(-1)
                 .rectangle(manualRedactionEntry.isRectangle())
                 .manualChanges(changeList)
+                .changes(List.of(new Change(0, ChangeType.ADDED, manualRedactionEntry.getRequestDate())))
                 .build();
     }