Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Merge branch 'RED-9782-fix-bp' into 'release/2.465.x'

Browse Source 
RED-9782:Automated Analysis should be disabled when uploading a document that...

See merge request redactmanager/persistence-service!660
This commit is contained in:
Maverick Studer 2024-08-12 18:40:34 +02:00
commit e2eb0d1047
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
View File

@ -296,7 +296,9 @@ public class FileStatusService {
.fileAttributes(convertAttributes(fileEntity.getFileAttributes(), dossier.getDossierTemplateId())) .fileAttributes(convertAttributes(fileEntity.getFileAttributes(), dossier.getDossierTemplateId()))
.build(); .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); analyseRequest.setMessageType(MessageType.IMPORTED_REDACTIONS_ONLY);
} }

7
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
View File

@ -144,7 +144,7 @@ public class ManualRedactionMapper {
.comment(forceRedactionRequestModel.getComment()) .comment(forceRedactionRequestModel.getComment())
.build(); .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); manualRedactionEntryConsumer.accept(entityLogEntry);
} }
@ -174,7 +174,7 @@ public class ManualRedactionMapper {
.value(legalBasisChangeRequest.getValue()) .value(legalBasisChangeRequest.getValue())
.build(); .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); manualRedactionEntryConsumer.accept(entityLogEntry);
} }
@ -244,6 +244,7 @@ public class ManualRedactionMapper {
.build(); .build();
if (!entityLogEntry.getEngines().contains(Engine.MANUAL) if (!entityLogEntry.getEngines().contains(Engine.MANUAL)
&& !entityLogEntry.getEngines().contains(Engine.IMPORTED)
&& !recategorizationRequest.isAddToAllDossiers() && !recategorizationRequest.isAddToAllDossiers()
&& !recategorizationRequest.isAddToDictionary() && !recategorizationRequest.isAddToDictionary()
&& entryIsEntityType(entityLogEntry)) { && entryIsEntityType(entityLogEntry)) {
@ -314,7 +315,7 @@ public class ManualRedactionMapper {
.build(); .build();
if (!entityLogEntry.getEngines().contains(Engine.MANUAL) if (!entityLogEntry.getEngines().contains(Engine.MANUAL)
&& entryIsEntityType(entityLogEntry) && !entityLogEntry.getEngines().contains(Engine.IMPORTED)
&& !request.isAddToAllDossiers() && !request.isAddToAllDossiers()
&& !request.getUpdateDictionary() && !request.getUpdateDictionary()
&& entryIsEntityType(entityLogEntry)) { && entryIsEntityType(entityLogEntry)) {