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

RED-3189: Fixed always full reanalyse files

Browse Source
This commit is contained in:
deiflaender 2022-01-17 12:41:21 +01:00
parent f98e7d4e06
commit 8f7f446cf3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ public class ReanalysisRequiredStatusService {
Map<String, DossierEntity> dossierMap) { Map<String, DossierEntity> dossierMap) {
if (ProcessingStatus.ERROR.equals(fileStatus.getProcessingStatus())) { if (ProcessingStatus.ERROR.equals(fileStatus.getProcessingStatus())) {
return new AnalysisRequiredResult(true, true); return new AnalysisRequiredResult(false, true);
} }
if (ProcessingStatus.PROCESSED.equals(fileStatus.getProcessingStatus()) || ProcessingStatus.UNPROCESSED.equals(fileStatus.getProcessingStatus())) { if (ProcessingStatus.PROCESSED.equals(fileStatus.getProcessingStatus()) || ProcessingStatus.UNPROCESSED.equals(fileStatus.getProcessingStatus())) {
@ -65,10 +65,10 @@ public class ReanalysisRequiredStatusService {
case UNDER_REVIEW: case UNDER_REVIEW:
case UNDER_APPROVAL: case UNDER_APPROVAL:
if (fileStatus.getLastProcessed() == null) { if (fileStatus.getLastProcessed() == null) {
return new AnalysisRequiredResult(true, true); return new AnalysisRequiredResult(false, true);
} }
if (fileStatus.getLastFileAttributeChange() != null && fileStatus.getLastProcessed().isBefore(fileStatus.getLastFileAttributeChange())) { if (fileStatus.getLastFileAttributeChange() != null && fileStatus.getLastProcessed().isBefore(fileStatus.getLastFileAttributeChange())) {
return new AnalysisRequiredResult(true, true); return new AnalysisRequiredResult(true, false);
} else { } else {
return requiresReanalysisBasedOnVersionDifference(fileStatus, dossierTemplateVersionMap, dossierVersionMap, dossierMap); return requiresReanalysisBasedOnVersionDifference(fileStatus, dossierTemplateVersionMap, dossierVersionMap, dossierMap);
} }

10
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java
View File

@ -64,13 +64,13 @@ public class AutomaticAnalysisScheduler {
var next = allStatusesIterator.next(); var next = allStatusesIterator.next();
// in case the file doesn't have numberOfPages set, we assume an average. // in case the file doesn't have numberOfPages set, we assume an average.
worstCaseScenarioQueuedPages += next.getNumberOfPages() <= 0 ? pageFactor : next.getNumberOfPages(); worstCaseScenarioQueuedPages += next.getNumberOfPages() <= 0 ? pageFactor : next.getNumberOfPages();
log.info("Queued file: {} for automatic analysis!", next.getFilename());
if (next.isReanalysisRequired()) { if (next.isFullAnalysisRequired()) {
fileStatusService.setStatusReprocess(next.getDossierId(), next.getId(), 1); log.info("Queued file: {} for automatic full analysis! ", next.getFilename());
}
if (next.isAnalysisRequired()) {
fileStatusService.setStatusFullReprocess(next.getDossierId(), next.getId(), 1); fileStatusService.setStatusFullReprocess(next.getDossierId(), next.getId(), 1);
} else if(next.isReanalysisRequired()){
log.info("Queued file: {} for automatic reanalysis! ", next.getFilename());
fileStatusService.setStatusReprocess(next.getDossierId(), next.getId(), 1);
} }
} }
} }