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!666
This commit is contained in:
Maverick Studer 2024-08-15 12:34:29 +02:00
commit 272cc17fbc
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.ProcessingStatus;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
import com.iqser.red.service.persistence.service.v1.api.shared.mongo.service.EntityLogMongoService;
import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType;
import com.knecon.fforesight.service.ocr.v1.api.model.DocumentRequest;
@ -100,6 +101,7 @@ public class FileStatusService {
FileManagementServiceSettings fileManagementServiceSettings;
LayoutParsingRequestFactory layoutParsingRequestFactory;
ComponentMappingService componentMappingService;
EntityLogMongoService entityLogMongoService;
WebsocketService websocketService;
@ -304,6 +306,13 @@ public class FileStatusService {
log.info("Add file: {} from dossier {} to Analysis queue with MessageType {}", fileId, dossierId, messageType);
// a full processing is supposed to happen when the FIRST manual reanalyze is executed for a file uploaded with imported redactions and disabled automatic analysis
if (fileEntity.isExcludedFromAutomaticAnalysis()
&& manualRedactionReanalyse
&& analyseRequest.getAnalysisNumber() == 2
&& entityLogMongoService.entityLogContainsImportedEntries(dossierId, fileId)) {
analyseRequest.setMessageType(MessageType.ANALYSE);
}
if (messageType.equals(MessageType.REANALYSE)) {
setStatusProcessing(fileId);
} else {

4
persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/repository/EntityLogEntryDocumentRepository.java
View File

@ -60,4 +60,8 @@ public interface EntityLogEntryDocumentRepository extends MongoRepository<Entity
@Query(value = "{ 'entityLogId' : ?0}", delete = true)
void deleteByEntityLogId(String entityLogId);
@Query(value = "{ 'entityLogId': ?0, 'engines': 'IMPORTED' }", exists = true)
boolean existsByEntityLogIdAndEngineImported(String entityLogId);
}

7
persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/service/EntityLogMongoService.java
View File

@ -333,4 +333,11 @@ public class EntityLogMongoService {
entityLogDocumentUpdateService.updateEntityLogDocumentWithoutEntries(dossierId, fileId, entityLog);
}
public boolean entityLogContainsImportedEntries(String dossierId, String fileId) {
String entityLogId = mapper.getLogId(dossierId, fileId);
return entityLogEntryDocumentRepository.existsByEntityLogIdAndEngineImported(entityLogId);
}
}