From e410383fb68d11401553a4848717302756d07157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kilian=20Sch=C3=BCttler?= Date: Thu, 14 Sep 2023 17:03:08 +0200 Subject: [PATCH] DM-285: downgrade storage-service --- .../build.gradle.kts | 6 +++--- .../v1/server/service/AnalyzeService.java | 1 + .../service/ComponentLogCreatorService.java | 6 +++--- .../service/RedactionLogCreatorService.java | 16 ++++++++++++++++ .../FileSystemBackedStorageService.java | 19 ++++++++++--------- 5 files changed, 33 insertions(+), 15 deletions(-) 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 9d377f6e..5681c0cb 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.70.0" val jacksonVersion = "2.15.2" val droolsVersion = "8.43.0.Final" val pdfBoxVersion = "3.0.0" -val persistenceServiceVersion = "2.168.0" +val persistenceServiceVersion = "2.173.0" configurations { all { @@ -34,8 +34,8 @@ dependencies { implementation("com.iqser.red.commons:metric-commons:2.3.0") implementation("com.iqser.red.commons:dictionary-merge-commons:1.5.0") - implementation("com.iqser.red.commons:storage-commons:2.43.0") - implementation("com.knecon.fforesight:tenant-commons:0.13.0") + implementation("com.iqser.red.commons:storage-commons:2.40.0") + implementation("com.knecon.fforesight:tenant-commons:0.10.0") implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}") 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 16846c9e..025cf17a 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 @@ -311,6 +311,7 @@ public class AnalyzeService { .analysisVersion(redactionServiceSettings.getAnalysisVersion()) .analysisNumber(analyzeRequest.getAnalysisNumber()) .rulesVersion(entityLog.getRulesVersion()).componentRulesVersion(kieWrapperComponentRules.rulesVersion()) + .componentRulesVersion(kieWrapperComponentRules.rulesVersion()) .dictionaryVersion(entityLog.getDictionaryVersion()) .legalBasisVersion(entityLog.getLegalBasisVersion()) .dossierDictionaryVersion(entityLog.getDossierDictionaryVersion()) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ComponentLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ComponentLogCreatorService.java index 83a500fa..184c61d7 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ComponentLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ComponentLogCreatorService.java @@ -33,8 +33,8 @@ public class ComponentLogCreatorService { return ComponentLogEntry.builder() .value(component.getValue()) - .transformation(component.getTransformation()).originalValue(component.getReferences().stream().sorted(EntityComparators.start()).map(Entity::getValue).toList()) - .componentEntityReferences(toComponentEntityReferences(component.getReferences())) + .transformation(component.getTransformation()) + .componentEntityReferences(toComponentEntityReferences(component.getReferences().stream().sorted(EntityComparators.start()).toList())) .build(); } @@ -48,7 +48,7 @@ public class ComponentLogCreatorService { private ComponentEntityReference toComponentEntityReference(Entity entity) { return ComponentEntityReference.builder() - .id(entity.getId()) + .id(entity.getId()).value(entity.getValue()) .page(entity.getPositions().stream().findFirst().map(Position::getPageNumber).orElse(0)) .reason(entity.getReason()) .ruleIdentifier(entity.getMatchedRule()) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java index ddcc9dcd..622d87a5 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java @@ -17,6 +17,7 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ManualChange; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Comment; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine; +import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ManualRedactionType; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogComment; @@ -222,6 +223,21 @@ public class RedactionLogCreatorService { ManualChange manualChange1 = new ManualChange(); BeanUtils.copyProperties(manualChange, manualChange1); + manualChange1.setManualRedactionType(switch (manualChange.getManualRedactionType()) { + case ADD_LOCALLY -> ManualRedactionType.ADD_LOCALLY; + case ADD_TO_DICTIONARY -> ManualRedactionType.ADD_TO_DICTIONARY; + case REMOVE_LOCALLY -> ManualRedactionType.REMOVE_LOCALLY; + case REMOVE_FROM_DICTIONARY -> ManualRedactionType.REMOVE_FROM_DICTIONARY; + case FORCE_REDACT -> ManualRedactionType.FORCE_REDACT; + case FORCE_HINT -> ManualRedactionType.FORCE_HINT; + case RECATEGORIZE -> ManualRedactionType.RECATEGORIZE; + case LEGAL_BASIS_CHANGE -> ManualRedactionType.LEGAL_BASIS_CHANGE; + case RESIZE -> ManualRedactionType.RESIZE; + }); + manualChange1.setProcessedDate(manualChange.getProcessedDate()); + manualChange1.setRequestedDate(manualChange.getRequestedDate()); + manualChange1.setAnnotationStatus(manualChange.getAnnotationStatus()); + manualChange1.setPropertyChanges(manualChange.getPropertyChanges()); return manualChange1; } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java index 199b4200..4195d9f2 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java @@ -1,12 +1,6 @@ package com.iqser.red.service.redaction.v1.server; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.commons.jackson.ObjectMapperFactory; -import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist; -import com.iqser.red.storage.commons.service.StorageService; -import lombok.SneakyThrows; -import org.apache.commons.io.IOUtils; -import org.springframework.core.io.InputStreamResource; +import static java.io.File.createTempFile; import java.io.File; import java.io.FileInputStream; @@ -18,7 +12,15 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static java.io.File.createTempFile; +import org.apache.commons.io.IOUtils; +import org.springframework.core.io.InputStreamResource; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.iqser.red.commons.jackson.ObjectMapperFactory; +import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist; +import com.iqser.red.storage.commons.service.StorageService; + +import lombok.SneakyThrows; public class FileSystemBackedStorageService implements StorageService { @@ -42,7 +44,6 @@ public class FileSystemBackedStorageService implements StorageService { IOUtils.copy(new FileInputStream(res), new FileOutputStream(destinationFile)); } - @Override @SneakyThrows public InputStreamResource getObject(String tenantId, String objectId) { return new InputStreamResource(new FileInputStream(dataMap.get(objectId)));