From 3d01f76b7df9f33a66a7f49b9a8aca9dc2180d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?=
 <dominique.eiflaender@knecon.com>
Date: Wed, 6 Nov 2024 10:59:11 +0100
Subject: [PATCH] RED-10353: Added error code for file that causes the timeout

---
 .../redaction-service-api-v1/build.gradle.kts     |  2 +-
 .../redaction-service-server-v1/build.gradle.kts  |  2 +-
 .../v1/server/queue/RedactionMessageReceiver.java | 15 +++++++++++++--
 .../src/test/resources/files/syngenta             |  2 +-
 4 files changed, 16 insertions(+), 5 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 5678254b..21960252 100644
--- a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts
+++ b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 description = "redaction-service-api-v1"
-val persistenceServiceVersion = "2.587.0"
+val persistenceServiceVersion = "2.589.18"
 
 dependencies {
     implementation("org.springframework:spring-web:6.0.12")
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 dd1ec3e4..77f09964 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.181.0"
 val jacksonVersion = "2.15.2"
 val droolsVersion = "9.44.0.Final"
 val pdfBoxVersion = "3.0.0"
-val persistenceServiceVersion = "2.592.0-RED10260.0"
+val persistenceServiceVersion = "2.589.18"
 val llmServiceVersion = "1.11.0"
 val springBootStarterVersion = "3.1.5"
 val springCloudVersion = "4.0.4"
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 2d085604..184566a8 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
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.ErrorCode;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileErrorInfo;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
@@ -167,13 +168,23 @@ public class RedactionMessageReceiver {
     private void sendAnalysisFailed(AnalyzeRequest analyzeRequest, boolean priority, Exception e) {
 
         log.error("Failed to process analyze request: {}", analyzeRequest, e);
-        var timestamp = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
+
+        ErrorCode errorCode = null;
+
+        if(e instanceof DroolsTimeoutException dre){
+            if (!dre.isReported()){
+                errorCode = ErrorCode.RULES_EXECUTION_TIMEOUT;
+            } else {
+                errorCode = ErrorCode.LOCKED_RULES;
+            }
+        }
+
         fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(),
                                                         analyzeRequest.getFileId(),
                                                         new FileErrorInfo(e.getMessage(),
                                                                           priority ? REDACTION_PRIORITY_REQUEST_EXCHANGE : REDACTION_REQUEST_EXCHANGE,
                                                                           "redaction-service",
-                                                                          timestamp));
+                                                                          errorCode));
     }
 
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta
index 0da08b1d..57e6e0dd 160000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta
@@ -1 +1 @@
-Subproject commit 0da08b1d9d1bc815a3fb51aa9638eafea2cf02d5
+Subproject commit 57e6e0dd3c08a3a65ec59b5dfb70f0f77ebcc7c7