Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-5223: Fixed not working tracing when comes from queue, upgraded ocr service #263

Merged
dominique.eiflaender1 merged 1 commits from RED-5223 into master 2023-12-12 15:13:20 +01:00
Conversation 6 Commits 1 Files Changed 3 +10 -2
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/build.gradle.kts
View File

@ -18,7 +18,7 @@ dependencies {
api("com.knecon.fforesight:layoutparser-service-internal-api:0.74.0")
api("com.iqser.red.service:search-service-api-v1:2.71.0")
api("com.giffing.bucket4j.spring.boot.starter:bucket4j-spring-boot-starter:0.4.0")
api("com.iqser.red.service:ocr-service-api-v1:3.10.0")
api("com.knecon.fforesight.service:ocr-service-api:4.5.0")
api("org.springframework.security:spring-security-acl:6.0.2")
api("org.springframework.boot:spring-boot-starter-mail:${springBootStarterVersion}")
api("org.springframework.boot:spring-boot-starter-data-jpa:${springBootStarterVersion}")

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

@ -47,6 +47,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.ProcessingStatus;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
import com.knecon.fforesight.service.ocr.v1.api.model.DocumentRequest;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
@ -415,7 +416,7 @@ public class FileStatusService {
private void addToOcrQueue(String dossierId, String fileId, int priority) {
rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_QUEUE, new com.iqser.red.service.ocr.v1.api.model.DocumentRequest(dossierId, fileId), message -> {
rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_QUEUE, new DocumentRequest(dossierId, fileId), message -> {
message.getMessageProperties().setPriority(priority);
return message;
});

7
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/Application.java
View File

@ -3,6 +3,7 @@ package com.iqser.red.service.peristence.v1.server;
import java.util.Map;
import java.util.Optional;
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@ -55,6 +56,7 @@ import io.micrometer.core.aop.TimedAspect;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.observation.ObservationRegistry;
import lombok.extern.slf4j.Slf4j;
import com.knecon.fforesight.tenantcommons.SimpleMessageListenerContainerCustomizer;
@Slf4j
@EnableAsync
@ -85,6 +87,11 @@ public class Application implements ApplicationContextAware {
}
@Bean
public SimpleMessageListenerContainerCustomizer messageListenerContainerCustomizer(){
return simpleMessageListenerContainer -> simpleMessageListenerContainer.setObservationEnabled(true);
}
@Bean
@ConditionalOnProperty(value = "cors.enabled", havingValue = "true")
public WebMvcConfigurer corsConfigurer() {