Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Merge branch 'RED-10104' into 'master'

Browse Source 
RED-10104: Add rectangle functionality to bulk-local/add endpoint

Closes RED-10104

See merge request redactmanager/redaction-service!538
This commit is contained in:
Maverick Studer 2024-10-14 17:19:41 +02:00
commit 9e032cf1a8
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-service-v1/redaction-service-api-v1/build.gradle.kts
View File

@ -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")

2
redaction-service-v1/redaction-service-server-v1/build.gradle.kts
View File

@ -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"

1
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/DocumentSearchService.java
View File

@ -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);

19
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/DocumentSearchServiceTest.java
View File

@ -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);