From 790a0d2bcd12030e481c5e3b40f89dee0970a678 Mon Sep 17 00:00:00 2001
From: Ali Oezyetimoglu <ali.oezyetimoglu@knecon.com>
Date: Wed, 24 Apr 2024 13:23:14 +0200
Subject: [PATCH] Revert-RED8480 and add updates for RED-9042

---
 ...al-basis-in-manual-legal-basis-change.yaml |  9 ++++++++
 .../tests/ManualRedactionTest.java            | 21 +++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/125-add-max-size-for-legal-basis-in-manual-legal-basis-change.yaml

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/125-add-max-size-for-legal-basis-in-manual-legal-basis-change.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/125-add-max-size-for-legal-basis-in-manual-legal-basis-change.yaml
new file mode 100644
index 000000000..086671478
--- /dev/null
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/125-add-max-size-for-legal-basis-in-manual-legal-basis-change.yaml
@@ -0,0 +1,9 @@
+databaseChangeLog:
+  - changeSet:
+      id: add-legal-basis-change-to-manual-recategorization
+      author: ali
+      changes:
+        - modifyDataType:
+            columnName: legal_basis
+            newDataType: VARCHAR(4000)
+            tableName: manual_legal_basis_change
\ No newline at end of file
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
index 1765fdba5..e25d41c65 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
@@ -12,6 +12,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -42,8 +43,12 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
 import com.iqser.red.service.persistence.management.v1.processor.service.redactionlog.RedactionRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.MessageType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Change;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ChangeType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogLegalBasis;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
@@ -2389,9 +2394,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                 .value("Image:Other")
                 .build();
 
-        var resp = manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recategorizationRequestModel), false);
+        manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recategorizationRequestModel), false);
 
-        System.out.println(resp);
+        var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
+
+        assertTrue(allManualRedactions.getRecategorizations()
+                           .stream()
+                           .anyMatch(manualRecategorization -> manualRecategorization.getType().equals(typeLogo.getType())));
 
     }
 
@@ -2455,9 +2464,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                 .value("Ranya Eikenboom")
                 .build();
 
-        var resp = manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recategorizationRequestModel), false);
+        manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recategorizationRequestModel), false);
 
-        System.out.println(resp);
+        var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
+
+        assertTrue(allManualRedactions.getLegalBasisChanges()
+                           .stream()
+                           .anyMatch(manualLegalBasisChange -> manualLegalBasisChange.getLegalBasis().equals(recategorizationRequestModel.getLegalBasis())));
 
     }