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

Pull request #242: RED-3437: Fixed several bugs in workflow

Browse Source 
Merge in RED/persistence-service from RED-3437 to master

* commit '1b27dae3d875068a1f62bd2477cac66eebe009e8':
  RED-3437: Fixed several bugs in workflow
This commit is contained in:
Dominique Eiflaender 2022-02-17 09:50:00 +01:00
commit bee684b544
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusProcessingUpdateService.java
View File

@ -37,8 +37,8 @@ public class FileStatusProcessingUpdateService {
if (settings.isNerServiceEnabled() && !fileManagementStorageService.nerEntitiesExists(dossierId, fileId)) {
fileStatusService.addToNerQueue(dossierId, fileId);
} else {
analyzeResult.setMessageType(MessageType.ANALYSE);
analysisSuccessful(dossierId, fileId, analyzeResult);
fileStatusService.setStatusAnalyse(dossierId, fileId, 1);
fileStatusService.addToAnalysisQueue(dossierId, fileId, 2, null);
}
break;

1
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
View File

@ -95,6 +95,7 @@ public class FileStatusService {
}
public void setStatusProcessing(String fileId) {
fileStatusPersistenceService.updateProcessingStatus(fileId, ProcessingStatus.PROCESSING);

14
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java
View File

@ -614,10 +614,18 @@ public class ManualRedactionService {
public void updateProcessedDate(String fileId, ManualRedactions manualRedactions) {
// These are marked as processed once analysis completes, not when they are set as approved
manualRedactions.getIdsToRemove().forEach(removeRedactionPersistenceService::markAsProcessed);
manualRedactions.getForceRedactions().forEach(forceRedactionPersistenceService::markAsProcessed);
manualRedactions.getImageRecategorization().forEach(recategorizationPersistenceService::markAsProcessed);
if(manualRedactions != null) {
if(manualRedactions.getIdsToRemove() != null) {
manualRedactions.getIdsToRemove().forEach(removeRedactionPersistenceService::markAsProcessed);
}
if(manualRedactions.getForceRedactions() != null) {
manualRedactions.getForceRedactions().forEach(forceRedactionPersistenceService::markAsProcessed);
}
if(manualRedactions.getImageRecategorization() != null) {
manualRedactions.getImageRecategorization().forEach(recategorizationPersistenceService::markAsProcessed);
}
}
}

2
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/NerMessageReceiver.java
View File

@ -36,7 +36,7 @@ public class NerMessageReceiver {
String fileId = (String) entityResponse.get("fileId");
log.info("Received NER Message from {} {}", dossierId, fileId);
fileStatusService.addToAnalysisQueue(dossierId, fileId, 2, null);
fileStatusService.setStatusAnalyse(dossierId, fileId, 1);
}