Updated integration of OCR service

persistence-service-v1/persistence-service-processor-v1/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
         exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1")
         exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1")
     }
-    api("com.knecon.fforesight.service:ocr-service-api:4.5.0") {
+    api("com.knecon.fforesight.service:ocr-service-api:4.24.0") {
         exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1")
         exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1")
     }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/MessagingConfiguration.java

@@ -239,7 +239,7 @@ public class MessagingConfiguration {
 
 
     @Bean
-    public Queue ocrQueue() {
+    public Queue ocrRequestQueue() {
 
         return QueueBuilder.durable(OCR_REQUEST_QUEUE)
                 .withArgument("x-dead-letter-exchange", "")
@@ -249,6 +249,21 @@ public class MessagingConfiguration {
                 .build();
     }
 
+    @Bean
+    public Queue ocrResponseQueue() {
+
+        return QueueBuilder.durable(OCR_RESPONSE_QUEUE)
+                .build();
+    }
+
+
+    @Bean
+    public Queue ocrDLQ() {
+
+        return QueueBuilder.durable(OCR_DLQ)
+                .build();
+    }
+
 
     @Bean
     public Queue downloadQueue() {

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java

@@ -11,6 +11,7 @@ import java.util.stream.Collectors;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
 
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierTemplatePersistenceService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
@@ -70,6 +71,7 @@ public class FileStatusService {
 
     FileStatusPersistenceService fileStatusPersistenceService;
     DossierPersistenceService dossierPersistenceService;
+    DossierTemplatePersistenceService dossierTemplatePersistenceService;
     RabbitTemplate rabbitTemplate;
     ManualRedactionProviderService manualRedactionProviderService;
     FileManagementStorageService fileManagementStorageService;
@@ -458,7 +460,8 @@ public class FileStatusService {
 
     public void addToOcrQueue(String dossierId, String fileId, int priority) {
 
-        rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_REQUEST_QUEUE, new DocumentRequest(dossierId, fileId), message -> {
+        var removeWatermark = dossierTemplatePersistenceService.getDossierTemplate(dossierPersistenceService.getDossierTemplateId(dossierId)).isRemoveWatermark();
+        rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_REQUEST_QUEUE, new DocumentRequest(dossierId, fileId, removeWatermark), message -> {
             message.getMessageProperties().setPriority(priority);
             return message;
         });

persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yaml

@@ -125,7 +125,6 @@ fforesight:
   keycloak:
     ignored-endpoints: [ '/redaction-gateway-v1','/actuator/health/**', '/redaction-gateway-v1/async/download/with-ott/**',
                          '/internal-api/**', '/redaction-gateway-v1/docs/swagger-ui',
-                         '/redaction-gateway-v1/**',
                          '/redaction-gateway-v1/docs/**','/redaction-gateway-v1/docs',
                          '/api', '/api/','/api/docs/**','/api/docs','/api/docs/swagger-ui' ]
     enabled: true