From afeee3811ca4edc68f2844a5ff1e3a0d31c8ef67 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Mon, 13 Dec 2021 13:26:45 +0100 Subject: [PATCH] RED-2439: Enabled to find surrounding text for manual redactions via queue --- .../ResizeRedactionPersistenceService.java | 6 + .../repository/ResizeRedactionRepository.java | 4 + .../configuration/MessagingConfiguration.java | 2 +- .../FileStatusProcessingUpdateService.java | 40 +++--- .../v1/server/service/FileStatusService.java | 19 ++- .../service/ManualRedactionService.java | 119 +++++++++++++----- .../integration/tests/FileProcessingTest.java | 4 + persistence-service-v1/pom.xml | 2 +- 8 files changed, 141 insertions(+), 55 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ResizeRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ResizeRedactionPersistenceService.java index 7b4ca7e08..3c24703ce 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ResizeRedactionPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ResizeRedactionPersistenceService.java @@ -43,6 +43,12 @@ public class ResizeRedactionPersistenceService { } + @Transactional + public void updateSurroundingText(AnnotationEntityId id, String textBefore, String textAfter){ + resizeRedactionRepository.updateSurroundingText(id, textBefore, textAfter); + } + + @Transactional public void updateStatus(String fileId, String annotationId, AnnotationStatus annotationStatus) { diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java index 9cf4f9d27..56fae69a6 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java @@ -32,4 +32,8 @@ public interface ResizeRedactionRepository extends JpaRepository findByFileIdIncludeDeletions(String fileId, boolean includeDeletions); + @Modifying + @Query("update ManualResizeRedactionEntity m set m.textBefore = :textBefore, m.textAfter = :textAfter where m.id = :id") + void updateSurroundingText(AnnotationEntityId id, String textBefore, String textAfter); + } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/configuration/MessagingConfiguration.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/configuration/MessagingConfiguration.java index b5c831175..a639bb0dc 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/configuration/MessagingConfiguration.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/configuration/MessagingConfiguration.java @@ -49,7 +49,7 @@ public class MessagingConfiguration { return QueueBuilder.durable(OCR_QUEUE) .withArgument("x-dead-letter-exchange", "") .withArgument("x-dead-letter-routing-key", OCR_DLQ) - .withArgument("x-max-priority", 2) + .withArgument("x-max-priority", 2) // Higher value is higher priority. .maxPriority(2) .build(); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusProcessingUpdateService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusProcessingUpdateService.java index 178aad519..ec3500791 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusProcessingUpdateService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusProcessingUpdateService.java @@ -1,13 +1,13 @@ package com.iqser.red.service.peristence.v1.server.service; -import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService; -import com.iqser.red.service.redaction.v1.model.AnalyzeResult; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.retry.support.RetryTemplate; import org.springframework.web.bind.annotation.RestController; -import java.util.Objects; +import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService; +import com.iqser.red.service.redaction.v1.model.AnalyzeResult; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; @Slf4j @RestController @@ -19,24 +19,36 @@ public class FileStatusProcessingUpdateService { private final IndexingService indexingService; private final DossierPersistenceService dossierPersistenceService; private final AnalysisFlagsCalculationService analysisFlagsCalculationService; + private final ManualRedactionService manualRedactionService; public void analysisSuccessful(String dossierId, String fileId, AnalyzeResult analyzeResult) { var dossier = dossierPersistenceService.getAndValidateDossier(dossierId); - retryTemplate.execute(retryContext -> { - log.info("Analysis Successful for dossier {} and file {}, Attempt to update status: {}", dossierId, fileId, retryContext - .getRetryCount()); - fileStatusService.setStatusSuccessful(dossierId, fileId, analyzeResult); - return null; - }); + switch (analyzeResult.getMessageType()) { - if (!analyzeResult.isWasReanalyzed()) { - indexingService.addToIndexingQueue(dossier.getDossierTemplateId(), dossierId, fileId, 2); + case SURROUNDING_TEXT: + fileStatusService.setStatusProcessed(analyzeResult.getFileId()); + manualRedactionService.updateManualRedactions(fileId, analyzeResult.getManualRedactions()); + break; + case REANALYSE: + case FULL_ANALYSE: + default: + retryTemplate.execute(retryContext -> { + log.info("Analysis Successful for dossier {} and file {}, Attempt to update status: {}", dossierId, fileId, retryContext + .getRetryCount()); + fileStatusService.setStatusSuccessful(dossierId, fileId, analyzeResult); + return null; + }); + + if (!analyzeResult.isWasReanalyzed()) { + indexingService.addToIndexingQueue(dossier.getDossierTemplateId(), dossierId, fileId, 2); + } + + analysisFlagsCalculationService.calculateFlags(dossierId, fileId); } - analysisFlagsCalculationService.calculateFlags(dossierId, fileId); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java index ce14953ee..dbefeed69 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java @@ -15,6 +15,8 @@ import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.do import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus; import com.iqser.red.service.redaction.v1.model.AnalyzeRequest; import com.iqser.red.service.redaction.v1.model.AnalyzeResult; +import com.iqser.red.service.redaction.v1.model.MessageType; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -73,6 +75,12 @@ public class FileStatusService { } + public void setStatusProcessed(String fileId) { + + fileStatusPersistenceService.updateProcessingStatus(fileId, ProcessingStatus.PROCESSED); + } + + public void setStatusProcessing(String fileId) { fileStatusPersistenceService.updateProcessingStatus(fileId, ProcessingStatus.PROCESSING); @@ -234,7 +242,12 @@ public class FileStatusService { var fileAttributes = fileStatus.getFileAttributes(); + boolean reanalyse = !fileStatus.getProcessingStatus().equals(ProcessingStatus.UNPROCESSED) && !fileStatus.getProcessingStatus() + .equals(ProcessingStatus.FULLREPROCESS) && fileStatus.getRulesVersion() == rulesController.getVersion(dossier.getDossierTemplateId()) && (fileStatus.getLastFileAttributeChange() == null || fileStatus.getLastProcessed() + .isAfter(fileStatus.getLastFileAttributeChange())); + var analyseRequest = AnalyzeRequest.builder() + .messageType(reanalyse ? MessageType.REANALYSE : MessageType.FULL_ANALYSE) .dossierId(dossierId) .sectionsToReanalyse(sectionsToReanalyse) .fileId(fileId) @@ -242,13 +255,9 @@ public class FileStatusService { .dossierTemplateId(dossier.getDossierTemplateId()) .lastProcessed(fileStatus.getLastProcessed()) .fileAttributes(convert(fileAttributes)) + .excludedPages(fileStatus.getExcludedPages()) .build(); - analyseRequest.setReanalyseOnlyIfPossible(!fileStatus.getProcessingStatus().equals(ProcessingStatus.UNPROCESSED) && !fileStatus.getProcessingStatus() - .equals(ProcessingStatus.FULLREPROCESS) && fileStatus.getRulesVersion() == rulesController.getVersion(dossier.getDossierTemplateId()) && (fileStatus.getLastFileAttributeChange() == null || fileStatus.getLastProcessed() - .isAfter(fileStatus.getLastFileAttributeChange()))); - - analyseRequest.setExcludedPages(fileStatus.getExcludedPages()); setStatusProcessing(fileId); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java index 3cc073066..5c2786049 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java @@ -1,11 +1,15 @@ package com.iqser.red.service.peristence.v1.server.service; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import com.iqser.red.service.peristence.v1.server.client.RedactionClient; +import com.iqser.red.service.peristence.v1.server.configuration.MessagingConfiguration; import com.iqser.red.service.peristence.v1.server.controller.DictionaryController; import com.iqser.red.service.peristence.v1.server.utils.ManualRedactionMapper; +import com.iqser.red.service.peristence.v1.server.utils.ManualResizeRedactionMapper; import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.*; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; @@ -14,11 +18,17 @@ import com.iqser.red.service.persistence.management.v1.processor.exception.NotFo import com.iqser.red.service.persistence.management.v1.processor.service.persistence.*; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ManualRedactionRepository; import com.iqser.red.service.persistence.service.v1.api.model.annotations.*; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus; +import com.iqser.red.service.redaction.v1.model.AnalyzeRequest; +import com.iqser.red.service.redaction.v1.model.MessageType; import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.RedactionLogEntry; + import feign.FeignException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; + +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; import java.nio.charset.StandardCharsets; @@ -51,7 +61,8 @@ public class ManualRedactionService { private final ManualRedactionProviderService manualRedactionProviderService; private final AnalysisFlagsCalculationService analysisFlagsCalculationService; private final StopwordService stopwordService; - private final RedactionClient redactionClient; + private final RabbitTemplate rabbitTemplate; + private final ObjectMapper objectMapper; private final HashFunction hashFunction = Hashing.murmur3_128(); @@ -75,15 +86,15 @@ public class ManualRedactionService { } } - String annotationId = hashFunction.hashString(fileId + addRedactionRequest, StandardCharsets.UTF_8) - .toString(); + String annotationId = hashFunction.hashString(fileId + addRedactionRequest, StandardCharsets.UTF_8).toString(); OffsetDateTime now = OffsetDateTime.now(); addRedactionPersistenceService.insert(fileId, annotationId, addRedactionRequest); Long commentId = null; if (addRedactionRequest.getComment() != null) { - commentId = addComment(fileId, annotationId, addRedactionRequest.getComment(), addRedactionRequest.getUser()).getId(); + commentId = addComment(fileId, annotationId, addRedactionRequest.getComment(), addRedactionRequest.getUser()) + .getId(); } handleAddToDictionary(fileId, annotationId, addRedactionRequest.getTypeId(), addRedactionRequest.getValue(), addRedactionRequest @@ -99,17 +110,11 @@ public class ManualRedactionService { analysisFlagsCalculationService.calculateFlags(dossierId, fileId); } - // TODO This is just a proof of concept. - var loaded = convert(getAddRedaction(fileId, annotationId), ManualRedactionEntry.class, new ManualRedactionMapper()); - ManualRedactions manualRedactions = ManualRedactions.builder() - .entriesToAdd(Set.of(loaded)) - .build(); - var withSurroundingText = redactionClient.addSurroundingText(dossierId, fileId, manualRedactions); - if(withSurroundingText != null) { - withSurroundingText.getEntriesToAdd().forEach(e -> { - addRedactionPersistenceService.updateSurroundingText(new AnnotationEntityId(annotationId, fileId), e.getTextBefore(), e - .getTextAfter()); - }); + if (!addRedactionRequest.isAddToDictionary() && !addRedactionRequest.isAddToDossierDictionary() && !addRedactionRequest + .isRectangle()) { + var loaded = convert(getAddRedaction(fileId, annotationId), ManualRedactionEntry.class, new ManualRedactionMapper()); + ManualRedactions manualRedactions = ManualRedactions.builder().entriesToAdd(Set.of(loaded)).build(); + addManualRedactionToAnalysisQueue(dossierId, fileId, manualRedactions); } return ManualAddResponse.builder().annotationId(annotationId).commentId(commentId).build(); @@ -131,8 +136,8 @@ public class ManualRedactionService { .getUser()).getId(); } - handleRemoveFromDictionary(dossierId, fileId, removeRedactionRequest.getAnnotationId(), removeRedactionRequest.getStatus(), - removeRedactionRequest.isRemoveFromDictionary(), false); + handleRemoveFromDictionary(dossierId, fileId, removeRedactionRequest.getAnnotationId(), removeRedactionRequest.getStatus(), removeRedactionRequest + .isRemoveFromDictionary(), false); if (removeRedactionRequest.getStatus().equals(AnnotationStatus.REQUESTED)) { fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, now, true); @@ -252,8 +257,9 @@ public class ManualRedactionService { return createdComment; } + public ManualAddResponse addResizeRedaction(String dossierId, String fileId, - ResizeRedactionRequest resizeRedactionRequest) { + ResizeRedactionRequest resizeRedactionRequest) { dossierPersistenceService.getAndValidateDossier(dossierId); @@ -275,6 +281,10 @@ public class ManualRedactionService { analysisFlagsCalculationService.calculateFlags(dossierId, fileId); + var loaded = convert(getResizeRedaction(fileId, resizeRedactionRequest.getAnnotationId()), ManualResizeRedaction.class, new ManualResizeRedactionMapper()); + ManualRedactions manualRedactions = ManualRedactions.builder().resizeRedactions(Set.of(loaded)).build(); + addManualRedactionToAnalysisQueue(dossierId, fileId, manualRedactions); + return ManualAddResponse.builder() .annotationId(resizeRedactionRequest.getAnnotationId()) .commentId(commentId) @@ -329,8 +339,8 @@ public class ManualRedactionService { var addRedaction = getAddRedaction(fileId, annotationId); var dossier = dossierPersistenceService.getAndValidateDossier(dossierId); - handleAddToDictionary(fileId, annotationId, addRedaction.getTypeId(), addRedaction.getValue(), addRedaction.getStatus(), - addRedaction.isAddToDictionary(), true, dossier.getId()); + handleAddToDictionary(fileId, annotationId, addRedaction.getTypeId(), addRedaction.getValue(), addRedaction.getStatus(), addRedaction + .isAddToDictionary(), true, dossier.getId()); addRedactionPersistenceService.softDelete(fileId, annotationId, OffsetDateTime.now()); @@ -353,8 +363,7 @@ public class ManualRedactionService { var removeRedaction = getRemoveRedaction(fileId, annotationId); - handleRemoveFromDictionary(dossierId, fileId, annotationId, removeRedaction.getStatus(), - removeRedaction.isRemoveFromDictionary(), true); + handleRemoveFromDictionary(dossierId, fileId, annotationId, removeRedaction.getStatus(), removeRedaction.isRemoveFromDictionary(), true); removeRedactionPersistenceService.softDelete(fileId, annotationId, OffsetDateTime.now()); if (removeRedaction.getStatus().equals(AnnotationStatus.REQUESTED)) { @@ -443,7 +452,8 @@ public class ManualRedactionService { @SuppressWarnings("PMD") - public void updateRemoveRedactionStatus(String dossierId, String fileId, String annotationId, AnnotationStatus annotationStatus) { + public void updateRemoveRedactionStatus(String dossierId, String fileId, String annotationId, + AnnotationStatus annotationStatus) { var dossier = dossierPersistenceService.getAndValidateDossier(dossierId); @@ -462,7 +472,6 @@ public class ManualRedactionService { var redactionLogEntry = redactionLogEntryOptional.get(); - if (annotationStatus == AnnotationStatus.APPROVED) { removeFromDictionary(buildTypeId(redactionLogEntry, dossier), redactionLogEntry.getValue(), dossierId, fileId); } else if (annotationStatus == AnnotationStatus.DECLINED) { @@ -482,7 +491,9 @@ public class ManualRedactionService { analysisFlagsCalculationService.calculateFlags(dossierId, fileId); } + private String buildTypeId(RedactionLogEntry redactionLogEntry, DossierEntity dossier) { + if (redactionLogEntry.isDossierDictionaryEntry()) { return toTypeId(redactionLogEntry.getType(), dossier.getDossierTemplateId(), dossier.getId()); } else { @@ -491,7 +502,8 @@ public class ManualRedactionService { } - public void updateForceRedactionStatus(String dossierId, String fileId, String annotationId, AnnotationStatus annotationStatus) { + public void updateForceRedactionStatus(String dossierId, String fileId, String annotationId, + AnnotationStatus annotationStatus) { dossierPersistenceService.getAndValidateDossier(dossierId); forceRedactionPersistenceService.updateStatus(fileId, annotationId, annotationStatus); @@ -501,7 +513,8 @@ public class ManualRedactionService { } - public void updateLegalBasisChangeStatus(String dossierId, String fileId, String annotationId, AnnotationStatus annotationStatus) { + public void updateLegalBasisChangeStatus(String dossierId, String fileId, String annotationId, + AnnotationStatus annotationStatus) { dossierPersistenceService.getAndValidateDossier(dossierId); legalBasisChangePersistenceService.updateStatus(fileId, annotationId, annotationStatus); @@ -535,7 +548,8 @@ public class ManualRedactionService { @SuppressWarnings("PMD") - public void updateAddRedactionStatus(String dossierId, String fileId, String annotationId, AnnotationStatus annotationStatus) { + public void updateAddRedactionStatus(String dossierId, String fileId, String annotationId, + AnnotationStatus annotationStatus) { dossierPersistenceService.getAndValidateDossier(dossierId); @@ -562,7 +576,8 @@ public class ManualRedactionService { } - public void updateResizeRedactionStatus(String dossierId, String fileId, String annotationId, AnnotationStatus annotationStatus) { + public void updateResizeRedactionStatus(String dossierId, String fileId, String annotationId, + AnnotationStatus annotationStatus) { dossierPersistenceService.getAndValidateDossier(dossierId); resizeRedactionPersistenceService.updateStatus(fileId, annotationId, annotationStatus); @@ -578,8 +593,9 @@ public class ManualRedactionService { } - private void handleAddToDictionary(String fileId, String annotationId, String typeId, String value, AnnotationStatus status, - boolean addToDictionary, boolean revert, String dossierId) { + private void handleAddToDictionary(String fileId, String annotationId, String typeId, String value, + AnnotationStatus status, boolean addToDictionary, boolean revert, + String dossierId) { if (status == AnnotationStatus.APPROVED) { addRedactionPersistenceService.updateStatus(fileId, annotationId, status, addToDictionary); @@ -596,9 +612,8 @@ public class ManualRedactionService { } - private void handleRemoveFromDictionary(String dossierId, String fileId, String annotationId, AnnotationStatus status, - boolean removeFromDictionary, boolean revert) { - + private void handleRemoveFromDictionary(String dossierId, String fileId, String annotationId, + AnnotationStatus status, boolean removeFromDictionary, boolean revert) { if (status == AnnotationStatus.APPROVED) { @@ -656,7 +671,6 @@ public class ManualRedactionService { private CommentEntity addComment(String fileId, String annotationId, String comment, String user) { - var createdComment = commentPersistenceService.insert(CommentEntity.builder() .text(comment) .fileId(fileId) @@ -708,4 +722,41 @@ public class ManualRedactionService { return false; } + + public void updateManualRedactions(String fileId, ManualRedactions manualRedactions) { + + manualRedactions.getEntriesToAdd().forEach(e -> { + addRedactionPersistenceService.updateSurroundingText(new AnnotationEntityId(e.getAnnotationId(), fileId), e.getTextBefore(), e + .getTextAfter()); + }); + + manualRedactions.getResizeRedactions().forEach(e -> { + resizeRedactionPersistenceService.updateSurroundingText(new AnnotationEntityId(e.getAnnotationId(), fileId), e + .getTextBefore(), e.getTextAfter()); + }); + } + + + private void addManualRedactionToAnalysisQueue(String dossierId, String fileId, ManualRedactions manualRedactions) { + + fileStatusPersistenceService.updateProcessingStatus(fileId, ProcessingStatus.PROCESSING); + + var analyseRequest = AnalyzeRequest.builder() + .messageType(MessageType.SURROUNDING_TEXT) + .dossierId(dossierId) + .fileId(fileId) + .manualRedactions(manualRedactions) + .build(); + + try { + rabbitTemplate.convertAndSend(MessagingConfiguration.REDACTION_QUEUE, objectMapper.writeValueAsString(analyseRequest), message -> { + message.getMessageProperties().setPriority(1); + return message; + }); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + + } + } 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 780f266c4..6541f3234 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 @@ -14,6 +14,7 @@ import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPers 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; import com.iqser.red.service.redaction.v1.model.AnalyzeResult; +import com.iqser.red.service.redaction.v1.model.MessageType; public class FileProcessingTest extends AbstractPersistenceServerServiceTest { @@ -47,6 +48,7 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest { assertThat(loadedFile.getProcessingStatus()).isEqualTo(ProcessingStatus.ERROR); fileProcessingClient.analysisSuccessful(dossier.getId(), file.getId(), AnalyzeResult.builder() + .messageType(MessageType.FULL_ANALYSE) .analysisVersion(100) .fileId(file.getId()) .dossierId(dossier.getId()) @@ -95,6 +97,7 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest { assertThat(loadedFile.getProcessingStatus()).isEqualTo(ProcessingStatus.ERROR); fileProcessingClient.analysisSuccessful(dossier.getId(), file.getId(), AnalyzeResult.builder() + .messageType(MessageType.FULL_ANALYSE) .analysisVersion(100) .fileId(file.getId()) .dossierId(dossier.getId()) @@ -135,6 +138,7 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest { var file = fileTesterAndProvider.testAndProvideFile(dossier); fileProcessingClient.analysisSuccessful(dossier.getId(), file.getId(), AnalyzeResult.builder() + .messageType(MessageType.FULL_ANALYSE) .analysisVersion(100) .fileId(file.getId()) .dossierId(dossier.getId()) diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index d5ff788a1..eff64e859 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -24,7 +24,7 @@ - 3.40.0 + 3.43.0 2.10.0 3.17.0 3.19.0