From 8f7f446cf3466d445f3dfa0309367bcc6bce6728 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Mon, 17 Jan 2022 12:41:21 +0100 Subject: [PATCH] RED-3189: Fixed always full reanalyse files --- .../service/ReanalysisRequiredStatusService.java | 6 +++--- .../service/scheduler/AutomaticAnalysisScheduler.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java index 403151ac7..770a6f02b 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java @@ -55,7 +55,7 @@ public class ReanalysisRequiredStatusService { Map dossierMap) { 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())) { @@ -65,10 +65,10 @@ public class ReanalysisRequiredStatusService { case UNDER_REVIEW: case UNDER_APPROVAL: if (fileStatus.getLastProcessed() == null) { - return new AnalysisRequiredResult(true, true); + return new AnalysisRequiredResult(false, true); } if (fileStatus.getLastFileAttributeChange() != null && fileStatus.getLastProcessed().isBefore(fileStatus.getLastFileAttributeChange())) { - return new AnalysisRequiredResult(true, true); + return new AnalysisRequiredResult(true, false); } else { return requiresReanalysisBasedOnVersionDifference(fileStatus, dossierTemplateVersionMap, dossierVersionMap, dossierMap); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java index ba7583977..6bd8260ed 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java @@ -64,13 +64,13 @@ public class AutomaticAnalysisScheduler { var next = allStatusesIterator.next(); // in case the file doesn't have numberOfPages set, we assume an average. worstCaseScenarioQueuedPages += next.getNumberOfPages() <= 0 ? pageFactor : next.getNumberOfPages(); - log.info("Queued file: {} for automatic analysis!", next.getFilename()); - if (next.isReanalysisRequired()) { - fileStatusService.setStatusReprocess(next.getDossierId(), next.getId(), 1); - } - if (next.isAnalysisRequired()) { + if (next.isFullAnalysisRequired()) { + log.info("Queued file: {} for automatic full analysis! ", next.getFilename()); 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); } } }