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 8b9571afa..98d0460b3 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 @@ -297,7 +297,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 4bb71e12f..7507c8623 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 @@ -145,7 +145,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); } @@ -176,7 +176,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)) { request.setBasedOnDictAnnotationId(legalBasisChangeRequest.getAnnotationId()); entityLogEntry.setId(uuid); manualRedactionEntryConsumer.accept(entityLogEntry); @@ -249,6 +249,7 @@ public class ManualRedactionMapper { .build(); if (!entityLogEntry.getEngines().contains(Engine.MANUAL) + && !entityLogEntry.getEngines().contains(Engine.IMPORTED) && !recategorizationRequest.isAddToAllDossiers() && !recategorizationRequest.isAddToDictionary() && entryIsEntityType(entityLogEntry)) { @@ -323,7 +324,11 @@ public class ManualRedactionMapper { .addToAllDossiers(resizeRedactionRequest.isAddToAllDossiers()) .build(); - if (!entityLogEntry.getEngines().contains(Engine.MANUAL) && !request.isAddToAllDossiers() && !request.getUpdateDictionary() && entryIsEntityType(entityLogEntry)) { + if (!entityLogEntry.getEngines().contains(Engine.MANUAL) + && !entityLogEntry.getEngines().contains(Engine.IMPORTED) + && !request.isAddToAllDossiers() + && !request.getUpdateDictionary() + && entryIsEntityType(entityLogEntry)) { request.setBasedOnDictAnnotationId(resizeRedactionRequest.getAnnotationId()); entityLogEntry.setId(uuid); manualRedactionEntryConsumer.accept(entityLogEntry);