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

RED-2360: Fixed priority queueing

Browse Source
This commit is contained in:
Dominique Eifländer 2021-10-07 12:44:51 +02:00
parent b151cee04b
commit 99801f0801
3 changed files with 9 additions and 10 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/controller/ReanalysisController.java
View File

@ -154,14 +154,14 @@ public class ReanalysisController implements ReanalysisResource {
if (force) {
filesToReanalyse.forEach(file -> {
fileStatusService.setStatusReprocess(dossierId, file.getId(), 1);
fileStatusService.setStatusReprocess(dossierId, file.getId(), 2);
});
} else {
var enhancedAndConvertedFiles = reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(convert(
fileStatusService.getAllStatuses(), FileModel.class, new FileModelMapper()));
enhancedAndConvertedFiles.forEach(file -> {
fileStatusService.setStatusReprocess(dossierId, file.getId(), 1);
fileStatusService.setStatusReprocess(dossierId, file.getId(), 2);
});
}

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

@ -81,8 +81,7 @@ public class FileService {
} else {
// the file is new, should create a new status for it.
log.info("File {} has no status yet, creating one and setting to unprocessed.", request.getFilename());
fileStatusService.createStatus(request.getDossierId(), fileId, request.getUploader(), request.getFilename(), request
.getData().length);
fileStatusService.createStatus(request.getDossierId(), fileId, request.getUploader(), request.getFilename(), 1);
}
return new JSONPrimitive<>(fileId);
}

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

@ -188,7 +188,7 @@ public class ManualRedactionService {
fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, now, true);
} else {
fileStatusPersistenceService.updateLastManualRedaction(fileId, now);
fileStatusService.setStatusReprocess(dossierId, fileId, 100);
fileStatusService.setStatusReprocess(dossierId, fileId, 2);
}
return ManualAddResponse.builder()
@ -321,7 +321,7 @@ public class ManualRedactionService {
fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, OffsetDateTime.now(), hasSuggestions);
} else {
fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
fileStatusService.setStatusReprocess(dossierId, fileId, 100);
fileStatusService.setStatusReprocess(dossierId, fileId, 2);
}
}
@ -410,10 +410,10 @@ public class ManualRedactionService {
ManualImageRecategorizationEntity imageRecategorization = recategorizationPersistenceService.findRecategorization(fileId, annotationId);
// if it was previously approved, revert the delete
if (imageRecategorization.getStatus() == AnnotationStatus.APPROVED) {
fileStatusService.setStatusReprocess(dossierId, fileId, 100);
fileStatusService.setStatusReprocess(dossierId, fileId, 2);
}
} else if (annotationStatus.equals(AnnotationStatus.APPROVED)) {
fileStatusService.setStatusReprocess(dossierId, fileId, 100);
fileStatusService.setStatusReprocess(dossierId, fileId, 2);
}
dossierPersistenceService.getAndValidateDossier(dossierId);
@ -510,7 +510,7 @@ public class ManualRedactionService {
log.debug("Adding entries for {} / {}", dossierId, fileId);
dictionaryController.addEntries(typeId, List.of(value), false);
fileStatusService.setStatusReprocess(dossierId, fileId, 100);
fileStatusService.setStatusReprocess(dossierId, fileId, 2);
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
}
@ -522,7 +522,7 @@ public class ManualRedactionService {
try {
log.debug("Deleting entries for {} / {}", dossierId, fileId);
dictionaryController.deleteEntries(typeId, List.of(value));
fileStatusService.setStatusReprocess(dossierId, fileId, 100);
fileStatusService.setStatusReprocess(dossierId, fileId, 2);
} catch (FeignException e) {
throw new BadRequestException(e.getMessage());
}