From ff5cbb510bcc93c599ce1beb82dc3cd8468a51f8 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Fri, 28 Apr 2023 13:09:40 +0200 Subject: [PATCH] RED-6009: Document Tree Structure * fixed build * slight refactor of AnnotationService --- redaction-service-image-v1/pom.xml | 4 +-- redaction-service-v1/pom.xml | 30 +++++++++++++++---- .../v1/server/RedactionIntegrationTest.java | 13 ++------ .../v1/server/annotate/AnnotationService.java | 7 +++-- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/redaction-service-image-v1/pom.xml b/redaction-service-image-v1/pom.xml index 29fa41cd..f2117f70 100644 --- a/redaction-service-image-v1/pom.xml +++ b/redaction-service-image-v1/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.iqser.red + com.knecon.fforesight platform-docker-dependency - 1.2.0 + 0.1.0 4.0.0 diff --git a/redaction-service-v1/pom.xml b/redaction-service-v1/pom.xml index 3cdcd5b2..f52c80d1 100644 --- a/redaction-service-v1/pom.xml +++ b/redaction-service-v1/pom.xml @@ -54,10 +54,12 @@ org.sonarsource.scanner.maven sonar-maven-plugin + 3.9.0.2155 org.owasp dependency-check-maven + 6.3.1 ALL @@ -65,12 +67,6 @@ org.jacoco jacoco-maven-plugin - 0.8.8 - - - org/drools/**/* - - prepare-agent @@ -88,5 +84,27 @@ + + + org.jacoco + jacoco-maven-plugin + 0.8.8 + + + prepare-agent + + prepare-agent + + + + report + + report-aggregate + + verify + + + + 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 0e47bf70..a78674ad 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 @@ -689,13 +689,6 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId())); AnalyzeResult result = analyzeService.analyze(request); - String annotatedFileName = Paths.get(filePath).getFileName().toString().replace(".pdf", "_annotated.pdf"); - File tmpFile = Paths.get(OsUtils.getTemporaryDirectory(), annotatedFileName).toFile(); - AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder().dossierId(TEST_DOSSIER_ID).fileId(TEST_FILE_ID).build()); - try (FileOutputStream fileOutputStream = new FileOutputStream(tmpFile)) { - fileOutputStream.write(annotateResponse.getDocument()); - } - RedactionLog redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID); assertTrue(redactionLog.getRedactionLogEntry().stream().anyMatch(entry -> entry.getValue().equals("Desiree et al"))); assertTrue(redactionLog.getRedactionLogEntry().stream().anyMatch(entry -> entry.getValue().equals("Melanie et al."))); @@ -724,9 +717,9 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { AnalyzeResult reanalyzeResult = analyzeService.reanalyze(request); redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID); - annotatedFileName = Paths.get(filePath).getFileName().toString().replace(".pdf", "_annotated2.pdf"); - tmpFile = Paths.get(OsUtils.getTemporaryDirectory(), annotatedFileName).toFile(); - annotateResponse = annotationService.annotate(AnnotateRequest.builder().dossierId(TEST_DOSSIER_ID).fileId(TEST_FILE_ID).build()); + String annotatedFileName = Paths.get(filePath).getFileName().toString().replace(".pdf", "_annotated2.pdf"); + File tmpFile = Paths.get(OsUtils.getTemporaryDirectory(), annotatedFileName).toFile(); + AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder().dossierId(TEST_DOSSIER_ID).fileId(TEST_FILE_ID).build()); try (FileOutputStream fileOutputStream = new FileOutputStream(tmpFile)) { fileOutputStream.write(annotateResponse.getDocument()); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/annotate/AnnotationService.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/annotate/AnnotationService.java index b754cae1..7fe81401 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/annotate/AnnotationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/annotate/AnnotationService.java @@ -71,14 +71,14 @@ public class AnnotationService { annotateRequest.getFileId(), FileType.ORIGIN)); - var mergedRedactionLog = redactionStorageService.getRedactionLog(annotateRequest.getDossierId(), annotateRequest.getFileId()); + var redactionLog = redactionStorageService.getRedactionLog(annotateRequest.getDossierId(), annotateRequest.getFileId()); var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId()); try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) { pdDocument.setAllSecurityToBeRemoved(true); dictionaryService.updateDictionary(annotateRequest.getDossierTemplateId(), annotateRequest.getDossierId()); - annotate(pdDocument, mergedRedactionLog, sectionsGrid); + annotate(pdDocument, redactionLog, sectionsGrid); try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) { pdDocument.save(byteArrayOutputStream); @@ -117,6 +117,9 @@ public class AnnotationService { List annotations = pdPage.getAnnotations(); for (RedactionLogEntry entry : logEntries) { + if (entry.lastChangeIsRemoved()) { + continue; + } annotations.addAll(createAnnotation(entry, page, pdPage.getRotation(), pdPage.getCropBox())); } }