From 21523a7796c6d33f8c5106f21a586590456e30e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Mon, 29 Jul 2024 10:00:09 +0200 Subject: [PATCH] RED-9760: Fixed send updates to wrong exchange --- .../service/ocr/v1/server/queue/OcrMessageSender.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/azure-ocr-service/azure-ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageSender.java b/azure-ocr-service/azure-ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageSender.java index dbe523a..1e5afb6 100644 --- a/azure-ocr-service/azure-ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageSender.java +++ b/azure-ocr-service/azure-ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageSender.java @@ -8,7 +8,6 @@ import com.knecon.fforesight.service.ocr.processor.service.IOcrMessageSender; import com.knecon.fforesight.service.ocr.v1.api.model.DocumentRequest; import com.knecon.fforesight.service.ocr.v1.api.model.OCRStatusUpdateResponse; import com.knecon.fforesight.service.ocr.v1.server.configuration.MessagingConfiguration; -import com.knecon.fforesight.tenantcommons.TenantContext; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; @@ -28,7 +27,7 @@ public class OcrMessageSender implements IOcrMessageSender { public void sendOcrFinished(String fileId, int totalImages) { rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE, - TenantContext.getTenantId(), + OCRStatusUpdateResponse.builder().fileId(fileId).numberOfPagesToOCR(totalImages).numberOfOCRedPages(totalImages).ocrFinished(true).build()); } @@ -36,7 +35,7 @@ public class OcrMessageSender implements IOcrMessageSender { public void sendOCRStarted(String fileId) { rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE, - TenantContext.getTenantId(), + OCRStatusUpdateResponse.builder().fileId(fileId).ocrStarted(true).build()); } @@ -45,7 +44,7 @@ public class OcrMessageSender implements IOcrMessageSender { public void sendUpdate(String fileId, int finishedImages, int totalImages) { rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE, - TenantContext.getTenantId(), + OCRStatusUpdateResponse.builder().fileId(fileId).numberOfPagesToOCR(totalImages).numberOfOCRedPages(finishedImages).build()); } @@ -53,7 +52,7 @@ public class OcrMessageSender implements IOcrMessageSender { public void sendOcrResponse(String dossierId, String fileId) { - rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_RESPONSE_QUEUE, TenantContext.getTenantId(), new DocumentRequest(dossierId, fileId)); + rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_RESPONSE_QUEUE, new DocumentRequest(dossierId, fileId)); } }