From b89b90f4bac5f334d80b5d3c9b1f42bf5f29e656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Tue, 19 Dec 2023 14:15:47 +0100 Subject: [PATCH] RED-8034: Excluded pages is indendent from analyse --- .../redaction-service-api-v1/build.gradle.kts | 2 +- .../redaction-service-server-v1/build.gradle.kts | 2 +- .../v1/server/service/AnalyzeService.java | 13 ------------- .../server/service/EntityLogCreatorService.java | 16 ---------------- .../v1/server/RedactionIntegrationTest.java | 2 -- .../AnalyseFileRealDataIntegrationTest.java | 1 - 6 files changed, 2 insertions(+), 34 deletions(-) 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 5ecbd3cb..d16f9488 100644 --- a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts @@ -7,7 +7,7 @@ description = "redaction-service-api-v1" dependencies { implementation("org.springframework:spring-web:6.0.12") - implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.240.0") + implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.279.0") } publishing { 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 50fb28b5..05f0ce09 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.75.0" val jacksonVersion = "2.15.2" val droolsVersion = "9.44.0.Final" val pdfBoxVersion = "3.0.0" -val persistenceServiceVersion = "2.275.0" +val persistenceServiceVersion = "2.279.0" val springBootStarterVersion = "3.1.5" configurations { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java index 9da5dcbb..ffe7cc3b 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java @@ -327,7 +327,6 @@ public class AnalyzeService { redactionLog.setDictionaryVersion(dictionaryVersion.getDossierTemplateVersion()); redactionLog.setDossierDictionaryVersion(dictionaryVersion.getDossierVersion()); - excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages()); RedactionLogChanges redactionLogChange = redactionChangeLogService.computeChanges(previousRedactionLog, redactionLog, analyzeRequest.getAnalysisNumber()); redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange.getRedactionLog()); @@ -420,16 +419,4 @@ public class AnalyzeService { return legalBasis.stream().map(l -> new RedactionLogLegalBasis(l.getName(), l.getDescription(), l.getReason())).collect(Collectors.toList()); } - - private void excludeExcludedPages(RedactionLog redactionLog, Set excludedPages) { - - if (excludedPages != null && !excludedPages.isEmpty()) { - redactionLog.getRedactionLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> { - if (excludedPages.contains(pos.getPage())) { - entry.setExcluded(true); - } - })); - } - } - } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java index 7ec009a0..a04664e8 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java @@ -87,7 +87,6 @@ public class EntityLogCreatorService { entityLog.setEntityLogEntry(importedRedactionFilteredEntries); List previousExistingEntityLogEntries = getPreviousEntityLogEntries(analyzeRequest.getDossierId(), analyzeRequest.getFileId()); entityChangeLogService.computeChanges(previousExistingEntityLogEntries, entityLogEntries, analyzeRequest.getAnalysisNumber()); - excludeExcludedPages(entityLog, analyzeRequest.getExcludedPages()); return entityLog; } @@ -141,8 +140,6 @@ public class EntityLogCreatorService { previousEntityLog.getEntityLogEntry().addAll(newEntityLogWithImportedEntities); - excludeExcludedPages(previousEntityLog, analyzeRequest.getExcludedPages()); - return updateVersionsAndReturnChanges(previousEntityLog, dictionaryVersion, analyzeRequest.getDossierTemplateId(), hasChanges); } @@ -345,17 +342,4 @@ public class EntityLogCreatorService { return legalBasis.stream().map(l -> new EntityLogLegalBasis(l.getName(), l.getDescription(), l.getReason())).collect(Collectors.toList()); } - - private void excludeExcludedPages(EntityLog entityLog, Set excludedPages) { - - if (excludedPages != null && !excludedPages.isEmpty()) { - entityLog.getEntityLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> { - if (excludedPages.contains(pos.getPageNumber())) { - entry.setExcluded(true); - } - })); - } - - } - } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index 084eb2dd..94f9bc45 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -421,7 +421,6 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { long start = System.currentTimeMillis(); AnalyzeRequest request = uploadFileToStorage(fileName); - request.setExcludedPages(Set.of(1)); request.setFileAttributes(List.of(FileAttribute.builder() .id("fileAttributeId") @@ -576,7 +575,6 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { long start = System.currentTimeMillis(); AnalyzeRequest request = uploadFileToStorage(fileName); - request.setExcludedPages(Set.of(1)); request.setFileAttributes(List.of(FileAttribute.builder() .id("fileAttributeId") diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/AnalyseFileRealDataIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/AnalyseFileRealDataIntegrationTest.java index 08a261e2..d5215b4a 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/AnalyseFileRealDataIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/AnalyseFileRealDataIntegrationTest.java @@ -44,7 +44,6 @@ public class AnalyseFileRealDataIntegrationTest extends LiveDataIntegrationTest AnalyzeRequest ar = AnalyzeRequest.builder().fileId(FILE_ID).dossierId(DOSSIER_ID) .analysisNumber(1).dossierTemplateId(DOSSIER_TEMPLATE_ID) .lastProcessed(OffsetDateTime.now()) - .excludedPages(Set.of()) .fileAttributes(List.of()) .build(); -- 2.47.2