From 7e6dd0a7e135b9fd673f2413bd0e9e37c10394f2 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 3 Dec 2021 11:00:53 +0100 Subject: [PATCH] RED-2979: Fixed failing scheduled reanalysis if dossier of the file is deleted --- .../server/service/scheduler/AutomaticAnalysisScheduler.java | 4 ++++ 1 file changed, 4 insertions(+) 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 c5391a6dd..ba7583977 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 @@ -5,6 +5,7 @@ import com.iqser.red.service.peristence.v1.server.service.FileStatusService; import com.iqser.red.service.peristence.v1.server.service.ReanalysisRequiredStatusService; import com.iqser.red.service.peristence.v1.server.utils.FileModelMapper; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierStatus; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus; @@ -14,6 +15,7 @@ import org.springframework.amqp.core.AmqpAdmin; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; import java.util.List; @@ -40,6 +42,7 @@ public class AutomaticAnalysisScheduler { } + @Transactional @Scheduled(fixedDelay = 10000, initialDelay = 10000) public void checkFilesThatRequireReanalysisAndQueueIfPossible() { @@ -85,6 +88,7 @@ public class AutomaticAnalysisScheduler { .filter(f -> !f.getProcessingStatus().equals(ProcessingStatus.DELETED)) .filter(f -> !f.getWorkflowStatus().equals(WorkflowStatus.APPROVED)) .filter(f -> !isProcessing(f)) + .filter(f -> f.getDossier().getSoftDeletedTime() == null && f.getDossier().getHardDeletedTime() == null) .collect(Collectors.toList()), FileModel.class, new FileModelMapper())) .stream() .filter(FileModel::isAnalysisRequired)