diff --git a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts index 96bccabd..5678254b 100644 --- a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } description = "redaction-service-api-v1" -val persistenceServiceVersion = "2.581.0" +val persistenceServiceVersion = "2.587.0" dependencies { implementation("org.springframework:spring-web:6.0.12") diff --git a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts index 75fef208..80302e7b 100644 --- a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts @@ -16,7 +16,7 @@ val layoutParserVersion = "0.181.0" val jacksonVersion = "2.15.2" val droolsVersion = "9.44.0.Final" val pdfBoxVersion = "3.0.0" -val persistenceServiceVersion = "2.581.0" +val persistenceServiceVersion = "2.587.0" val llmServiceVersion = "1.11.0" val springBootStarterVersion = "3.1.5" val springCloudVersion = "4.0.4" diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/DocumentSearchService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/DocumentSearchService.java index 88cf2c2d..68114ffc 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/DocumentSearchService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/DocumentSearchService.java @@ -68,6 +68,7 @@ public class DocumentSearchService { .section(bulkLocalRequest.getSection()) .foundTerms(foundTerms) .comment(bulkLocalRequest.getComment()) + .userId(bulkLocalRequest.getUserId()) .build(); rabbitTemplate.convertAndSend(QueueNames.SEARCH_TERM_OCCURRENCES_RESPONSE_EXCHANGE, TenantContext.getTenantId(), bulkLocalResponse); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/DocumentSearchServiceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/DocumentSearchServiceTest.java index d8285366..e604a2a1 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/DocumentSearchServiceTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/DocumentSearchServiceTest.java @@ -108,7 +108,14 @@ public class DocumentSearchServiceTest extends AbstractRedactionIntegrationTest analyzeDocumentStructure(LayoutParsingType.REDACT_MANAGER, request); analyzeService.analyze(request); - BulkLocalRequest bulkLocalRequest = BulkLocalRequest.builder().searchTerm("AAOEL").type("type").reason("reason").legalBasis("legalBasis").comment("comment").build(); + BulkLocalRequest bulkLocalRequest = BulkLocalRequest.builder() + .searchTerm("AAOEL") + .type("type") + .reason("reason") + .legalBasis("legalBasis") + .comment("comment") + .userId("MyUser") + .build(); request.setBulkLocalRequest(bulkLocalRequest); documentSearchService.searchTermOccurrences(request); @@ -127,6 +134,7 @@ public class DocumentSearchServiceTest extends AbstractRedactionIntegrationTest } + @Test @SneakyThrows public void testSearchTermOccurrencesFilteredByPageNumbers() { @@ -137,7 +145,14 @@ public class DocumentSearchServiceTest extends AbstractRedactionIntegrationTest analyzeDocumentStructure(LayoutParsingType.REDACT_MANAGER, request); analyzeService.analyze(request); - BulkLocalRequest bulkLocalRequest = BulkLocalRequest.builder().searchTerm("SANCO/1426/2001").type("type").reason("reason").legalBasis("legalBasis").pageNumbers(Set.of(9, 127, 147)).build(); + BulkLocalRequest bulkLocalRequest = BulkLocalRequest.builder() + .searchTerm("SANCO/1426/2001") + .type("type") + .reason("reason") + .legalBasis("legalBasis") + .pageNumbers(Set.of(9, 127, 147)) + .userId("MyUser") + .build(); request.setBulkLocalRequest(bulkLocalRequest); documentSearchService.searchTermOccurrences(request);