From 3fae3c0627a8c48d4063dfa7db52becbff4652ca Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Tue, 1 Aug 2023 10:44:59 +0200 Subject: [PATCH] update layoutparser version --- .../persistence-service-processor-v1/pom.xml | 2 +- .../queue/LayoutParsingFinishedMessageReceiver.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/pom.xml b/persistence-service-v1/persistence-service-processor-v1/pom.xml index ffc4021b0..42549b2fa 100644 --- a/persistence-service-v1/persistence-service-processor-v1/pom.xml +++ b/persistence-service-v1/persistence-service-processor-v1/pom.xml @@ -91,7 +91,7 @@ com.knecon.fforesight layoutparser-service-internal-api - 0.17.0 + 0.19.0 diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/LayoutParsingFinishedMessageReceiver.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/LayoutParsingFinishedMessageReceiver.java index 4313d11a8..7f4772ae3 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/LayoutParsingFinishedMessageReceiver.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/LayoutParsingFinishedMessageReceiver.java @@ -16,6 +16,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileErrorInfo; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingFinishedEvent; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingQueueNames; +import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -48,14 +49,14 @@ public class LayoutParsingFinishedMessageReceiver { @RabbitListener(queues = LayoutParsingQueueNames.LAYOUT_PARSING_DLQ) public void handleDLQMessage(Message failedMessage) { - var analyzeRequest = objectMapper.readValue(failedMessage.getBody(), AnalyzeRequest.class); + var analyzeRequest = objectMapper.readValue(failedMessage.getBody(), LayoutParsingRequest.class); log.info("Failed to process analyze request: {}", analyzeRequest); String errorCause = failedMessage.getMessageProperties().getHeader(MessagingConfiguration.X_ERROR_INFO_HEADER); OffsetDateTime timestamp = failedMessage.getMessageProperties().getHeader(MessagingConfiguration.X_ERROR_INFO_TIMESTAMP_HEADER); timestamp = timestamp != null ? timestamp : OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS); log.info("Failed to process layout parsing request, errorCause: {}, timestamp: {}", errorCause, timestamp); - fileStatusProcessingUpdateService.analysisFailed(analyzeRequest.getDossierId(), - analyzeRequest.getFileId(), + fileStatusProcessingUpdateService.analysisFailed(layoutParsingRequestIdentifierService.parseDossierId(analyzeRequest.identifier()), + layoutParsingRequestIdentifierService.parseFileId(analyzeRequest.identifier()), new FileErrorInfo(errorCause, LayoutParsingQueueNames.LAYOUT_PARSING_DLQ, "redaction-service", timestamp)); }