diff --git a/search-service-v1/search-service-server-v1/pom.xml b/search-service-v1/search-service-server-v1/pom.xml index 57d966f..79b7750 100644 --- a/search-service-v1/search-service-server-v1/pom.xml +++ b/search-service-v1/search-service-server-v1/pom.xml @@ -23,14 +23,8 @@ com.iqser.red.service - file-management-service-api-v1 - 2.47.0 - - - com.iqser.red.service - configuration-service-api-v1 - - + persistence-service-api-v1 + 0.6.0 diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusClient.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusClient.java index 40bf13c..4c800ac 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusClient.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusClient.java @@ -2,9 +2,9 @@ package com.iqser.red.service.search.v1.server.client; import org.springframework.cloud.openfeign.FeignClient; -import com.iqser.red.service.file.management.v1.api.resources.StatusResource; +import com.iqser.red.service.persistence.service.v1.api.resources.StatusResource; -@FeignClient(name = "StatusResource", url = "${file-management-service.url}") +@FeignClient(name = "StatusResource", url = "${persistence-service.url}") public interface FileStatusClient extends StatusResource { } diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusProcessingUpdateClient.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusProcessingUpdateClient.java index 71acd71..2b2ed2b 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusProcessingUpdateClient.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusProcessingUpdateClient.java @@ -2,8 +2,8 @@ package com.iqser.red.service.search.v1.server.client; import org.springframework.cloud.openfeign.FeignClient; -import com.iqser.red.service.file.management.v1.api.resources.FileStatusProcessingUpdateResource; +import com.iqser.red.service.persistence.service.v1.api.resources.FileStatusProcessingUpdateResource; -@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${file-management-service.url}") +@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}") public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource { } diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java index 31681f5..5d3f5ea 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java @@ -11,7 +11,6 @@ import org.springframework.stereotype.Service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.file.management.v1.api.model.FileStatus; import com.iqser.red.service.search.v1.model.IndexMessage; import com.iqser.red.service.search.v1.server.client.FileStatusClient; import com.iqser.red.service.search.v1.server.client.FileStatusProcessingUpdateClient; @@ -43,7 +42,7 @@ public class IndexingMessageReceiver { var indexRequest = objectMapper.readValue(in, IndexMessage.class); log.info("Processing indexing request: {}", indexRequest); fileStatusProcessingUpdateClient.indexing(indexRequest.getDossierId(), indexRequest.getFileId()); - FileStatus fileStatus = fileStatusClient.getFileStatus(indexRequest.getDossierId(), indexRequest.getFileId()); + var fileStatus = fileStatusClient.getFileStatus(indexRequest.getDossierId(), indexRequest.getFileId()); Text text = textStorageService.getText(indexRequest.getDossierId(), indexRequest.getFileId()); documentIndexService.indexDocument( indexRequest.getDossierTemplateId(),indexRequest.getDossierId(), indexRequest.getFileId(), fileStatus.getFilename(), text); fileStatusProcessingUpdateClient.indexingSuccessful(indexRequest.getDossierId(), indexRequest.getFileId()); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/TextStorageService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/TextStorageService.java index ef8ef82..9160f1e 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/TextStorageService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/TextStorageService.java @@ -6,7 +6,7 @@ import org.springframework.core.io.InputStreamResource; import org.springframework.stereotype.Service; import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.file.management.v1.api.model.FileType; +import com.iqser.red.service.persistence.service.v1.api.model.FileType; import com.iqser.red.service.search.v1.server.model.Text; import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist; import com.iqser.red.storage.commons.service.StorageService; diff --git a/search-service-v1/search-service-server-v1/src/main/resources/application.yml b/search-service-v1/search-service-server-v1/src/main/resources/application.yml index 1aa953d..54fe63d 100644 --- a/search-service-v1/search-service-server-v1/src/main/resources/application.yml +++ b/search-service-v1/search-service-server-v1/src/main/resources/application.yml @@ -1,7 +1,7 @@ info: description: Search Service Server V1 -file-management-service.url: "http://file-management-service-v1:8080" +persistence-service.url: "http://persistence-service-v1:8080" server: port: 8080