Resolve RED-7384

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/RedactionServiceSettings.java

@@ -30,4 +30,10 @@ public class RedactionServiceSettings {
 
     private int droolsExecutionTimeoutSecs = 300;
 
+
+    public int getDroolsExecutionTimeoutSecs(int numberOfPages) {
+
+        return (int) Math.max(getDroolsExecutionTimeoutSecs(), getDroolsExecutionTimeoutSecs() * ((float) numberOfPages / 1000));
+    }
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/MessageReceiver.java

@@ -17,7 +17,7 @@ public class MessageReceiver {
 
 
     @RabbitHandler
-    @RabbitListener(queues = REDACTION_QUEUE)
+    @RabbitListener(queues = REDACTION_QUEUE, concurrency = "1")
     public void receiveAnalyzeRequest(Message message) {
 
         redactionMessageReceiver.receiveAnalyzeRequest(message, false);

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/PriorityMessageReceiver.java

@@ -17,7 +17,7 @@ public class PriorityMessageReceiver {
 
 
     @RabbitHandler
-    @RabbitListener(queues = REDACTION_PRIORITY_QUEUE)
+    @RabbitListener(queues = REDACTION_PRIORITY_QUEUE, concurrency = "1")
     public void receiveAnalyzeRequest(Message message) {
 
         redactionMessageReceiver.receiveAnalyzeRequest(message, true);

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/ComponentDroolsExecutionService.java

@@ -50,7 +50,9 @@ public class ComponentDroolsExecutionService {
                 .filter(entityLogEntry -> entityLogEntry.getState().equals(EntryState.APPLIED))
                 .map(entry -> Entity.fromEntityLogEntry(entry, document))
                 .forEach(kieSession::insert);
-        fileAttributes.stream().filter(f -> f.getValue() != null).forEach(kieSession::insert);
+        fileAttributes.stream()
+                .filter(f -> f.getValue() != null)
+                .forEach(kieSession::insert);
 
         CompletableFuture<Void> completableFuture = CompletableFuture.supplyAsync(() -> {
             kieSession.fireAllRules();
@@ -58,7 +60,8 @@ public class ComponentDroolsExecutionService {
         });
 
         try {
-            completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(), TimeUnit.SECONDS).get();
+            completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS)
+                    .get();
         } catch (ExecutionException e) {
             kieSession.dispose();
             if (e.getCause() instanceof TimeoutException) {
@@ -71,7 +74,9 @@ public class ComponentDroolsExecutionService {
         }
 
         List<FileAttribute> resultingFileAttributes = getFileAttributes(kieSession);
-        List<Component> components = getComponents(kieSession).stream().sorted(ComponentComparator.first()).toList();
+        List<Component> components = getComponents(kieSession).stream()
+                .sorted(ComponentComparator.first())
+                .toList();
         kieSession.dispose();
         return components;
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java

@@ -122,7 +122,7 @@ public class EntityDroolsExecutionService {
         });
 
         try {
-            completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(), TimeUnit.SECONDS)
+            completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS)
                     .get();
         } catch (ExecutionException e) {
             kieSession.dispose();

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AnalysisEnd2EndTest.java

@@ -104,7 +104,7 @@ import lombok.extern.slf4j.Slf4j;
     @SneakyThrows
     public void runAnalysisEnd2End() {
 
-        String folder = "files/end2end/file0"; // Should contain all files from minio directly, still zipped. Can contain multiple files.
+        String folder = "files/end2end/file0"; // Should contain all files from minio directly, still zipped. Can contain multiple fileIds.
 
         Path absoluteFolderPath;
         if (folder.startsWith("files")) { // if it starts with "files" it is most likely in the resources folder, else it should be an absolute path

redaction-service-v1/redaction-service-server-v1/src/test/resources/application.yml

@@ -25,6 +25,8 @@ redaction-service:
 application:
   type: "RedactManager"
 
+logging.type: "CONSOLE"
+
 storage:
   backend: 's3'