From b1d76a851750f60cfc6f64196a68ecd56bae2941 Mon Sep 17 00:00:00 2001
From: Maverick Studer <maverick.studer@knecon.com>
Date: Mon, 12 Aug 2024 18:40:34 +0200
Subject: [PATCH] RED-9782:Automated Analysis should be disabled when uploading
 a document that...

---
 .../management/v1/processor/service/FileStatusService.java | 4 +++-
 .../service/manualredactions/ManualRedactionMapper.java    | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
index 1cf9dd973..cb9e2fc02 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
@@ -296,7 +296,9 @@ public class FileStatusService {
                 .fileAttributes(convertAttributes(fileEntity.getFileAttributes(), dossier.getDossierTemplateId()))
                 .build();
 
-        if (fileEntity.isExcludedFromAutomaticAnalysis() && fileManagementStorageService.objectExists(dossierId, fileId, FileType.IMPORTED_REDACTIONS)) {
+        if (fileEntity.isExcludedFromAutomaticAnalysis() && !manualRedactionReanalyse && fileManagementStorageService.objectExists(dossierId,
+                                                                                                                                   fileId,
+                                                                                                                                   FileType.IMPORTED_REDACTIONS)) {
             analyseRequest.setMessageType(MessageType.IMPORTED_REDACTIONS_ONLY);
         }
 
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
index 1cb69460d..95b30f0a3 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
@@ -144,7 +144,7 @@ public class ManualRedactionMapper {
                     .comment(forceRedactionRequestModel.getComment())
                     .build();
 
-            if (!entityLogEntry.getEngines().contains(Engine.MANUAL) && entryIsEntityType(entityLogEntry)) {
+            if (!entityLogEntry.getEngines().contains(Engine.MANUAL) && !entityLogEntry.getEngines().contains(Engine.IMPORTED) && entryIsEntityType(entityLogEntry)) {
                 manualRedactionEntryConsumer.accept(entityLogEntry);
             }
 
@@ -174,7 +174,7 @@ public class ManualRedactionMapper {
                     .value(legalBasisChangeRequest.getValue())
                     .build();
 
-            if (!entityLogEntry.getEngines().contains(Engine.MANUAL) && entryIsEntityType(entityLogEntry)) {
+            if (!entityLogEntry.getEngines().contains(Engine.MANUAL) && !entityLogEntry.getEngines().contains(Engine.IMPORTED) && entryIsEntityType(entityLogEntry)) {
                 manualRedactionEntryConsumer.accept(entityLogEntry);
             }
 
@@ -244,6 +244,7 @@ public class ManualRedactionMapper {
                         .build();
 
                 if (!entityLogEntry.getEngines().contains(Engine.MANUAL)
+                    && !entityLogEntry.getEngines().contains(Engine.IMPORTED)
                     && !recategorizationRequest.isAddToAllDossiers()
                     && !recategorizationRequest.isAddToDictionary()
                     && entryIsEntityType(entityLogEntry)) {
@@ -314,7 +315,7 @@ public class ManualRedactionMapper {
                         .build();
 
                 if (!entityLogEntry.getEngines().contains(Engine.MANUAL)
-                    && entryIsEntityType(entityLogEntry)
+                    && !entityLogEntry.getEngines().contains(Engine.IMPORTED)
                     && !request.isAddToAllDossiers()
                     && !request.getUpdateDictionary()
                     && entryIsEntityType(entityLogEntry)) {