From 09fc65541f571d2938e5e1b2ee26859a4e832646 Mon Sep 17 00:00:00 2001 From: devplant Date: Mon, 16 Jan 2023 12:43:23 +0200 Subject: [PATCH] RED-5724 - Pressing Reanalyze-Button should reset processing_error_counter - reset the counter in state of REPROCESS --- .../FileStatusPersistenceService.java | 1 + .../integration/tests/FileProcessingTest.java | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java index 8e6f37f2d..247dcf26e 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java @@ -481,6 +481,7 @@ public class FileStatusPersistenceService { return fileRepository.findById(fileId).map(FileEntity::getProcessingErrorCounter).orElse(0) + 1; case PROCESSED: + case REPROCESS: return 0; default: diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java index 26fb88225..ca9c70bd1 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java @@ -3,7 +3,9 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; +import java.util.Set; +import com.iqser.red.service.peristence.v1.server.integration.client.ReanalysisClient; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +38,9 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest { @Autowired private UploadClient uploadClient; + @Autowired + private ReanalysisClient reanalysisClient; + @Test public void testFileProcessing() { @@ -203,4 +208,21 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest { } + @Test + public void testFileProcessingInErrorStateAndReanalyise() { + + var dossier = dossierTesterAndProvider.provideTestDossier(); + + var file = fileTesterAndProvider.testAndProvideFile(dossier); + + fileProcessingClient.analysisFailed(dossier.getId(), file.getId()); + var loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); + assertThat(loadedFile.getProcessingStatus()).isEqualTo(ProcessingStatus.ERROR); + + reanalysisClient.reanalyzeFiles(dossier.getId(), Set.of(loadedFile.getId()), true); + loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); + assertThat(loadedFile.getProcessingStatus()).isEqualTo(ProcessingStatus.FULL_PROCESSING); + + } + }