From 4869db01810dd97f653289e92b78de3b6d60984f Mon Sep 17 00:00:00 2001
From: Andrei Isvoran <andrei.isvoran.ext@knecon.com>
Date: Tue, 12 Dec 2023 15:10:04 +0200
Subject: [PATCH] RED-8043 - Add SurroundTextAnalysis case for unprocessed
 redactions to be treated via separate queue

---
 .../queue/RedactionMessageReceiver.java       |  7 ++----
 .../service/UnprocessedChangesService.java    |  2 ++
 .../src/main/resources/log4j2.xml             | 23 +++++++++++++++++++
 .../src/main/resources/logback-spring.xml     | 17 --------------
 4 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/resources/log4j2.xml
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/resources/logback-spring.xml

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java
index 33ef3cf9..60bfa1df 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java
@@ -106,7 +106,6 @@ public class RedactionMessageReceiver {
                     log.info("Starting Surrounding Text Analysis for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
                     log.info(analyzeRequest.getManualRedactions().toString());
                     unprocessedChangesService.analyseSurroundingText(analyzeRequest);
-                    shouldRespond = false;
                     log.info("Successful Surrounding Text Analysis dossier {} file {} ",
                             analyzeRequest.getDossierId(),
                             analyzeRequest.getFileId());
@@ -116,10 +115,8 @@ public class RedactionMessageReceiver {
                     throw new IllegalArgumentException("Unknown MessageType: " + analyzeRequest.getMessageType());
             }
             log.info("");
-            if (shouldRespond) {
-                result.setMessageType(analyzeRequest.getMessageType());
-                fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
-            }
+            result.setMessageType(analyzeRequest.getMessageType());
+            fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
         } catch (DroolsTimeoutException droolsTimeoutException) {
             if (!droolsTimeoutException.isReported()) {
                 rulesClient.setRulesTimeoutDetected(analyzeRequest.getDossierTemplateId(), droolsTimeoutException.getRuleFileType());
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
index cf612d9e..598bbbca 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
@@ -13,6 +13,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequ
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
 import com.iqser.red.service.redaction.v1.model.AnalyzeResponse;
 import com.iqser.red.service.redaction.v1.model.QueueNames;
 import com.iqser.red.service.redaction.v1.model.UnprocessedManualEntity;
@@ -42,6 +43,7 @@ public class UnprocessedChangesService {
         List<UnprocessedManualEntity> unprocessedManualEntities = new ArrayList<>();
         Document document = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
         Set<String> annotationIds = analyzeRequest.getManualRedactions().getEntriesToAdd().stream().map(ManualRedactionEntry::getAnnotationId).collect(Collectors.toSet());
+        annotationIds.addAll(analyzeRequest.getManualRedactions().getResizeRedactions().stream().map(ManualResizeRedaction::getAnnotationId).collect(Collectors.toSet()));
 
         List<ManualEntity> notFoundManualEntities = new ArrayList<>();
         List<ManualEntity> manualEntities = manualEntitiesConverter(analyzeRequest.getManualRedactions());
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/log4j2.xml b/redaction-service-v1/redaction-service-server-v1/src/main/resources/log4j2.xml
new file mode 100644
index 00000000..c36f74e8
--- /dev/null
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/resources/log4j2.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+    <Properties>
+        <property name="logType">${env:LOGGING_TYPE}</property>
+    </Properties>
+    <Appenders>
+        <Console name="json" target="SYSTEM_OUT">
+            <JSONLayout compact="true" eventEol="true" properties="true" stacktraceAsString="true"
+                        includeTimeMillis="true">
+
+                <KeyValuePair key="version" value="${project.version}"/>
+            </JSONLayout>
+        </Console>
+        <Console name="console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n " />
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="${logType}"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/logback-spring.xml b/redaction-service-v1/redaction-service-server-v1/src/main/resources/logback-spring.xml
deleted file mode 100644
index 33b2cef7..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<configuration>
-
-    <springProperty scope="configuration" name="logType" source="logging.type"/>
-    <springProperty scope="context" name="application.name" source="spring.application.name"/>
-    <springProperty scope="context" name="version" source="project.version"/>
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
-
-    <appender name="JSON" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="${logType}"/>
-    </root>
-
-</configuration>
\ No newline at end of file