From 5f2b851efb2c3726dcb8902d346fbdcc318a8076 Mon Sep 17 00:00:00 2001 From: Maverick Studer Date: Wed, 7 Aug 2024 10:05:33 +0200 Subject: [PATCH] RED-9782: Automated Analysis should be disabled when uploading a document that... --- .../build.gradle.kts | 2 ++ .../imported/ImportedLegalBases.java | 21 +++++++++++++++++++ .../imported/ImportedLegalBasis.java | 18 ++++++++++++++++ .../entitylog/imported/ImportedRedaction.java | 3 +++ .../dossier/file/FileType.java | 1 + .../mapper/ImportedLegalBasisMapper.java | 18 ++++++++++++++++ 6 files changed, 63 insertions(+) create mode 100644 persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedLegalBases.java create mode 100644 persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedLegalBasis.java create mode 100644 persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/mapper/ImportedLegalBasisMapper.java diff --git a/persistence-service-v1/persistence-service-shared-api-v1/build.gradle.kts b/persistence-service-v1/persistence-service-shared-api-v1/build.gradle.kts index 92fb1d7dc..cb862ce69 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-shared-api-v1/build.gradle.kts @@ -16,6 +16,8 @@ dependencies { compileOnly("org.springdoc:springdoc-openapi-ui:1.7.0") compileOnly("io.github.openfeign:feign-core:12.2") compileOnly("org.springframework:spring-web:6.0.6") + implementation("org.mapstruct:mapstruct:1.5.5.Final") + annotationProcessor("org.mapstruct:mapstruct-processor:1.5.5.Final") } description = "persistence-service-shared-api-v1" diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedLegalBases.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedLegalBases.java new file mode 100644 index 000000000..eef055871 --- /dev/null +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedLegalBases.java @@ -0,0 +1,21 @@ +package com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.imported; + +import java.util.ArrayList; +import java.util.List; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@SuppressWarnings("PMD.AvoidFieldNameMatchingTypeName") +public class ImportedLegalBases { + + @Builder.Default + private List importedLegalBases = new ArrayList<>(); + +} diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedLegalBasis.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedLegalBasis.java new file mode 100644 index 000000000..33668c71e --- /dev/null +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedLegalBasis.java @@ -0,0 +1,18 @@ +package com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.imported; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ImportedLegalBasis { + + private String name; + private String description; + private String reason; + +} diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedRedaction.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedRedaction.java index 84553691d..5dd95022e 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedRedaction.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/imported/ImportedRedaction.java @@ -32,6 +32,9 @@ public class ImportedRedaction { private String value; + @Deprecated(forRemoval = true) private String manualOverwriteSection; + private String section; + } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/dossier/file/FileType.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/dossier/file/FileType.java index 7cc39b7fc..fbbe51e28 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/dossier/file/FileType.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/dossier/file/FileType.java @@ -13,6 +13,7 @@ public enum FileType { NER_ENTITIES(".json"), IMAGE_INFO(".json"), IMPORTED_REDACTIONS(".json"), + IMPORTED_LEGAL_BASES(".json"), TEXT_HIGHLIGHTS(".json"), FIGURE(".json"), TABLES(".json"), diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/mapper/ImportedLegalBasisMapper.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/mapper/ImportedLegalBasisMapper.java new file mode 100644 index 000000000..f40b38153 --- /dev/null +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/mapper/ImportedLegalBasisMapper.java @@ -0,0 +1,18 @@ +package com.iqser.red.service.persistence.service.v1.api.shared.model.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogLegalBasis; +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.imported.ImportedLegalBasis; + +@Mapper +public interface ImportedLegalBasisMapper { + + ImportedLegalBasisMapper INSTANCE = Mappers.getMapper(ImportedLegalBasisMapper.class); + + EntityLogLegalBasis toEntityLogLegalBasis(ImportedLegalBasis importedLegalBasis); + + ImportedLegalBasis toImportedLegalBasis(EntityLogLegalBasis entityLogLegalBasis); +} +