From 7746c63063a19e3613d84a9207d8302b9d8a29a8 Mon Sep 17 00:00:00 2001
From: Maverick Studer <maverick.studer@knecon.com>
Date: Fri, 3 May 2024 13:36:32 +0200
Subject: [PATCH] RED-9104: Rectangle redaction cannot be removed

---
 .../redaction-service-api-v1/build.gradle.kts |  2 +-
 .../build.gradle.kts                          |  2 +-
 .../v1/server/RedactionIntegrationTest.java   | 51 +++++++++++++++++++
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts
index d76a97e9..ed84be75 100644
--- a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts
+++ b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts
@@ -7,7 +7,7 @@ description = "redaction-service-api-v1"
 
 dependencies {
     implementation("org.springframework:spring-web:6.0.12")
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.407.0")
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.410.0")
 }
 
 publishing {
diff --git a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts
index 0d8448f7..60612739 100644
--- a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts
+++ b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts
@@ -16,7 +16,7 @@ val layoutParserVersion = "0.116.0"
 val jacksonVersion = "2.15.2"
 val droolsVersion = "9.44.0.Final"
 val pdfBoxVersion = "3.0.0"
-val persistenceServiceVersion = "2.407.0"
+val persistenceServiceVersion = "2.410.0"
 val springBootStarterVersion = "3.1.5"
 val springCloudVersion = "4.0.4"
 val testContainersVersion = "1.19.7"
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
index d5b6cba1..e65cb764 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
@@ -1531,6 +1531,57 @@ public class RedactionIntegrationTest extends RulesIntegrationTest {
                              .get().getState(), EntryState.APPLIED);
     }
 
+    @Test
+    @SneakyThrows
+    public void testRemoveRectangleRedaction() {
+
+        String pdfFile = "files/syngenta/CustomerFiles/SinglePages/test1S1T1.pdf";
+
+        String manualAddId = UUID.randomUUID().toString();
+        List<Rectangle> positions = List.of(Rectangle.builder().topLeftX(305.35f).topLeftY(332.5033f).width(71.40744f).height(13.645125f).page(1).build());
+        ManualRedactionEntry manualRedactionEntry = getManualRedactionEntry(manualAddId,
+                                                                            positions,
+                                                                            "the manufacturing or production process, including the method and innovative aspects thereof, as well as other technical and industrial specifications inherent to that process or method, except for information which is relevant to the assessment of safety");
+
+        manualRedactionEntry.setRectangle(true);
+
+        IdRemoval idRemoval = getIdRemoval(manualAddId);
+
+        AnalyzeRequest request = uploadFileToStorage(pdfFile);
+        request.setManualRedactions(ManualRedactions.builder().entriesToAdd(Set.of(manualRedactionEntry)).build());
+        analyzeDocumentStructure(LayoutParsingType.REDACT_MANAGER, request);
+        request.setAnalysisNumber(1);
+        analyzeService.analyze(request);
+
+        var entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        assertTrue(entityLog.getEntityLogEntry()
+                           .stream()
+                           .anyMatch(entityLogEntry -> entityLogEntry.getId().equals(manualAddId)));
+        assertEquals(entityLog.getEntityLogEntry()
+                             .stream()
+                             .filter(entityLogEntry -> entityLogEntry.getId().equals(manualAddId))
+                             .findFirst()
+                             .get().getState(), EntryState.APPLIED);
+
+        manualRedactionEntry.setProcessedDate(OffsetDateTime.now());
+        request.setManualRedactions(ManualRedactions.builder().entriesToAdd(Set.of(manualRedactionEntry)).idsToRemove(Set.of(idRemoval)).build());
+        request.setAnalysisNumber(2);
+        analyzeService.reanalyze(request);
+
+        entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        assertTrue(entityLog.getEntityLogEntry()
+                           .stream()
+                           .anyMatch(entityLogEntry -> entityLogEntry.getId().equals(manualAddId)));
+        assertEquals(entityLog.getEntityLogEntry()
+                             .stream()
+                             .filter(entityLogEntry -> entityLogEntry.getId().equals(manualAddId))
+                             .findFirst()
+                             .get().getState(), EntryState.REMOVED);
+
+    }
+
 
     @Test
     @SneakyThrows