Merge branch 'RE-10691-fp' into 'master'

RED-10691: 500 when approving file in a dossier where dossier owner lost manager role

Closes RE-10691

See merge request redactmanager/persistence-service!930

.dev/docker-compose.yaml

@@ -1,7 +1,18 @@
 version: '2'
 
 services:
-
+  keycloak:
+    image: quay.io/keycloak/keycloak:20.0
+    command: start-dev
+    environment:
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: admin
+    ports:
+      - 8080:8080
+  redis:
+    image: redis
+    ports:
+      - "6379:6379"
   db:
     image: postgres
     restart: always
@@ -10,7 +21,7 @@ services:
     environment:
       POSTGRES_USER: redaction
       POSTGRES_PASSWORD: redaction
-      POSTGRES_DB: redaction
+      POSTGRES_DB: master
   rabbitmq:
     image: 'rabbitmq:3.9-alpine'
     mem_limit: 500m

.gitignore

@@ -26,3 +26,11 @@
 **/.DS_Store
 **/classpath-data.json
 **/dependencies-and-licenses-overview.txt
+
+gradle.properties
+gradlew
+gradlew.bat
+gradle/
+
+**/.gradle
+**/build

.gitlab-ci.yml

@@ -0,0 +1,24 @@
+variables:
+  SONAR_PROJECT_KEY: 'RED_persistence-service'
+include:
+  - project: 'gitlab/gitlab'
+    ref: 'main'
+    file: 'ci-templates/gradle_java.yml'
+
+deploy:
+  stage: deploy
+  tags:
+    - dind
+  script:
+    - echo "Building with gradle version ${BUILDVERSION}"
+    - gradle -Pversion=${BUILDVERSION} publish 
+    - gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
+    - echo "BUILDVERSION=$BUILDVERSION" >> version.env
+  artifacts:
+    reports:
+      dotenv: version.env
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH =~ /^release/
+    - if: $CI_COMMIT_BRANCH =~ /^feature/
+    - if: $CI_COMMIT_TAG

README.md

@@ -0,0 +1,57 @@
+![badge](https://img.shields.io/badge/license-knecon-brightgreen)
+## Description
+*TODO*
+
+## Table of Contents
+- [Installation](#installation)
+- [Usage](#usage)
+- [License](#license)
+- [Tests](#tests)
+- [API](#api)
+## Installation
+*TODO*
+
+## Usage
+*TODO*
+
+## License
+![badge](https://img.shields.io/badge/license-knecon-brightgreen)<br />
+This application is covered by the proprietary knecon license. 
+
+## Tests
+*TODO*
+
+## API
+
+### Files
+
+The OpenAPI specifications for RedactManager and Documine are located here:<br> `./persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api`
+
+The Redocly configuration file `redocly.yaml` is located in the root directory of the project. It contains the settings for linting the specifications and generating the API documentation. If you run the redocly commands from there, you do not need to specify the path to the configuration file.
+
+The Redocly files are located in the `redocly` directory:
+* The `templates` directory contains the [Handlebars](https://handlebarsjs.com/) templates for RedactManager and Documine, respectively.
+* The `build` directory is the default output directory for the generated API documentation.
+
+### Redocly Installation
+Execute the following command to install the Redocly CLI.
+```bash
+npm install -g @redocly/cli@latest
+```
+
+### Redocly Linting
+Execute the following commands in the root directory of the project to lint the OpenAPI specifications.
+
+Please refer to the Redocly documentation for detailed information on the linting rules.
+
+```bash
+redocly lint redactmanager
+redocly lint documine
+```
+
+### Redocly Docs Generation
+Execute the following commands in the root directory of the project to generate the API documentation.
+```bash
+redocly build-docs redactmanager --output ./redocly/build/redactmanager.html
+redocly build-docs documine --output ./redocly/build/documine.html
+```

bamboo-specs/pom.xml

@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.atlassian.bamboo</groupId>
-        <artifactId>bamboo-specs-parent</artifactId>
-        <version>8.1.3</version>
-        <relativePath/>
-    </parent>
-
-    <artifactId>bamboo-specs</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.atlassian.bamboo</groupId>
-            <artifactId>bamboo-specs-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.atlassian.bamboo</groupId>
-            <artifactId>bamboo-specs</artifactId>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-
-    <!-- run 'mvn test' to perform offline validation of the plan -->
-    <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
-</project>

bamboo-specs/src/main/java/buildjob/PlanSpec.java

@@ -1,126 +0,0 @@
-package buildjob;
-
-import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
-
-import java.time.LocalTime;
-
-import com.atlassian.bamboo.specs.api.BambooSpec;
-import com.atlassian.bamboo.specs.api.builders.BambooKey;
-import com.atlassian.bamboo.specs.api.builders.Variable;
-import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
-import com.atlassian.bamboo.specs.api.builders.permission.PermissionType;
-import com.atlassian.bamboo.specs.api.builders.permission.Permissions;
-import com.atlassian.bamboo.specs.api.builders.permission.PlanPermissions;
-import com.atlassian.bamboo.specs.api.builders.plan.Job;
-import com.atlassian.bamboo.specs.api.builders.plan.Plan;
-import com.atlassian.bamboo.specs.api.builders.plan.PlanIdentifier;
-import com.atlassian.bamboo.specs.api.builders.plan.Stage;
-import com.atlassian.bamboo.specs.api.builders.plan.branches.BranchCleanup;
-import com.atlassian.bamboo.specs.api.builders.plan.branches.PlanBranchManagement;
-import com.atlassian.bamboo.specs.api.builders.project.Project;
-import com.atlassian.bamboo.specs.builders.task.CheckoutItem;
-import com.atlassian.bamboo.specs.builders.task.InjectVariablesTask;
-import com.atlassian.bamboo.specs.builders.task.ScriptTask;
-import com.atlassian.bamboo.specs.builders.task.VcsCheckoutTask;
-import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
-import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
-import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger;
-import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
-import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;
-import com.atlassian.bamboo.specs.util.BambooServer;
-
-/**
- * Plan configuration for Bamboo.
- * Learn more on: <a href="https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs">https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs</a>
- */
-@BambooSpec
-public class PlanSpec {
-
-    private static final String SERVICE_NAME = "persistence-service";
-
-    private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");
-
-
-    /**
-     * Run main to publish plan on Bamboo
-     */
-    public static void main(final String[] args) throws Exception {
-        //By default, credentials are read from the '.credentials' file.
-        BambooServer bambooServer = new BambooServer("http://localhost:8085");
-
-        Plan buildPlan = new PlanSpec().createPlanBuild();
-        bambooServer.publish(buildPlan);
-        PlanPermissions buildPlanPermission = new PlanSpec().createPlanPermission(buildPlan.getIdentifier());
-        bambooServer.publish(buildPlanPermission);
-
-        Plan secPlan = new PlanSpec().createSecBuild();
-        bambooServer.publish(secPlan);
-        PlanPermissions secPlanPermission = new PlanSpec().createPlanPermission(secPlan.getIdentifier());
-        bambooServer.publish(secPlanPermission);
-    }
-
-
-    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
-
-        Permissions permission = new Permissions().userPermissions("atlbamboo",
-                        PermissionType.EDIT,
-                        PermissionType.VIEW,
-                        PermissionType.ADMIN,
-                        PermissionType.CLONE,
-                        PermissionType.BUILD)
-                .groupPermissions("development", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("devplant", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
-                .loggedInUserPermissions(PermissionType.VIEW)
-                .anonymousUserPermissionView();
-        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
-    }
-
-
-    private Project project() {
-
-        return new Project().name("RED").key(new BambooKey("RED"));
-    }
-
-
-    public Plan createPlanBuild() {
-
-        return new Plan(project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)).description("Build Plan for Persitence Service")
-                .variables(new Variable("maven_add_param", ""))
-                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean")
-                                        .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"),
-                                new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()),
-                                new ScriptTask().description("Build").location(Location.FILE).fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh").argument(SERVICE_NAME),
-                                createJUnitParserTask().description("Resultparser")
-                                        .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
-                                        .enabled(true),
-                                new InjectVariablesTask().description("Inject git Tag").path("git.tag").namespace("g").scope(InjectVariablesScope.LOCAL),
-                                new VcsTagTask().description("${bamboo.g.gitTag}").tagName("${bamboo.g.gitTag}").defaultRepository())
-                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                .dockerRunArguments("--net=host")
-                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
-                .linkedRepositories("RED / " + SERVICE_NAME)
-                .triggers(new BitbucketServerTrigger())
-                .planBranchManagement(new PlanBranchManagement().createForVcsBranch()
-                        .delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14))
-                        .notificationForCommitters());
-    }
-
-
-    public Plan createSecBuild() {
-
-        return new Plan(project(), SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC")).description("Security Analysis Plan")
-                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean")
-                                        .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"),
-                                new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()),
-                                new ScriptTask().description("Sonar").location(Location.FILE).fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh").argument(SERVICE_NAME))
-                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                .dockerRunArguments("--net=host")
-                                .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
-                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
-                .linkedRepositories("RED / " + SERVICE_NAME)
-                .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
-                .planBranchManagement(new PlanBranchManagement().createForVcsBranchMatching("release.*").notificationForCommitters());
-    }
-
-}

bamboo-specs/src/main/resources/scripts/build-java.sh

@@ -1,61 +0,0 @@
-#!/bin/bash
-set -e
-
-SERVICE_NAME=$1
-set SERVER_PORT=$(shuf -i 20000-65000 -n 1)
-
-if [[ "$bamboo_planRepository_branchName" == "master" ]]
-then
-    branchVersion=$(cat pom.xml | grep -Eo "    <version>.*-SNAPSHOT</version>" | sed -s 's|<version>\(.*\)\..*\(-*.*\)</version>|\1|' | tr -d ' ')
-    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
-    newVersion="$(semver $latestVersion -p -i minor)"
-elif [[ "$bamboo_planRepository_branchName" == release* ]]
-then
-    branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|')
-    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
-    newVersion="$(semver $latestVersion -p -i patch)"
-elif [[ "${bamboo_version_tag}" != "dev" ]]
-then
-    newVersion="${bamboo_version_tag}"
-else
-    mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        --no-transfer-progress \
-        ${bamboo_maven_add_param} \
-        clean install \
-        -Djava.security.egd=file:/dev/./urandomelse
-    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
-    exit 0
-fi
-
-echo "gitTag=${newVersion}" > git.tag
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    versions:set \
-    -DnewVersion=${newVersion}
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    versions:set  \
-    -DnewVersion=${newVersion}
-
-mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    --no-transfer-progress \
-    clean deploy \
-    ${bamboo_maven_add_param} \
-    -e \
-    -DdeployAtEnd=true \
-    -Dmaven.wagon.http.ssl.insecure=true \
-    -Dmaven.wagon.http.ssl.allowall=true \
-    -Dmaven.wagon.http.ssl.ignore.validity.dates=true \
-    -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    package
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    docker:push
-
-

bamboo-specs/src/main/resources/scripts/sonar-java.sh

@@ -1,45 +0,0 @@
-#!/bin/bash
-set -e
-
-SERVICE_NAME=$1
-set SERVER_PORT=$(shuf -i 20000-65000 -n 1)
-
-echo "build jar binaries"
-mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    --no-transfer-progress \
-    clean install \
-    -Djava.security.egd=file:/dev/./urandomelse
-
-echo "dependency-check:aggregate"
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    org.owasp:dependency-check-maven:aggregate
-
-if [[ -z "${bamboo_repository_pr_key}" ]]
-then
-    echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
-    mvn --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        sonar:sonar \
-        -Dsonar.projectKey=RED_$SERVICE_NAME \
-        -Dsonar.host.url=https://sonarqube.iqser.com \
-        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-        -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
-        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-else
-    echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
-    mvn --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        sonar:sonar \
-        -Dsonar.projectKey=RED_$SERVICE_NAME \
-        -Dsonar.host.url=https://sonarqube.iqser.com \
-        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-        -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
-        -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
-        -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
-        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-fi

bamboo-specs/src/test/java/buildjob/PlanSpecTest.java

@@ -1,21 +0,0 @@
-package buildjob;
-
-import org.junit.Test;
-
-import com.atlassian.bamboo.specs.api.builders.plan.Plan;
-import com.atlassian.bamboo.specs.api.exceptions.PropertiesValidationException;
-import com.atlassian.bamboo.specs.api.util.EntityPropertiesBuilders;
-
-public class PlanSpecTest {
-
-    @Test
-    public void checkYourPlanOffline() throws PropertiesValidationException {
-
-        Plan buildPlan = new PlanSpec().createPlanBuild();
-        EntityPropertiesBuilders.build(buildPlan);
-
-        Plan secPlan = new PlanSpec().createSecBuild();
-        EntityPropertiesBuilders.build(secPlan);
-    }
-
-}

buildSrc/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}

buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts

@@ -0,0 +1,79 @@
+plugins {
+    `java-library`
+    `maven-publish`
+    pmd
+    checkstyle
+    jacoco
+}
+
+val redactionServiceVersion by rootProject.extra { "4.290.0" }
+val pdftronRedactionServiceVersion by rootProject.extra { "4.90.0-RED10115.0" }
+val redactionReportServiceVersion by rootProject.extra { "4.81.0" }
+val searchServiceVersion by rootProject.extra { "2.90.0" }
+val documentVersion by rootProject.extra { "4.433.0" }
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven {
+        url = uri("https://nexus.knecon.com/repository/gindev/");
+        credentials {
+            username = providers.gradleProperty("mavenUser").getOrNull();
+            password = providers.gradleProperty("mavenPassword").getOrNull();
+        }
+    }
+}
+
+group = "com.iqser.red.service"
+
+java.sourceCompatibility = JavaVersion.VERSION_17
+java.targetCompatibility = JavaVersion.VERSION_17
+
+pmd {
+    isConsoleOutput = true
+}
+
+tasks.pmdMain {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/pmd.xml")
+}
+
+tasks.pmdTest {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/test_pmd.xml")
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+    reports {
+        junitXml.outputLocation.set(layout.buildDirectory.dir("reports/junit"))
+    }
+    minHeapSize = "512m"
+    maxHeapSize = "2048m"
+}
+
+tasks.test {
+    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
+}
+
+tasks.jacocoTestReport {
+    dependsOn(tasks.test) // tests are required to run before generating the report
+    reports {
+        xml.required.set(true)
+        csv.required.set(false)
+        html.outputLocation.set(layout.buildDirectory.dir("jacocoHtml"))
+    }
+}
+
+java {
+    withJavadocJar()
+}
+
+allprojects {
+
+    tasks.withType<Javadoc> {
+        options {
+            this as StandardJavadocDocletOptions
+            addBooleanOption("Xdoclint:none", true)
+            addStringOption("Xmaxwarns", "1")
+        }
+    }
+}

config/checkstyle/checkstyle.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <property
+            name="severity"
+            value="error"/>
+    <module name="TreeWalker">
+        <module name="SuppressWarningsHolder"/>
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverride"/>
+        <module name="AnnotationLocation"/>
+        <module name="JavadocStyle"/>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="IllegalImport"/>
+        <module name="RedundantImport"/>
+        <module name="RedundantModifier"/>
+        <module name="EmptyBlock"/>
+        <module name="DefaultComesLast"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="ExplicitInitialization"/>
+        <module name="IllegalInstantiation"/>
+        <module name="ModifiedControlVariable"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="PackageDeclaration"/>
+        <module name="ParameterAssignment"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StringLiteralEquality"/>
+        <module name="OneStatementPerLine"/>
+        <module name="FinalClass"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="UpperEll"/>
+        <module name="OuterTypeFilename"/>
+    </module>
+    <module name="FileTabCharacter"/>
+    <module name="SuppressWarningsFilter"/>
+</module>

config/pmd/pmd.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon ruleset checks the code for bad stuff
+    </description>
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AssignmentInOperand"/>
+        <exclude name="BeanMembersShouldSerialize"/>
+    </rule>
+
+</ruleset>

config/pmd/test_pmd.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon test ruleset checks the code for bad stuff
+    </description>
+
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AssignmentInOperand"/>
+        <exclude name="TestClassWithoutTestCases"/>
+        <exclude name="BeanMembersShouldSerialize"/>
+    </rule>
+
+</ruleset>

gradle.properties.kts

@@ -0,0 +1 @@
+version = 2.0-SNAPSHOT

persistence-service-image-v1/pom.xml

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
-    <parent>
-        <groupId>com.iqser.red</groupId>
-        <artifactId>platform-docker-dependency</artifactId>
-        <version>1.2.0</version>
-        <relativePath/>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>persistence-service-image-v1</artifactId>
-    <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <service.server>persistence-service-server-v1</service.server>
-        <platform.jar>${service.server}.jar</platform.jar>
-        <docker.skip.push>false</docker.skip.push>
-        <docker.image.name>${docker.image.prefix}/${service.server}</docker.image.name>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>download-platform-jar</id>
-                            <phase>prepare-package</phase>
-                            <goals>
-                                <goal>copy</goal>
-                            </goals>
-                            <configuration>
-                                <artifactItems>
-                                    <dependency>
-                                        <groupId>${project.groupId}</groupId>
-                                        <artifactId>${service.server}</artifactId>
-                                        <version>${project.version}</version>
-                                        <type>jar</type>
-                                        <overWrite>true</overWrite>
-                                        <destFileName>${platform.jar}</destFileName>
-                                    </dependency>
-                                </artifactItems>
-                                <outputDirectory>${docker.build.directory}</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <configuration>
-                        <images>
-                            <image>
-                                <name>${docker.image.name}</name>
-                                <build>
-                                    <dockerFileDir>${docker.build.directory}</dockerFileDir>
-                                    <args>
-                                        <PLATFORM_JAR>${platform.jar}</PLATFORM_JAR>
-                                    </args>
-                                    <tags>
-                                        <tag>${docker.image.version}</tag>
-                                        <tag>latest</tag>
-                                    </tags>
-                                </build>
-                            </image>
-                        </images>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>

persistence-service-image-v1/src/main/docker/Dockerfile

@@ -1,9 +0,0 @@
-FROM red/base-image:2.0.0
-
-ARG PLATFORM_JAR
-
-ENV PLATFORM_JAR ${PLATFORM_JAR}
-
-ENV USES_ELASTICSEARCH false
-
-COPY ["${PLATFORM_JAR}", "/"]

persistence-service-v1/persistence-service-api-v1/pom.xml

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <artifactId>persistence-service-v1</artifactId>
-        <groupId>com.iqser.red.service</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>persistence-service-api-v1</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>redaction-service-api-v1</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>persistence-service-api-v1</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>pdftron-redaction-service-api-v1</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>pdftron-redaction-service-api-v1</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>redaction-service-api-v1</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>persistence-service-api-v1</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-
-        <dependency>
-            <!-- This dependency contains annotations that are used in specifying REST endpoints. -->
-            <!-- It is optional since not all users of this API might use Feign. -->
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-
-        <!-- spring -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-
-        <!-- test -->
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>jackson-commons</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessors>
-                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
-                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
-                    </annotationProcessors>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AnnotationStatus.java

@@ -1,8 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations;
-
-public enum AnnotationStatus {
-    REQUESTED,
-    APPROVED,
-    DECLINED
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactions.java

@@ -1,48 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualRedactions {
-
-    @Builder.Default
-    private Set<IdRemoval> idsToRemove = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualForceRedaction> forceRedactions = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualImageRecategorization> imageRecategorization = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualLegalBasisChange> legalBasisChanges = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualResizeRedaction> resizeRedactions = new HashSet<>();
-
-    @Builder.Default
-    private Map<String, List<Comment>> comments = new HashMap<>();
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/UpdateRedactionRequest.java

@@ -1,19 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpdateRedactionRequest {
-
-    private List<String> annotationIds;
-    private AnnotationStatus annotationStatus;
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/BaseAnnotation.java

@@ -1,31 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
-
-import java.time.OffsetDateTime;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode
-public class BaseAnnotation {
-
-    private String annotationId;
-    private String fileId;
-    private String user;
-    private AnnotationStatus status;
-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-
-    public boolean isApproved() {
-        return AnnotationStatus.APPROVED == status;
-    }
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/IdRemoval.java

@@ -1,35 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
-
-import java.time.OffsetDateTime;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class IdRemoval extends BaseAnnotation {
-
-    private boolean removeFromDictionary;
-
-
-    @Builder
-    public IdRemoval(String annotationId,
-                     String fileId,
-                     String user,
-                     AnnotationStatus status,
-                     OffsetDateTime requestDate,
-                     OffsetDateTime processedDate,
-                     OffsetDateTime softDeletedTime,
-                     boolean removeFromDictionary) {
-
-        super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
-        this.removeFromDictionary = removeFromDictionary;
-    }
-
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualForceRedaction.java

@@ -1,34 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
-
-import java.time.OffsetDateTime;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class ManualForceRedaction extends BaseAnnotation {
-
-    private String legalBasis;
-
-
-    @Builder
-    public ManualForceRedaction(String annotationId,
-                                String fileId,
-                                String user,
-                                AnnotationStatus status,
-                                OffsetDateTime requestDate,
-                                OffsetDateTime processedDate,
-                                OffsetDateTime softDeletedTime,
-                                String legalBasis) {
-
-        super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
-        this.legalBasis = legalBasis;
-    }
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualImageRecategorization.java

@@ -1,34 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
-
-import java.time.OffsetDateTime;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class ManualImageRecategorization extends BaseAnnotation {
-
-    private String type;
-
-
-    @Builder
-    public ManualImageRecategorization(String annotationId,
-                                       String fileId,
-                                       String user,
-                                       AnnotationStatus status,
-                                       OffsetDateTime requestDate,
-                                       OffsetDateTime processedDate,
-                                       OffsetDateTime softDeletedTime,
-                                       String type) {
-
-        super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
-        this.type = type;
-    }
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualLegalBasisChange.java

@@ -1,40 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
-
-import java.time.OffsetDateTime;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class ManualLegalBasisChange extends BaseAnnotation {
-
-    private String section;
-    private String value;
-    private String legalBasis;
-
-
-    @Builder
-    public ManualLegalBasisChange(String annotationId,
-                                  String fileId,
-                                  String user,
-                                  AnnotationStatus status,
-                                  OffsetDateTime requestDate,
-                                  OffsetDateTime processedDate,
-                                  OffsetDateTime softDeletedTime,
-                                  String legalBasis,
-                                  String section,
-                                  String value) {
-
-        super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
-        this.legalBasis = legalBasis;
-        this.section = section;
-        this.value = value;
-    }
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualRedactionEntry.java

@@ -1,70 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class ManualRedactionEntry extends BaseAnnotation {
-
-    private String type;
-    private String value;
-    private String reason;
-    private String legalBasis;
-    private String section;
-    private boolean rectangle;
-    private boolean addToDictionary;
-    private boolean addToDossierDictionary;
-    private List<Rectangle> positions = new ArrayList<>();
-    private String textBefore;
-    private String textAfter;
-    private String sourceId;
-
-
-    @Builder
-    public ManualRedactionEntry(String annotationId,
-                                String fileId,
-                                String user,
-                                AnnotationStatus status,
-                                OffsetDateTime requestDate,
-                                OffsetDateTime processedDate,
-                                OffsetDateTime softDeletedTime,
-                                String value,
-                                String textBefore,
-                                String textAfter,
-                                boolean rectangle,
-                                boolean addToDictionary,
-                                boolean addToDossierDictionary,
-                                String legalBasis,
-                                String section,
-                                String reason,
-                                String type,
-                                List<Rectangle> positions,
-                                String sourceId) {
-
-        super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
-        this.textBefore = textBefore;
-        this.textAfter = textAfter;
-        this.value = value;
-        this.rectangle = rectangle;
-        this.addToDictionary = addToDictionary;
-        this.addToDossierDictionary = addToDossierDictionary;
-        this.legalBasis = legalBasis;
-        this.section = section;
-        this.reason = reason;
-        this.type = type;
-        this.positions = positions != null ? positions : new ArrayList<>();
-        this.sourceId = sourceId;
-    }
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualResizeRedaction.java

@@ -1,47 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class ManualResizeRedaction extends BaseAnnotation {
-
-    private String value;
-    private List<Rectangle> positions = new ArrayList<>();
-    private String textBefore;
-    private String textAfter;
-    private Boolean updateDictionary;
-
-
-    @Builder
-    public ManualResizeRedaction(String annotationId,
-                                 String fileId,
-                                 String user,
-                                 AnnotationStatus status,
-                                 OffsetDateTime requestDate,
-                                 OffsetDateTime processedDate,
-                                 OffsetDateTime softDeletedTime,
-                                 String value,
-                                 String textBefore,
-                                 String textAfter,
-                                 List<Rectangle> positions) {
-
-        super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
-        this.textBefore = textBefore;
-        this.textAfter = textAfter;
-        this.value = value;
-        this.positions = positions != null ? positions : new ArrayList<>();
-    }
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierTemplateDictionaryStats.java

@@ -1,23 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionarySummary;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DossierTemplateDictionaryStats {
-
-    private String dossierTemplateId;
-    private int numberOfDictionaries; // number of Types for the dossierTemplate
-    private List<DictionarySummary> dictionarySummaryList = new ArrayList<>();
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierTemplateStatus.java

@@ -1,7 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
-
-public enum DossierTemplateStatus {
-    INCOMPLETE,
-    INACTIVE,
-    ACTIVE
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DownloadFileType.java

@@ -1,10 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
-
-public enum DownloadFileType {
-    ORIGINAL,
-    PREVIEW,
-    REDACTED,
-    ANNOTATED,
-    FLATTEN,
-    DELTA_PREVIEW
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplateUpdateRequest.java

@@ -1,22 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class ReportTemplateUpdateRequest {
-
-    @NonNull
-    private String fileName;
-
-    private boolean multiFileReport;
-    private boolean activeByDefault;
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/DigitalSignatureType.java

@@ -1,7 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
-
-public enum DigitalSignatureType {
-    CERTIFICATE,
-    KMS,
-    HSM;
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/Watermark.java

@@ -1,30 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
-
-import java.time.OffsetDateTime;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Watermark {
-
-    private Long id;
-    private String name;
-    private boolean enabled;
-    private String dossierTemplateId;
-    private String text;
-    private String hexColor;
-    private int opacity;
-    private int fontSize;
-    private String fontType;
-    private String createdBy;
-    private OffsetDateTime dateAdded;
-    private OffsetDateTime dateModified;
-    private WatermarkOrientation orientation;
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/WatermarkOrientation.java

@@ -1,7 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
-
-public enum WatermarkOrientation {
-    VERTICAL,
-    HORIZONTAL,
-    DIAGONAL
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierAttributeType.java

@@ -1,8 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
-
-public enum DossierAttributeType {
-    TEXT,
-    NUMBER,
-    DATE,
-    IMAGE
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierInformation.java

@@ -1,13 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
-
-import lombok.Data;
-
-@Data
-public class DossierInformation {
-
-    private int numberOfActiveDossiers;
-    private int numberOfArchivedDossiers;
-    private int numberOfSoftDeletedDossiers;
-    private int numberOfHardDeletedDossiers;
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierStats.java

@@ -1,37 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
-
-import java.time.OffsetDateTime;
-import java.util.Map;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(of = {"dossierId"})
-public class DossierStats {
-
-    private String dossierId;
-    private int numberOfFiles;
-    private int numberOfSoftDeletedFiles;
-    private int numberOfPages; // sum of pages
-    private int numberOfExcludedPages; // sum of excludedPages
-    private boolean hasRedactionsFilePresent; // true if at least one file in the dossier has redactions
-    private boolean hasHintsNoRedactionsFilePresent; // true if at least one file in the dossier has hints but doesn't have redactions
-    private boolean hasSuggestionsFilePresent; // true if at least one file in the dossier has suggestions
-    private boolean hasUpdatesFilePresent; //true if at least one file in the dossier has updates
-    private boolean hasNoFlagsFilePresent; // true if at least one file in the dossier has none of the other flags
-    private Map<ProcessingStatus, Integer> fileCountPerProcessingStatus;
-    private Map<WorkflowStatus, Integer> fileCountPerWorkflowStatus;
-    private OffsetDateTime lastFileUpdateDate;
-    private OffsetDateTime fileManipulationDate;
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierVisibility.java

@@ -1,7 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
-
-public enum DossierVisibility {
-
-    PRIVATE,
-    PUBLIC;
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileAttributeType.java

@@ -1,7 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
-
-public enum FileAttributeType {
-    TEXT,
-    NUMBER,
-    DATE
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java

@@ -1,30 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
-
-import lombok.Getter;
-
-public enum FileType {
-
-    UNTOUCHED(".pdf"),
-    ORIGIN(".pdf"),
-    REDACTION_LOG(".json"),
-    SIMPLIFIED_TEXT(".json"),
-    SECTION_GRID(".json"),
-    TEXT(".json"),
-    NER_ENTITIES(".json"),
-    IMAGE_INFO(".json"),
-    IMPORTED_REDACTIONS(".json"),
-    TEXT_HIGHLIGHTS(".json"),
-    FIGURE(".json"),
-    TABLES(".json"),
-    COMPONENTS(".json");
-
-    @Getter
-    private final String extension;
-
-
-    FileType(String extension) {
-
-        this.extension = extension;
-    }
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/WorkflowStatus.java

@@ -1,8 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
-
-public enum WorkflowStatus {
-    NEW,
-    UNDER_REVIEW,
-    UNDER_APPROVAL,
-    APPROVED
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/importexport/ImportTemplateResult.java

@@ -1,73 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.importexport;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.FileAttributesGeneralConfiguration;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateUploadRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Watermark;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierStatusInfo;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeConfig;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ImportTemplateResult {
-
-    public String dossierTemplateId;
-    public String userId;
-
-    public boolean updateExistingTemplate;
-
-    public DossierTemplate dossierTemplate;
-
-    @Builder.Default
-    public List<Watermark> watermarks = new ArrayList<>();
-
-    public Colors colors;
-
-    @Builder.Default
-    public List<DossierStatusInfo> dossierStatusInfos = new ArrayList<>();
-
-    @Builder.Default
-    public List<DossierAttributeConfig> dossierAttributesConfigs = new ArrayList<>();
-
-    public FileAttributesGeneralConfiguration fileAttributesGeneralConfiguration;
-
-    @Builder.Default
-    public List<FileAttributeConfig> fileAttributesConfigs = new ArrayList<>();
-
-    @Builder.Default
-    public List<LegalBasis> legalBases = new ArrayList<>();
-
-    public String ruleSet;
-
-    @Builder.Default
-    public List<ReportTemplateUploadRequest> reportTemplateUploadRequests = new ArrayList<>();
-
-    @Builder.Default
-    public List<Type> types = new ArrayList<>();
-
-    @Builder.Default
-    public Map<String, List<String>> entries = new HashMap<>();
-
-    @Builder.Default
-    public Map<String, List<String>> falsePositives = new HashMap<>();
-
-    @Builder.Default
-    public Map<String, List<String>> falseRecommendations = new HashMap<>();
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionaryEntry.java

@@ -1,22 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type;
-
-import java.io.Serializable;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DictionaryEntry implements Serializable {
-
-    private long entryId;
-    private String value;
-    private long version;
-    private boolean deleted;
-    private String typeId;
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionaryEntryType.java

@@ -1,7 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type;
-
-public enum DictionaryEntryType {
-    ENTRY,
-    FALSE_POSITIVE,
-    FALSE_RECOMMENDATION
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionarySummary.java

@@ -1,19 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DictionarySummary {
-
-    private String id; // type id
-    private String type; // type
-    private String name; // label
-    private long entriesCount; // entries size
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadStatusValue.java

@@ -1,8 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.download;
-
-public enum DownloadStatusValue {
-    QUEUED,
-    GENERATING,
-    READY,
-    FAILED
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java

@@ -1,48 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.license;
-
-import java.time.Instant;
-import java.time.Year;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(of = "requestId")
-public class LicenseReportRequest {
-
-    private String requestId;
-
-    private Instant startDate;
-
-    private Instant endDate;
-
-    private List<String> dossierIds = new ArrayList<>();
-
-
-    public Instant getStartDate() {
-
-        if (startDate == null) {
-            startDate = Year.of(getEndDate().atOffset(ZoneOffset.UTC).getYear()).atMonth(1).atDay(1).atStartOfDay().toInstant(ZoneOffset.UTC);
-        }
-        return startDate;
-    }
-
-
-    public Instant getEndDate() {
-
-        if (endDate == null) {
-            endDate = Instant.now();
-        }
-        return endDate;
-    }
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/ReportData.java

@@ -1,28 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.license;
-
-import java.time.Instant;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ReportData {
-
-    private String dossier;
-    private String fileName;
-    private Instant addedDate;
-    private Instant lastUpdatedDate;
-    private Instant deletedDate;
-    private int numberOfAnalyzedPages;
-    private int numberOfOcrPages;
-    private WorkflowStatus workflowStatus;
-    private int analysisCount;
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java

@@ -1,28 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.multitenancy;
-
-import javax.validation.constraints.NotBlank;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class TenantRequest {
-
-    @NotBlank
-    private String tenantId;
-    @NotBlank
-    private String displayName;
-    private String guid;
-    @NotBlank
-    private String jdbcUrl;
-    @NotBlank
-    private String user;
-    @NotBlank
-    private String password;
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantResponse.java

@@ -1,20 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.multitenancy;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class TenantResponse {
-
-    private String tenantId;
-    private String displayName;
-    private String guid;
-    private String jdbcUrl;
-    private String user;
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ApplicationConfigurationResource.java

@@ -1,27 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.ApplicationConfig;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface ApplicationConfigurationResource {
-
-    String APPLICATION_CONFIG_PATH = "/app-config";
-
-
-    @ResponseStatus(value = HttpStatus.CREATED)
-    @PostMapping(value = APPLICATION_CONFIG_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ApplicationConfig createOrUpdateAppConfig(@RequestBody ApplicationConfig appConfig);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = APPLICATION_CONFIG_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    ApplicationConfig getCurrentApplicationConfig();
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/AuditResource.java

@@ -1,45 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.audit.AuditModel;
-import com.iqser.red.service.persistence.service.v1.api.model.audit.AuditRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.audit.AuditSearchRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.audit.CategoryModel;
-import com.iqser.red.service.persistence.service.v1.api.model.common.Page;
-
-public interface AuditResource {
-
-    String PATH = "/audit";
-
-
-    /**
-     * @param auditRequest - details to audit
-     * @throws org.springframework.web.server.ResponseStatusException - 404 - Not Found in case the object doesn't exist
-     */
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void audit(@RequestBody AuditRequest auditRequest);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = PATH + "/search", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    Page<AuditModel> search(@RequestBody AuditSearchRequest auditSearchRequest);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = PATH + "/categories", produces = MediaType.APPLICATION_JSON_VALUE)
-    List<CategoryModel> getCategories();
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ComponentOverrideResource.java

@@ -1,43 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.component.ComponentsOverrides;
-import com.iqser.red.service.persistence.service.v1.api.model.component.RevertOverrideRequest;
-
-public interface ComponentOverrideResource {
-
-    String PATH = "/component";
-
-    String FILE_ID = "fileId";
-    String FILE_ID_PATH_VARIABLE = "/{" + FILE_ID + "}";
-
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void addOverrides(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody ComponentsOverrides componentsOverrides);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ComponentsOverrides getOverrides(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = PATH + "/revert" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void revertOverrides(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody RevertOverrideRequest revertOverrideRequest);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DictionaryResource.java

@@ -1,113 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntryType;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface DictionaryResource {
-
-    String DICTIONARY_PATH = "/dictionary";
-    String TYPE_PATH = DICTIONARY_PATH + "/type";
-
-    String TYPE_PARAMETER_NAME = "type";
-    String TYPE_PATH_VARIABLE = "/{" + TYPE_PARAMETER_NAME + "}";
-
-    String INCLUDE_DELETED_PARAMETER_NAME = "includeDeleted";
-    String DOSSIER_TEMPLATE_PARAMETER_NAME = "dossierTemplateId";
-    String DOSSIER_TEMPLATE_PATH_VARIABLE = "/{" + DOSSIER_TEMPLATE_PARAMETER_NAME + "}";
-
-    String DOSSIER_ID_PARAMETER_NAME = "dossierId";
-    String DOSSIER_PATH = "/dossier";
-    String DOSSIER_ID_PATH_VARIABLE = "/{" + DOSSIER_ID_PARAMETER_NAME + "}";
-
-    String FROM_VERSION_PARAM = "fromVersion";
-
-    String COLOR_PATH = "/color";
-    String VERSION_PATH = "/version";
-    String ENTRIES_PATH = "/entries";
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PostMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void addEntries(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
-                    @RequestBody List<String> entries,
-                    @RequestParam(value = "removeCurrent", required = false, defaultValue = "false") boolean removeCurrent,
-                    @RequestParam(value = "ignoreInvalidEntries", required = false, defaultValue = "false") boolean ignoreInvalidEntries,
-                    @RequestParam(value = "dictionaryEntryType", required = false, defaultValue = "ENTRY") DictionaryEntryType dictionaryEntryType);
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void deleteEntries(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
-                       @RequestBody List<String> entries,
-                       @RequestParam(value = "dictionaryEntryType", required = false, defaultValue = "ENTRY") DictionaryEntryType dictionaryEntryType);
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PostMapping(value = TYPE_PATH + TYPE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateTypeValue(@PathVariable(TYPE_PARAMETER_NAME) String typeId, @RequestBody Type typeValue);
-
-
-    @ResponseStatus(HttpStatus.CREATED)
-    @PostMapping(value = TYPE_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Type addType(@RequestBody Type typeValue);
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = TYPE_PATH + TYPE_PATH_VARIABLE)
-    void deleteType(@PathVariable(TYPE_PARAMETER_NAME) String typeId);
-
-
-    @GetMapping(value = TYPE_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Type> getAllTypesForDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
-                                             @RequestParam(value = INCLUDE_DELETED_PARAMETER_NAME, required = false, defaultValue = "false") boolean includeDeleted);
-
-
-    @GetMapping(value = TYPE_PATH + DOSSIER_PATH + DOSSIER_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Type> getAllTypesForDossier(@PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId,
-                                     @RequestParam(value = INCLUDE_DELETED_PARAMETER_NAME, required = false, defaultValue = "false") boolean includeDeleted);
-
-
-    @GetMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Type getDictionaryForType(@PathVariable(TYPE_PARAMETER_NAME) String typeId, @RequestParam(value = FROM_VERSION_PARAM, required = false) Long fromVersion);
-
-
-    @GetMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE + ENTRIES_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<DictionaryEntry> getEntriesForType(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
-                                            @RequestParam(value = FROM_VERSION_PARAM, required = false) Long fromVersion,
-                                            @RequestParam(value = "dictionaryEntryType", required = false, defaultValue = "ENTRY") DictionaryEntryType dictionaryEntryType);
-
-
-    @GetMapping(value = VERSION_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE)
-    long getVersion(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);
-
-
-    @GetMapping(value = VERSION_PATH + DOSSIER_PATH + DOSSIER_ID_PATH_VARIABLE)
-    long getVersionForDossier(@PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId);
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PostMapping(value = COLOR_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void setColors(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @RequestBody Colors colors);
-
-
-    @ResponseBody
-    @GetMapping(value = COLOR_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Colors getColors(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DigitalSignatureResource.java

@@ -1,69 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.DigitalSignature;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.DigitalSignatureKms;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.DigitalSignatureType;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface DigitalSignatureResource {
-
-    String DIGITAL_SIGNATURE_PATH = "/digital-signature";
-    String DIGITAL_SIGNATURE_TYPE_PATH = DIGITAL_SIGNATURE_PATH + "/type";
-    String DIGITAL_SIGNATURE_KMS_PATH = DIGITAL_SIGNATURE_PATH + "/kms";
-
-    String DIGITAL_SIGNATURE_TYPE = "digitalSignatureType";
-    String DIGITAL_SIGNATURE_TYPE_VARIABLE = "/{" + DIGITAL_SIGNATURE_TYPE + "}";
-
-
-    @GetMapping(value = DIGITAL_SIGNATURE_TYPE_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    DigitalSignatureType getActiveDigitalSignatureType();
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PostMapping(value = DIGITAL_SIGNATURE_TYPE_PATH + DIGITAL_SIGNATURE_TYPE_VARIABLE)
-    void setActiveDigitalSignatureType(@PathVariable(DIGITAL_SIGNATURE_TYPE) DigitalSignatureType digitalSignatureType);
-
-
-    @ResponseStatus(HttpStatus.CREATED)
-    @PostMapping(value = DIGITAL_SIGNATURE_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    DigitalSignature saveDigitalSignature(@RequestBody DigitalSignature digitalSignatureModel);
-
-
-    @ResponseStatus(HttpStatus.CREATED)
-    @PutMapping(value = DIGITAL_SIGNATURE_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    void updateDigitalSignature(@RequestBody DigitalSignature digitalSignatureModel);
-
-
-    @GetMapping(value = DIGITAL_SIGNATURE_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    DigitalSignature getDigitalSignature();
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = DIGITAL_SIGNATURE_PATH)
-    void deleteDigitalSignature();
-
-
-    @ResponseStatus(HttpStatus.CREATED)
-    @PostMapping(value = DIGITAL_SIGNATURE_KMS_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    DigitalSignatureKms saveDigitalSignatureKms(@RequestBody DigitalSignatureKms digitalSignature);
-
-
-    @GetMapping(value = DIGITAL_SIGNATURE_KMS_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    DigitalSignatureKms getDigitalSignatureKms();
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = DIGITAL_SIGNATURE_KMS_PATH)
-    void deleteDigitalSignatureKms();
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesConfigResource.java

@@ -1,57 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig;
-
-public interface DossierAttributesConfigResource {
-
-    String DOSSIER_ATTRIBUTE_PATH = "/dossier-attribute";
-
-    String DOSSIER_TEMPLATE_ID = "dossierTemplateId";
-    String DOSSIER_TEMPLATE_ID_PATH_VARIABLE = "/{" + DOSSIER_TEMPLATE_ID + "}";
-
-    String DOSSIER_ATTRIBUTE_ID = "dossierAttributeId";
-    String DOSSIER_ATTRIBUTE_ID_PATH_VARIABLE = "/{" + DOSSIER_ATTRIBUTE_ID + "}";
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @PostMapping(value = DOSSIER_ATTRIBUTE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierAttributeConfig addOrUpdateDossierAttribute(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody DossierAttributeConfig dossierAttributeConfig);
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @PutMapping(value = DOSSIER_ATTRIBUTE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<DossierAttributeConfig> setDossierAttributesConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
-                                                            @RequestBody List<DossierAttributeConfig> dossierAttributesConfig);
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = DOSSIER_ATTRIBUTE_PATH + DOSSIER_ATTRIBUTE_ID_PATH_VARIABLE)
-    void deleteDossierAttribute(@PathVariable(DOSSIER_ATTRIBUTE_ID) String dossierAttributeId);
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PostMapping(value = DOSSIER_ATTRIBUTE_PATH + "/delete")
-    void deleteDossierAttributes(@RequestBody List<String> dossierAttributeIds);
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @GetMapping(value = DOSSIER_ATTRIBUTE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<DossierAttributeConfig> getDossierAttributes(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesResource.java

@@ -1,42 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttribute;
-
-public interface DossierAttributesResource {
-
-    String REST_PATH = "/dossierAttributes";
-    String SET_PATH = "/set";
-    String UPDATE_PATH = "/update";
-
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-
-    String DOSSIER_ATTRIBUTE_ID_PARAM = "dossierAttributeId";
-    String DOSSIER_ATTRIBUTE_ID_PATH_PARAM = "/{" + DOSSIER_ATTRIBUTE_ID_PARAM + "}";
-
-
-    @PostMapping(value = REST_PATH + SET_PATH + DOSSIER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<DossierAttribute> setDossierAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody List<DossierAttribute> dossierAttributes);
-
-
-    @PostMapping(value = REST_PATH + UPDATE_PATH + DOSSIER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierAttribute addOrUpdateDossierAttribute(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody DossierAttribute dossierAttribute);
-
-
-    @GetMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<DossierAttribute> getDossierAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
-
-
-    @DeleteMapping(value = REST_PATH + SET_PATH + DOSSIER_ID_PATH_PARAM + DOSSIER_ATTRIBUTE_ID_PATH_PARAM)
-    void deleteDossierAttribute(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(DOSSIER_ATTRIBUTE_ID_PARAM) String dossierAttributeId);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierResource.java

@@ -1,115 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.time.OffsetDateTime;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierChange;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierInformation;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface DossierResource {
-
-    String REST_PATH = "/dossier";
-    String DOSSIER_TEMPLATE_PATH = "/dossier-template";
-    String INFO_PATH = "/dossier-info";
-    String DELETED_DOSSIERS_PATH = "/deletedDossiers";
-    String HARD_DELETE_PATH = "/hardDelete";
-    String UNDELETE_PATH = "/undelete";
-
-    String ARCHIVE_DOSSIERS_PATH = "/archivedDossiers";
-    String ARCHIVE_PATH = "/archive";
-    String UNARCHIVE_PATH = "/unarchive";
-
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-    String DOSSIER_TEMPLATE_ID_PARAM = "dossierTemplateId";
-    String DOSSIER_TEMPLATE_ID_PATH_PARAM = "/{" + DOSSIER_TEMPLATE_ID_PARAM + "}";
-
-    String INCLUDE_DELETED_PARAM = "includeDeleted";
-    String INCLUDE_ARCHIVED_PARAM = "includeArchived";
-
-    String CHANGES_PATH = "/changes";
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = REST_PATH + CHANGES_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    Set<DossierChange> changesSince(@RequestBody JSONPrimitive<OffsetDateTime> since);
-
-
-    @PostMapping(value = REST_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Dossier addDossier(@RequestBody CreateOrUpdateDossierRequest dossierRequest);
-
-
-    @PostMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Dossier updateDossier(@RequestBody CreateOrUpdateDossierRequest dossierRequest, @PathVariable(DOSSIER_ID_PARAM) String dossierId);
-
-
-    @DeleteMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM)
-    void delete(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
-
-
-    @GetMapping(value = REST_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Dossier> getAllDossiers(@RequestParam(name = INCLUDE_ARCHIVED_PARAM, defaultValue = "false", required = false) boolean includeArchived,
-                                 @RequestParam(name = INCLUDE_DELETED_PARAM, defaultValue = "false", required = false) boolean includeDeleted);
-
-
-    @GetMapping(value = REST_PATH + DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Dossier> getAllDossiersForDossierTemplateId(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId,
-                                                     @RequestParam(name = INCLUDE_ARCHIVED_PARAM, defaultValue = "false", required = false) boolean includeArchived,
-                                                     @RequestParam(name = INCLUDE_DELETED_PARAM, defaultValue = "false", required = false) boolean includeDeleted);
-
-
-    @PostMapping(value = INFO_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierInformation getDossierInformation(@RequestBody List<String> filteredDossierIds);
-
-
-    @GetMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    Dossier getDossierById(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                           @RequestParam(name = INCLUDE_ARCHIVED_PARAM, defaultValue = "false", required = false) boolean includeArchived,
-                           @RequestParam(name = INCLUDE_DELETED_PARAM, defaultValue = "false", required = false) boolean includeDeleted);
-
-
-    @GetMapping(value = ARCHIVE_DOSSIERS_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Dossier> getArchivedDossiers();
-
-
-    @GetMapping(value = ARCHIVE_DOSSIERS_PATH + DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Dossier> getArchivedDossiersForDossierTemplateId(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId);
-
-
-    @GetMapping(value = DELETED_DOSSIERS_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Dossier> getSoftDeletedDossiers();
-
-
-    @DeleteMapping(value = DELETED_DOSSIERS_PATH + HARD_DELETE_PATH)
-    void hardDeleteDossiers(@RequestBody Set<String> dossierIds);
-
-
-    @PostMapping(value = DELETED_DOSSIERS_PATH + UNDELETE_PATH)
-    void undeleteDossiers(@RequestBody Set<String> dossierIds);
-
-
-    @PostMapping(value = ARCHIVE_DOSSIERS_PATH + ARCHIVE_PATH)
-    void archiveDossiers(@RequestBody Set<String> dossierIds);
-
-
-    @PostMapping(value = ARCHIVE_DOSSIERS_PATH + UNARCHIVE_PATH)
-    void unarchiveDossiers(@RequestBody Set<String> dossierIds);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierStatsResource.java

@@ -1,31 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierStats;
-
-public interface DossierStatsResource {
-
-    String REST_PATH = "/dossier-stats";
-
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-
-
-    @Deprecated
-    @GetMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierStats getDossierStats(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
-
-
-    @Deprecated
-    @PostMapping(value = REST_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<DossierStats> getDossierStats(@RequestBody Set<String> dossierIds);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierTemplateResource.java

@@ -1,79 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.CloneDossierTemplateRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.CreateOrUpdateDossierTemplateRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.importexport.ExportDownloadRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.importexport.ImportDossierTemplateRequest;
-
-public interface DossierTemplateResource {
-
-    String DOSSIER_TEMPLATE_PATH = "/dossier-template";
-
-    String DOSSIER_TEMPLATE_ID = "dossierTemplateId";
-    String DOSSIER_TEMPLATE_ID_PATH_VARIABLE = "/{" + DOSSIER_TEMPLATE_ID + "}";
-
-    String USER_ID_PARAM = "userId";
-
-    String CLONE_PATH = "/clone";
-    String EXPORT_PATH = "/export";
-    String IMPORT_PATH = "/import";
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.ACCEPTED)
-    @PostMapping(value = DOSSIER_TEMPLATE_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
-    DossierTemplate createOrUpdateDossierTemplate(@RequestBody CreateOrUpdateDossierTemplateRequest dossierTemplate);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = DOSSIER_TEMPLATE_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<DossierTemplate> getAllDossierTemplates();
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierTemplate getDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE)
-    void deleteDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestParam(USER_ID_PARAM) String deletingUserId);
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @PostMapping(value = DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + CLONE_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierTemplate cloneDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody CloneDossierTemplateRequest cloneDossierTemplateRequest);
-
-
-    @PostMapping(value = DOSSIER_TEMPLATE_PATH + EXPORT_PATH + "/prepare", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<String> prepareExportDownload(@RequestBody ExportDownloadRequest request);
-
-
-    @PostMapping(value = DOSSIER_TEMPLATE_PATH + EXPORT_PATH + "/create", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void createExportDownload(@RequestParam String userId, @RequestParam String storageId);
-
-
-    @ResponseBody
-    @PostMapping(value = DOSSIER_TEMPLATE_PATH + IMPORT_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierTemplate importDossierTemplate(@RequestBody ImportDossierTemplateRequest request);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierTemplateStatsResource.java

@@ -1,35 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplateDictionaryStats;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplateStats;
-
-public interface DossierTemplateStatsResource {
-
-    String REST_PATH = "/dossier-template-stats";
-
-    String DICTIONARY_PATH = "/dictionary";
-
-    String DOSSIER_TEMPLATE_ID = "dossierTemplateId";
-    String DOSSIER_TEMPLATE_ID_PATH_VARIABLE = "/{" + DOSSIER_TEMPLATE_ID + "}";
-
-
-    @PostMapping(value = REST_PATH + DICTIONARY_PATH, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    List<DossierTemplateDictionaryStats> getDossierTemplateDictionaryStats(@RequestBody Set<String> dossierTemplateIds);
-
-
-    @PostMapping(value = REST_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierTemplateStats getDossierTemplateStats(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
-
-
-    @PostMapping(value = REST_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<DossierTemplateStats> getDossierTemplateStats();
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DownloadResource.java

@@ -1,42 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadWithOptionRequest;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatus;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface DownloadResource {
-
-    String REST_PATH = "/download";
-    String USER_ID = "userId";
-
-
-    @PostMapping(value = REST_PATH + "/prepare", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<String> prepareDownload(@RequestBody DownloadRequest request);
-
-    @PostMapping(value = REST_PATH + "/prepare-option", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<String> prepareDownload(@RequestBody DownloadWithOptionRequest request);
-
-    @GetMapping(value = REST_PATH + "/status/{" + USER_ID + "}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<DownloadStatus> getDownloadStatus(@PathVariable(USER_ID) String userId);
-
-
-    @PostMapping(value = REST_PATH + "/setDownloaded", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void setDownloaded(@RequestBody JSONPrimitive<String> setDownloadedRequest);
-
-
-    @PostMapping(value = REST_PATH + "/delete", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void deleteDownloadStatus(@RequestBody JSONPrimitive<String> setDownloadedRequest);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesConfigResource.java

@@ -1,77 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.FileAttributesGeneralConfiguration;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeConfig;
-
-public interface FileAttributesConfigResource {
-
-    String FILE_ATTRIBUTES_PATH = "/fileAttributes";
-    String FILE_ATTRIBUTE_PATH = "/fileAttribute";
-    String BASE_CONFIG_PATH = "/baseConfig";
-
-    String DELETE_PATH = "/delete";
-
-    String DOSSIER_TEMPLATE_ID = "dossierTemplateId";
-    String DOSSIER_TEMPLATE_ID_PATH_VARIABLE = "/{" + DOSSIER_TEMPLATE_ID + "}";
-
-    String FILE_ATTRIBUTE_ID = "fileAttributeId";
-    String FILE_ATTRIBUTE_ID_PATH_VARIABLE = "/{" + FILE_ATTRIBUTE_ID + "}";
-
-    String UTF_ENCODING = "UTF-8";
-    String ASCII_ENCODING = "ASCII";
-    String ISO_ENCODING = "ISO";
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @PutMapping(value = FILE_ATTRIBUTES_PATH + BASE_CONFIG_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    FileAttributesGeneralConfiguration setFileAttributesGeneralConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
-                                                                      @RequestBody FileAttributesGeneralConfiguration fileAttributesConfig);
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @GetMapping(value = FILE_ATTRIBUTES_PATH + BASE_CONFIG_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    FileAttributesGeneralConfiguration getFileAttributesGeneralConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @PostMapping(value = FILE_ATTRIBUTES_PATH + FILE_ATTRIBUTE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    FileAttributeConfig addOrUpdateFileAttributeConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody FileAttributeConfig fileAttributeConfig);
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @PutMapping(value = FILE_ATTRIBUTES_PATH + FILE_ATTRIBUTE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<FileAttributeConfig> setFileAttributesConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody List<FileAttributeConfig> fileAttributesConfig);
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = FILE_ATTRIBUTES_PATH + FILE_ATTRIBUTE_PATH + FILE_ATTRIBUTE_ID_PATH_VARIABLE)
-    void deleteFileAttributeConfigs(@PathVariable(FILE_ATTRIBUTE_ID) String fileAttributeId);
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PostMapping(value = FILE_ATTRIBUTES_PATH + FILE_ATTRIBUTE_PATH + DELETE_PATH)
-    void deleteFileAttributeConfigs(@RequestBody List<String> fileAttributeIds);
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @GetMapping(value = FILE_ATTRIBUTES_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<FileAttributeConfig> getFileAttributeConfigs(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesResource.java

@@ -1,33 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.Map;
-
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvResponse;
-
-public interface FileAttributesResource {
-
-    String REST_PATH = "/fileAttributes";
-    String CSV_IMPORT_PATH = "/csvImport";
-    String SET_PATH = "/set";
-
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-
-    String FILE_ID = "fileId";
-    String FILE_ID_PATH_VARIABLE = "/{" + FILE_ID + "}";
-
-
-    @PostMapping(value = REST_PATH + CSV_IMPORT_PATH + DOSSIER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ImportCsvResponse importCsv(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody ImportCsvRequest importCsvRequest);
-
-
-    @PostMapping(value = REST_PATH + SET_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void setFileAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody Map<String, String> fileAttributes);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileStatusProcessingUpdateResource.java

@@ -1,79 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.pdftron.redaction.v1.api.model.UntouchedDocumentResponse;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-
-public interface FileStatusProcessingUpdateResource {
-
-    String STATUS_PATH = "/status-updates";
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-
-    String FILE_ID = "fileId";
-    String FILE_ID_PATH_VARIABLE = "/{" + FILE_ID + "}";
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/preprocessing-successful", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void preprocessingSuccessful(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                                 @PathVariable(FILE_ID) String fileId,
-                                 @RequestBody UntouchedDocumentResponse untouchedDocumentResponse);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/preprocessing-failed")
-    void preprocessingFailed(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/analysis-successful", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void analysisSuccessful(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody AnalyzeResult analyzeResult);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/ocr-successful")
-    void ocrSuccessful(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/analysis-failed")
-    void analysisFailed(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/pre-processing")
-    void preProcessing(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/ocr-processing")
-    void ocrProcessing(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/ocr-failed")
-    void ocrFailed(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/indexing")
-    void indexing(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/indexing-successful")
-    void indexingSuccessful(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/indexing-failed")
-    void indexingFailed(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LicenseReportResource.java

@@ -1,23 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.license.LicenseReport;
-import com.iqser.red.service.persistence.service.v1.api.model.license.LicenseReportRequest;
-
-public interface LicenseReportResource {
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = "/report/license", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    LicenseReport getLicenseReport(@RequestBody LicenseReportRequest licenseReportRequest,
-                                   @RequestParam(value = "offset", defaultValue = "0") int offset,
-                                   @RequestParam(value = "limit", defaultValue = "20") int limit);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ManualRedactionResource.java

@@ -1,179 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.CommentRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ForceRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImageRecategorizationRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.LegalBasisChangeRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualAddResponse;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ResizeRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.UpdateRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface ManualRedactionResource {
-
-    String MANUAL_REDACTION_REST_PATH = "/manualRedaction";
-
-    String DOSSIER_ID = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID + "}";
-
-    String FILE_ID = "fileId";
-    String FILE_ID_PATH_VARIABLE = "/{" + FILE_ID + "}";
-
-    String ANNOTATION_ID = "annotationId";
-    String ANNOTATION_ID_PATH_VARIABLE = "/{" + ANNOTATION_ID + "}";
-
-    String COMMENT_ID = "commentId";
-    String COMMENT_ID_PATH_VARIABLE = "/{" + COMMENT_ID + "}";
-
-    String DELETE_PATH = "/delete";
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/add" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addAddRedaction(@PathVariable(DOSSIER_ID) String dossierId,
-                                            @PathVariable(FILE_ID) String fileId,
-                                            @RequestBody List<AddRedactionRequest> addRedactionRequests);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/remove" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId,
-                                               @PathVariable(FILE_ID) String fileId,
-                                               @RequestBody List<RemoveRedactionRequest> removeRedactionRequest);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/force" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addForceRedaction(@PathVariable(DOSSIER_ID) String dossierId,
-                                              @PathVariable(FILE_ID) String fileId,
-                                              @RequestBody List<ForceRedactionRequest> forceRedactionRequests);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/legalBasis" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId,
-                                                @PathVariable(FILE_ID) String fileId,
-                                                @RequestBody List<LegalBasisChangeRequest> legalBasisChangeRequests);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/recategorize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId,
-                                                     @PathVariable(FILE_ID) String fileId,
-                                                     @RequestBody List<ImageRecategorizationRequest> imageRecategorizationRequests);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/comment" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Comment addComment(@PathVariable(DOSSIER_ID) String dossierId,
-                       @PathVariable(FILE_ID) String fileId,
-                       @PathVariable(ANNOTATION_ID) String annotationId,
-                       @RequestBody CommentRequest comment);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/resize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId,
-                                               @PathVariable(FILE_ID) String fileId,
-                                               @RequestBody List<ResizeRedactionRequest> resizeRedactionRequests);
-
-
-    @GetMapping(value = MANUAL_REDACTION_REST_PATH + "/add" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualRedactionEntry getAddRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
-
-
-    @GetMapping(value = MANUAL_REDACTION_REST_PATH + "/remove" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    IdRemoval getRemoveRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
-
-
-    @GetMapping(value = MANUAL_REDACTION_REST_PATH + "/force" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualForceRedaction getForceRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
-
-
-    @GetMapping(value = MANUAL_REDACTION_REST_PATH + "/legalBasis" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualLegalBasisChange getLegalBasisChange(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
-
-
-    @GetMapping(value = MANUAL_REDACTION_REST_PATH + "/recategorize" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualImageRecategorization getImageRecategorization(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
-
-
-    @GetMapping(value = MANUAL_REDACTION_REST_PATH + "/comment" + COMMENT_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Comment getComment(@PathVariable(COMMENT_ID) long commentId);
-
-
-    @GetMapping(value = MANUAL_REDACTION_REST_PATH + "/resize" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualResizeRedaction getResizeRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
-
-
-    @PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/add" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void deleteAddRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
-
-
-    @PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/remove" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void deleteRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
-
-
-    @PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/force" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void deleteForceRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
-
-
-    @PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/legalBasis" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void deleteLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
-
-
-    @PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/recategorize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void deleteImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
-
-
-    @PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/comment" + FILE_ID_PATH_VARIABLE)
-    void deleteComment(@PathVariable(FILE_ID) String fileId, @RequestBody List<Long> commentIds);
-
-
-    @PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/resize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void deleteResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/add" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateAddRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/remove" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateRemoveRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/force" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateForceRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/legalBasis" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateLegalBasisChangeStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/recategorize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateImageRecategorizationStatus(@PathVariable(DOSSIER_ID) String dossierId,
-                                           @PathVariable(FILE_ID) String fileId,
-                                           @RequestBody UpdateRedactionRequest updateStatusRequest);
-
-
-    @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/resize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateResizeRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
-
-
-    @GetMapping(value = MANUAL_REDACTION_REST_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualRedactions getManualRedactions(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/NotificationPreferencesResource.java

@@ -1,34 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.notification.NotificationPreferences;
-
-public interface NotificationPreferencesResource {
-
-    String REST_PATH = "/notification-preferences";
-
-    String USER_ID_PARAM = "userId";
-    String USER_ID_PATH_PARAM = "/{" + USER_ID_PARAM + "}";
-
-
-    @PostMapping(value = REST_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void setNotificationPreferences(@PathVariable(USER_ID_PARAM) String userId, @RequestBody NotificationPreferences notificationRequest);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = REST_PATH + USER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    NotificationPreferences getNotificationPreferences(@PathVariable(USER_ID_PARAM) String userId);
-
-
-    @DeleteMapping(value = REST_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void deleteNotificationPreferences(@PathVariable(USER_ID_PARAM) String userId);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/NotificationResource.java

@@ -1,64 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.time.OffsetDateTime;
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.audit.AddNotificationRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.notification.Notification;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface NotificationResource {
-
-    String NOTIFICATION_PATH = "/notification";
-    String TOGGLE_SEEN_PATH = "/toggle-seen";
-    String TOGGLE_READ_PATH = "/toggle-read";
-    String CHANGES_PATH = "/has-changes";
-
-    String USER_ID_PARAM = "userId";
-    String USER_ID_PATH_PARAM = "/{" + USER_ID_PARAM + "}";
-
-    String INCLUDE_SEEN_PARAM = "includeSeen";
-    String SET_SEEN_PARAM = "setSeen";
-    String SET_READ_PARAM = "setRead";
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = NOTIFICATION_PATH + CHANGES_PATH + USER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<Boolean> hasNewNotificationsSince(@PathVariable(USER_ID_PARAM) String userId, @RequestBody JSONPrimitive<OffsetDateTime> since);
-
-
-    @PostMapping(value = NOTIFICATION_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void addNotification(@RequestBody AddNotificationRequest addNotificationRequest);
-
-
-    @PostMapping(value = NOTIFICATION_PATH + TOGGLE_SEEN_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void toggleSeen(@PathVariable(USER_ID_PARAM) String userId, @RequestBody List<Long> notificationIds, @RequestParam(SET_SEEN_PARAM) boolean setSeen);
-
-
-    @PostMapping(value = NOTIFICATION_PATH + TOGGLE_READ_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void toggleRead(@PathVariable(USER_ID_PARAM) String userId, @RequestBody List<Long> notificationIds, @RequestParam(SET_READ_PARAM) boolean setRead);
-
-
-    @DeleteMapping(value = NOTIFICATION_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void softDelete(@PathVariable(USER_ID_PARAM) String userId, @RequestBody List<Long> notificationIds);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = NOTIFICATION_PATH + USER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Notification> getNotifications(@PathVariable(USER_ID_PARAM) String userId, @RequestParam(INCLUDE_SEEN_PARAM) boolean includeSeen);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java

@@ -1,74 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.Set;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.pdftron.redaction.v1.api.model.ByteContentDocument;
-import com.iqser.red.service.pdftron.redaction.v1.api.model.highlights.TextHighlightConversionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.DeleteImportedRedactionsRequest;
-
-@ResponseStatus(value = HttpStatus.NO_CONTENT)
-public interface ReanalysisResource {
-
-    String REANALYZE_PATH = "/reanalyze";
-    String IMPORT_REDACTIONS_PATH = "/import-redactions";
-    String CONVERT_TEXT_HIGHLIGHTS_PATH = "/convert-texthighlights";
-    String OCR_REANALYZE_PATH = "/ocr/reanalyze";
-    String REINDEX_PATH = "/reindex";
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-    String FILE_ID_PARAM = "fileId";
-    String FILE_ID_PATH_PARAM = "/{" + FILE_ID_PARAM + "}";
-    String BULK_REST_PATH = "/bulk";
-    String FALSE = "false";
-
-
-    @PostMapping(value = REANALYZE_PATH + DOSSIER_ID_PATH_PARAM)
-    void reanalyzeDossier(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force);
-
-
-    @PostMapping(value = REANALYZE_PATH + DOSSIER_ID_PATH_PARAM + BULK_REST_PATH)
-    void reanalyzeFiles(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                        @RequestBody Set<String> fileIds,
-                        @RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force);
-
-
-    @PostMapping(value = OCR_REANALYZE_PATH + DOSSIER_ID_PATH_PARAM)
-    void ocrDossier(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
-
-
-    @PostMapping(value = OCR_REANALYZE_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_PARAM)
-    void ocrFile(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                 @PathVariable(FILE_ID_PARAM) String fileId,
-                 @RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force);
-
-
-    @PostMapping(value = OCR_REANALYZE_PATH + DOSSIER_ID_PATH_PARAM + BULK_REST_PATH)
-    void ocrFiles(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody Set<String> fileIds);
-
-
-    @PostMapping(value = REINDEX_PATH)
-    void reindex(@RequestParam(value = DOSSIER_ID_PARAM, required = false) String dossierId,
-                 @RequestParam(value = "dropIndex", required = false, defaultValue = FALSE) boolean dropIndex,
-                 @RequestBody Set<String> fileIds);
-
-
-    @PostMapping(value = IMPORT_REDACTIONS_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void importRedactions(@RequestBody ByteContentDocument documentRequest);
-
-
-    @PostMapping(value = IMPORT_REDACTIONS_PATH + "/delete", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void deleteImportedRedactions(@RequestBody DeleteImportedRedactionsRequest deleteImportedRedactionsRequest);
-
-
-    @PostMapping(value = CONVERT_TEXT_HIGHLIGHTS_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void convertTextHighlights(@RequestBody TextHighlightConversionRequest textHighlightRequest);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java

@@ -1,48 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.redactionlog.FilteredRedactionLogRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface RedactionLogResource {
-
-    String REDACTION_LOG_PATH = "/redactionLog";
-    String SECTION_GRID_PATH = "/sectionGrid";
-
-    String FILE_ID = "fileId";
-    String FILE_ID_PATH_VARIABLE = "/{" + FILE_ID + "}";
-
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-
-
-    @GetMapping(value = REDACTION_LOG_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    RedactionLog getRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                                 @PathVariable(FILE_ID) String fileId,
-                                 @RequestParam(value = "excludedType", required = false) List<String> excludedTypes,
-                                 @RequestParam(value = "withManualRedactions", required = false, defaultValue = "true") boolean withManualRedactions,
-                                 @RequestParam(value = "includeFalsePositives", required = false, defaultValue = "false") boolean includeFalsePositives);
-
-
-    @GetMapping(value = SECTION_GRID_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    SectionGrid getSectionGrid(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @PostMapping(value = REDACTION_LOG_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/filtered", produces = MediaType.APPLICATION_JSON_VALUE)
-    RedactionLog getFilteredRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                                         @PathVariable(FILE_ID) String fileId,
-                                         @RequestBody FilteredRedactionLogRequest filteredRedactionLogRequest);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReportTemplateResource.java

@@ -1,57 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplate;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateDownload;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateUploadRequest;
-
-public interface ReportTemplateResource {
-
-    String REPORT_TEMPLATE_UPLOAD_PATH = "/templateUpload";
-
-    String DOSSIER_TEMPLATE_ID = "dossierTemplateId";
-    String DOSSIER_TEMPLATE_ID_PATH_VARIABLE = "/{" + DOSSIER_TEMPLATE_ID + "}";
-
-    String TEMPLATE_ID = "templateId";
-    String TEMPLATE_ID_PATH_VARIABLE = "/{" + TEMPLATE_ID + "}";
-
-    String DOWNLOAD_PATH = "download";
-    String UPDATE_PATH = "update";
-
-
-    @PostMapping(value = REPORT_TEMPLATE_UPLOAD_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ReportTemplate uploadTemplate(@RequestBody ReportTemplateUploadRequest reportTemplateUploadRequest);
-
-
-    @GetMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ReportTemplate> getAvailableReportTemplates(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
-
-
-    @GetMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ReportTemplate getReportTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @PathVariable(TEMPLATE_ID) String templateId);
-
-
-    @GetMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + DOWNLOAD_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ReportTemplateDownload downloadReportTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @PathVariable(TEMPLATE_ID) String templateId);
-
-
-    @DeleteMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + TEMPLATE_ID_PATH_VARIABLE)
-    void deleteTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @PathVariable(TEMPLATE_ID) String templateId);
-
-
-    @PutMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + UPDATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
-                        @PathVariable(TEMPLATE_ID) String templateId,
-                        @RequestBody ReportTemplateUpdateRequest reportTemplateUpdateRequest);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RulesResource.java

@@ -1,38 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-
-public interface RulesResource {
-
-    String PATH = "/rules";
-
-    String DOSSIER_TEMPLATE_PARAMETER_NAME = "dossierTemplateId";
-    String DOSSIER_TEMPLATE_PATH_VARIABLE = "/{" + DOSSIER_TEMPLATE_PARAMETER_NAME + "}";
-    String VERSION_PATH = "/version";
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PostMapping(value = PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void setRules(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @RequestBody JSONPrimitive<String> rules);
-
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.OK)
-    @GetMapping(value = PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<String> getRules(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);
-
-
-    @ResponseStatus(HttpStatus.OK)
-    @GetMapping(value = PATH + DOSSIER_TEMPLATE_PATH_VARIABLE + VERSION_PATH)
-    long getVersion(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/SMTPConfigurationResource.java

@@ -1,46 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.SMTPConfiguration;
-
-public interface SMTPConfigurationResource {
-
-    String SMTP_PATH = "/smtp";
-
-    String TEST_PATH = "/test";
-
-    String TEST_EMAIL = "testEmail";
-
-    String MASK_PASSWORD = "maskPassword";
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = SMTP_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    SMTPConfiguration getCurrentSMTPConfiguration(@RequestParam(value = MASK_PASSWORD, required = false, defaultValue = "true") boolean maskPassword);
-
-
-    @ResponseStatus(value = HttpStatus.NO_CONTENT)
-    @PostMapping(value = SMTP_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateSMTPConfiguration(@RequestBody SMTPConfiguration smtpConfigurationModel);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = SMTP_PATH + TEST_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void testSMTPConfiguration(@RequestParam(value = TEST_EMAIL, required = false) String testEmail, @RequestBody SMTPConfiguration smtpConfigurationModel);
-
-
-    @ResponseStatus(value = HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = SMTP_PATH)
-    void clearSMTPConfiguration();
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java

@@ -1,129 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.time.OffsetDateTime;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
-
-public interface StatusResource {
-
-    String STATUS_PATH = "/status";
-    String DELETED_PATH = "/softdeleted";
-    String ALL_PATH = "/all";
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-
-    String FILE_ID = "fileId";
-    String FILE_ID_PATH_VARIABLE = "/{" + FILE_ID + "}";
-
-    String CHANGES_PATH = "/has-changes";
-
-    String EXCLUDED_STATUS_PARAM = "excluded";
-
-    String EXCLUDED_FROM_AUTOMATIC_ANALYSIS_PARAM = "excludedFromAutomaticAnalysis";
-
-    String APPROVER_ID_REQUEST_PARAM = "approverId";
-    String ASSIGNEE_ID_REQUEST_PARAM = "assigneeId";
-    String USER_ID_REQUEST_PARAM = "userId";
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + CHANGES_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<Boolean> hasChangesSince(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody JSONPrimitive<OffsetDateTime> since);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<FileModel> getDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + ALL_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<FileModel> getAllDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = STATUS_PATH + DELETED_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<FileModel> getSoftDeletedDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = STATUS_PATH + DELETED_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<FileModel> getSoftDeletedForDossierList(@RequestBody List<String> dossierIds);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    FileModel getFileStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.ACCEPTED)
-    @PostMapping(value = STATUS_PATH + "/update-modification-date" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void updateFileModificationDate(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @PostMapping(value = STATUS_PATH + "/assignee" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void setCurrentFileAssignee(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                                @PathVariable(FILE_ID) String fileId,
-                                @RequestParam(value = ASSIGNEE_ID_REQUEST_PARAM, required = false) String assigneeId);
-
-
-    @PostMapping(value = STATUS_PATH + "/underreview" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void setStatusUnderReview(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                              @PathVariable(FILE_ID) String fileId,
-                              @RequestParam(value = USER_ID_REQUEST_PARAM, required = false) String userId);
-
-
-    @PostMapping(value = STATUS_PATH + "/underapproval" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void setStatusUnderApproval(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                                @PathVariable(FILE_ID) String fileId,
-                                @RequestParam(value = APPROVER_ID_REQUEST_PARAM, required = false) String approverId);
-
-
-    @PostMapping(value = STATUS_PATH + "/approved" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void setStatusApproved(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                           @PathVariable(FILE_ID) String fileId,
-                           @RequestParam(value = APPROVER_ID_REQUEST_PARAM, required = false) String approverId);
-
-
-    @PostMapping(value = STATUS_PATH + "/new" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void setStatusNew(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @PostMapping(value = STATUS_PATH + "/toggle-analysis" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void toggleExclusion(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestParam(EXCLUDED_STATUS_PARAM) boolean excluded);
-
-
-    @PostMapping(value = STATUS_PATH + "/toggle-automatic-analysis" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void toggleAutomaticAnalysis(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                                 @PathVariable(FILE_ID) String fileId,
-                                 @RequestParam(EXCLUDED_STATUS_PARAM) boolean excludedFromAutomaticAnalysis);
-
-
-    @PostMapping(value = STATUS_PATH + "/exclude-pages" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void excludePages(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody Set<Integer> pages);
-
-
-    @PostMapping(value = STATUS_PATH + "/include-pages" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void includePages(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody Set<Integer> pages);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/TenantsResource.java

@@ -1,35 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.TenantRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.TenantResponse;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface TenantsResource {
-
-    String TENANT_ID_PARAM = "tenantId";
-    String TENANT_ID_PATH_PARAM = "/{" + TENANT_ID_PARAM + "}";
-
-
-    @PostMapping(value = "/tenants", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void createTenant(@RequestBody TenantRequest tenantRequest);
-
-
-    @GetMapping(value = "/tenants", produces = MediaType.APPLICATION_JSON_VALUE)
-    List<TenantResponse> getTenants();
-
-
-    @GetMapping(value = "/deploymentKey" + TENANT_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<String> getDeploymentKey(@PathVariable(TENANT_ID_PARAM) String tenantId);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/UploadResource.java

@@ -1,50 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.Set;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.AddFileRequest;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface UploadResource {
-
-    String REST_PATH = "/file";
-
-    String DELETE_PATH = REST_PATH + "/delete";
-    String UPLOAD_PATH = REST_PATH + "/upload";
-    String HARD_DELETE_PATH = REST_PATH + "/hardDelete";
-    String UNDELETE_PATH = REST_PATH + "/undelete";
-
-    String FILE_ID = "fileId";
-    String FILE_ID_PATH_VARIABLE = "/{" + FILE_ID + "}";
-
-    String DOSSIER_ID_PARAM = "dossierId";
-    String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
-
-
-    @PostMapping(value = UPLOAD_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<String> upload(@RequestBody AddFileRequest request,
-                                 @RequestParam(value = "keepManualRedactions", required = false, defaultValue = "false") boolean keepManualRedactions);
-
-
-    @DeleteMapping(value = DELETE_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
-    void deleteFile(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
-
-
-    @DeleteMapping(value = HARD_DELETE_PATH + DOSSIER_ID_PATH_PARAM)
-    void hardDeleteFiles(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody Set<String> fileIds);
-
-
-    @PostMapping(value = UNDELETE_PATH + DOSSIER_ID_PATH_PARAM)
-    void undeleteFiles(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody Set<String> fileIds);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/UserPreferenceResource.java

@@ -1,42 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.fasterxml.jackson.databind.JsonNode;
-
-public interface UserPreferenceResource {
-
-    String PREFERENCES_PATH = "/preferences";
-
-    String KEY_PARAMETER_NAME = "key";
-    String KEY_PATH_VARIABLE = "/{" + KEY_PARAMETER_NAME + "}";
-
-    String USER_ID_PARAMETER_NAME = "userId";
-    String USER_ID_PATH_VARIABLE = "/{" + USER_ID_PARAMETER_NAME + "}";
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PutMapping(value = PREFERENCES_PATH + USER_ID_PATH_VARIABLE + KEY_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void savePreferences(@PathVariable(USER_ID_PARAMETER_NAME) String userId, @PathVariable(KEY_PARAMETER_NAME) String key, @RequestBody JsonNode jsonNode);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = PREFERENCES_PATH + USER_ID_PATH_VARIABLE + KEY_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    JsonNode getPreferences(@PathVariable(USER_ID_PARAMETER_NAME) String userId, @PathVariable(KEY_PARAMETER_NAME) String key);
-
-
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = PREFERENCES_PATH + USER_ID_PATH_VARIABLE + KEY_PATH_VARIABLE)
-    void deletePreferences(@PathVariable(USER_ID_PARAMETER_NAME) String userId, @PathVariable(KEY_PARAMETER_NAME) String key);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ViewedPagesResource.java

@@ -1,39 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ViewedPage;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface ViewedPagesResource {
-
-    String REST_PATH = "/viewedPages";
-
-    String FILE_ID = "fileId";
-    String FILE_ID_PATH_VARIABLE = "/{" + FILE_ID + "}";
-
-    String ROLE = "role";
-    String ROLE_PATH_VARIABLE = "/{" + ROLE + "}";
-
-
-    @PostMapping(value = REST_PATH + FILE_ID_PATH_VARIABLE + ROLE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void addPage(@PathVariable(FILE_ID) String fileId, @PathVariable(ROLE) String role, @RequestBody Integer page);
-
-
-    @DeleteMapping(value = REST_PATH + FILE_ID_PATH_VARIABLE + ROLE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void removePage(@PathVariable(FILE_ID) String fileId, @PathVariable(ROLE) String role, @RequestBody Integer page);
-
-
-    @GetMapping(value = REST_PATH + FILE_ID_PATH_VARIABLE + ROLE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ViewedPage> getViewedPages(@PathVariable(FILE_ID) String fileId, @PathVariable(ROLE) String role);
-
-}

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java

@@ -1,51 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.resources;
-
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Watermark;
-
-@ResponseStatus(value = HttpStatus.OK)
-public interface WatermarkResource {
-
-    String WATERMARK_PATH = "/watermark";
-    String CHECK_USED_REST_PATH = "/used";
-    String WATERMARK_ID_PARAMETER_NAME = "watermarkId";
-    String WATERMARK_ID_PATH_VARIABLE = "/{" + WATERMARK_ID_PARAMETER_NAME + "}";
-
-    String DOSSIER_TEMPLATE_ID_PARAMETER_NAME = "dossierTemplateId";
-
-
-    @ResponseStatus(HttpStatus.OK)
-    @PostMapping(value = WATERMARK_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Watermark createOrUpdateWatermark(@RequestBody Watermark watermark);
-
-
-    @GetMapping(value = WATERMARK_PATH + WATERMARK_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Watermark getWatermark(@PathVariable(WATERMARK_ID_PARAMETER_NAME) long watermarkId);
-
-
-    @GetMapping(value = WATERMARK_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Watermark> getWatermarksForDossierTemplateId(@RequestParam(DOSSIER_TEMPLATE_ID_PARAMETER_NAME) String dossierTemplateId);
-
-
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = WATERMARK_PATH + WATERMARK_ID_PATH_VARIABLE)
-    void deleteWatermark(@PathVariable(WATERMARK_ID_PARAMETER_NAME) long watermarkId);
-
-
-    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = WATERMARK_PATH + CHECK_USED_REST_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<Boolean> isWatermarkUsed(@RequestParam(WATERMARK_ID_PARAMETER_NAME) long watermarkId);
-
-}

persistence-service-v1/persistence-service-external-api-impl-v1/build.gradle.kts

@@ -0,0 +1,12 @@
+plugins {
+    id("com.iqser.red.service.java-conventions")
+    id("io.spring.dependency-management") version "1.1.6"
+    id("org.sonarqube") version "4.4.1.3373"
+    id("io.freefair.lombok") version "8.6"
+}
+
+dependencies {
+    api(project(":persistence-service-processor-v1"))
+}
+
+description = "persistence-service-external-api-impl-v1"

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/PersistenceServiceExternalApiConfiguration.java

@@ -0,0 +1,10 @@
+package com.iqser.red.persistence.service.v1.external.api.impl;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan
+public class PersistenceServiceExternalApiConfiguration {
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ApplicationConfigurationController.java

@@ -0,0 +1,74 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_APP_CONFIG;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_APP_CONFIG;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.ApplicationConfigurationEntity;
+import com.iqser.red.service.persistence.management.v1.processor.service.ApplicationConfigService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.ApplicationConfigurationResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.ApplicationConfig;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+
+import jakarta.persistence.Column;
+import jakarta.validation.Valid;
+import lombok.Builder;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class ApplicationConfigurationController implements ApplicationConfigurationResource {
+
+    private final ApplicationConfigService applicationConfigService;
+    private final AuditPersistenceService auditPersistenceService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_APP_CONFIG + "')")
+    public ApplicationConfig createOrUpdateAppConfig(@Valid @RequestBody ApplicationConfig appConfig) {
+
+        var result = MagicConverter.convert(applicationConfigService.saveApplicationConfiguration(convert(appConfig)),
+                                      ApplicationConfig.class);
+
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId("ApplicationConfig")
+                                              .category(AuditCategory.SETTINGS.name())
+                                              .message("Application config has been changed.")
+                                              .build());
+
+        return result;
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_APP_CONFIG + "')")
+    public ApplicationConfig getCurrentApplicationConfig() {
+
+        return MagicConverter.convert(applicationConfigService.getApplicationConfig(), ApplicationConfig.class);
+    }
+
+
+    private ApplicationConfigurationEntity convert(ApplicationConfig appConfig){
+        var entity = ApplicationConfigurationEntity.builder()
+                .downloadCleanupDownloadFilesHours(appConfig.getDownloadCleanupDownloadFilesHours())
+                .downloadCleanupNotDownloadFilesHours(appConfig.getDownloadCleanupNotDownloadFilesHours())
+                .softDeleteCleanupTime(appConfig.getSoftDeleteCleanupTime())
+                .build();
+
+        if(appConfig.getHardDeleteCleanupRetryTime() != null){
+            entity.setHardDeleteCleanupRetryTime(appConfig.getHardDeleteCleanupRetryTime());
+        }
+        return entity;
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/AuditController.java

@@ -0,0 +1,56 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.SEARCH_AUDIT_LOG;
+import static com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter.convert;
+
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.AuditResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditResponse;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditModel;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditSearchRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.CategoryModel;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class AuditController implements AuditResource {
+
+    private final AuditPersistenceService auditPersistenceService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + SEARCH_AUDIT_LOG + "')")
+    public AuditResponse searchAuditLog(@RequestBody AuditSearchRequest auditSearchRequest) {
+
+        var auditModels = convert(auditPersistenceService.search(auditSearchRequest), AuditModel.class);
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(auditSearchRequest.getObjectId())
+                                                     .category(AuditCategory.AUDIT.name())
+                                                     .message("Audit Log has been viewed.")
+                                                     .build());
+
+        return new AuditResponse(auditModels.getElements(), auditModels.getTotalHits(), auditModels.getPage(), auditModels.getPageSize());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + SEARCH_AUDIT_LOG + "')")
+    public List<CategoryModel> getAuditCategories() {
+
+        return auditPersistenceService.getCategories();
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/CustomPermissionMappingController.java

@@ -0,0 +1,78 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.MANAGE_ACL_PERMISSIONS;
+
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.acl.custom.service.CustomPermissionService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.CustomPermissionMappingResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.permission.CustomPermissionMappingModel;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class CustomPermissionMappingController implements CustomPermissionMappingResource {
+
+    private final CustomPermissionService customPermissionService;
+    private final AuditPersistenceService auditPersistenceService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + MANAGE_ACL_PERMISSIONS + "')")
+    public List<CustomPermissionMappingModel> getCustomPermissionMappings(@PathVariable(TARGET_OBJECT_NAME) String targetObject) {
+
+        return customPermissionService.getCustomPermissionMappings(targetObject);
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + MANAGE_ACL_PERMISSIONS + "')")
+    public void saveCustomPermissionMappings(@PathVariable(TARGET_OBJECT_NAME) String targetObject, @RequestBody List<CustomPermissionMappingModel> customPermissionMappingModels) {
+
+        customPermissionService.saveCustomPermissionMappings(targetObject, customPermissionMappingModels);
+
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(targetObject)
+                                              .category(AuditCategory.SETTINGS.name())
+                                              .message("Custom permissions have been changed.")
+                                              .build());
+
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + MANAGE_ACL_PERMISSIONS + "')")
+    public List<CustomPermissionMappingModel> getValidMapping(@PathVariable(TARGET_OBJECT_NAME) String targetObject) {
+
+        return customPermissionService.getExistingPermissions(targetObject);
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + MANAGE_ACL_PERMISSIONS + "')")
+    public Set<String> getAllSupportedTargetObjects() {
+
+        return customPermissionService.getAllSupportedTargetObjects();
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + MANAGE_ACL_PERMISSIONS + "')")
+    public void syncAllCustomPermissions() {
+
+        customPermissionService.syncAllCustomPermissions();
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java

@@ -0,0 +1,380 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DictionaryDifferenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DictionaryService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.utils.StringEncodingUtils;
+import com.iqser.red.service.persistence.management.v1.processor.utils.TypeValueMapper;
+import com.iqser.red.service.persistence.service.v1.api.external.model.UpdateEntries;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DictionaryResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.CreateTypeValue;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.TypeResponse;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.TypeValue;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.UpdateTypeValue;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dictionary.Dictionary;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dictionary.DictionaryDifferenceResponse;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntryType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+
+import feign.FeignException;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class DictionaryController implements DictionaryResource {
+
+    private final DictionaryService dictionaryService;
+    private final AuditPersistenceService auditClient;
+    private final AccessControlService accessControlService;
+    private final DictionaryDifferenceService dictionaryDifferenceService;
+
+
+    @Override
+    public void addEntry(@PathVariable(TYPE_PARAMETER_NAME) String type,
+                         @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                         @RequestBody List<String> entries,
+                         @RequestParam(name = REMOVE_CURRENT_REQUEST_PARAM, defaultValue = "false", required = false) boolean removeCurrent,
+                         @RequestParam(value = DOSSIER_ID_PARAMETER_NAME, required = false) String dossierId,
+                         @RequestParam(value = DICTIONARY_ENTRY_TYPE_PARAM, required = false, defaultValue = DEFAULT_DICTIONARY_ENTRY_TYPE) DictionaryEntryType dictionaryEntryType) {
+
+        addEntries(type, dossierTemplateId, entries, removeCurrent, dossierId, dictionaryEntryType);
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(dossierTemplateId)
+                                         .category(AuditCategory.DICTIONARY.name())
+                                         .message("Dictionary entries were added.")
+                                         .details(Map.of("Type", type, "Number", entries.size()))
+                                         .build());
+    }
+
+
+    private void addEntries(String type, String dossierTemplateId, List<String> entries, boolean removeCurrent, String dossierId, DictionaryEntryType dictionaryEntryType) {
+
+        if (dossierId == null) {
+            dictionaryService.addGlobalEntries(type, dossierTemplateId, entries, removeCurrent, dictionaryEntryType);
+        } else {
+            accessControlService.checkDossierExistenceAndAccessPermissionsToDossier(dossierId);
+
+            dictionaryService.addDossierEntries(type, dossierTemplateId, entries, removeCurrent, dossierId, dictionaryEntryType);
+        }
+    }
+
+
+    @Override
+    public void deleteEntry(@PathVariable(TYPE_PARAMETER_NAME) String type,
+                            @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                            @PathVariable(ENTRY_PARAMETER_NAME) String entry,
+                            @RequestParam(value = DOSSIER_ID_PARAMETER_NAME, required = false) String dossierId,
+                            @RequestParam(value = DICTIONARY_ENTRY_TYPE_PARAM, required = false, defaultValue = DEFAULT_DICTIONARY_ENTRY_TYPE) DictionaryEntryType dictionaryEntryType) {
+
+        deleteEntries(type, dossierTemplateId, Arrays.asList(entry), dossierId, dictionaryEntryType);
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(dossierTemplateId)
+                                         .category(AuditCategory.DICTIONARY.name())
+                                         .message("Dictionary entry was deleted.")
+                                         .details(Map.of("Type", type, "Value", entry))
+                                         .build());
+    }
+
+
+    @Override
+    public void updateEntries(String type, String dossierTemplateId, UpdateEntries updateEntries, String dossierId, DictionaryEntryType dictionaryEntryType) {
+
+        if (dossierId == null) {
+            dictionaryService.updateGlobalEntries(type, dossierTemplateId, updateEntries.entriesToAdd(), updateEntries.entriesToDelete(), dictionaryEntryType);
+        } else {
+            accessControlService.checkDossierExistenceAndAccessPermissionsToDossier(dossierId);
+            dictionaryService.updateDossierEntries(type, dossierTemplateId, updateEntries.entriesToAdd(), updateEntries.entriesToDelete(), dossierId, dictionaryEntryType);
+        }
+
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(dossierTemplateId)
+                                         .category(AuditCategory.DICTIONARY.name())
+                                         .message("Dictionary entries were updated.")
+                                         .details(Map.of("Type",
+                                                         type,
+                                                         "Number of added entries",
+                                                         updateEntries.entriesToAdd() == null ? 0 : updateEntries.entriesToAdd().size(),
+                                                         "Number of deleted entries",
+                                                         updateEntries.entriesToDelete() == null ? 0 : updateEntries.entriesToDelete().size()))
+                                         .build());
+    }
+
+
+    @Override
+    public void deleteEntries(@PathVariable(TYPE_PARAMETER_NAME) String type,
+                              @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                              @RequestBody List<String> entries,
+                              @RequestParam(value = DOSSIER_ID_PARAMETER_NAME, required = false) String dossierId,
+                              @RequestParam(value = DICTIONARY_ENTRY_TYPE_PARAM, required = false, defaultValue = DEFAULT_DICTIONARY_ENTRY_TYPE) DictionaryEntryType dictionaryEntryType) {
+
+        if (dossierId == null) {
+            dictionaryService.deleteGlobalEntries(type, dossierTemplateId, entries, dictionaryEntryType);
+        } else {
+            accessControlService.checkDossierExistenceAndAccessPermissionsToDossier(dossierId);
+            dictionaryService.deleteDossierEntries(type, dossierTemplateId, entries, dossierId, dictionaryEntryType);
+        }
+
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(dossierTemplateId)
+                                         .category(AuditCategory.DICTIONARY.name())
+                                         .message("Dictionary entries were deleted.")
+                                         .details(Map.of("Type", type, "Number", entries.size()))
+                                         .build());
+    }
+
+
+    @Override
+    public void updateType(@PathVariable(TYPE_PARAMETER_NAME) String type,
+                           @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                           @RequestBody UpdateTypeValue typeValue) {
+
+        dictionaryService.updateGlobalType(type, dossierTemplateId, typeValue);
+
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(dossierTemplateId)
+                                         .category(AuditCategory.DICTIONARY.name())
+                                         .message("Dictionary type was updated.")
+                                         .details(Map.of("Type", type))
+                                         .build());
+    }
+
+
+    @Override
+    public TypeValue addType(@Valid @RequestBody CreateTypeValue typeValue) {
+
+        Type result = dictionaryService.addGlobalType(typeValue);
+
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(typeValue.getDossierTemplateId())
+                                         .category(AuditCategory.DICTIONARY.name())
+                                         .message("Dictionary type was added.")
+                                         .details(Map.of("Type", typeValue.getType()))
+                                         .build());
+
+        return MagicConverter.convert(result, TypeValue.class, new TypeValueMapper());
+    }
+
+
+    @Override
+    public void deleteType(@PathVariable(TYPE_PARAMETER_NAME) String type, @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId) {
+
+        dictionaryService.deleteGlobalType(type, dossierTemplateId);
+
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(dossierTemplateId)
+                                         .category(AuditCategory.DICTIONARY.name())
+                                         .message("Dictionary type was deleted.")
+                                         .details(Map.of("Type", type))
+                                         .build());
+    }
+
+
+    @Override
+    public void deleteTypes(@RequestBody List<String> types, @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId) {
+
+        List<String> errorIds = new ArrayList<>();
+
+        for (var type : types) {
+            try {
+                dictionaryService.deleteGlobalType(type, dossierTemplateId);
+
+                auditClient.insertRecord(AuditRequest.builder()
+                                                 .userId(KeycloakSecurity.getUserId())
+                                                 .objectId(dossierTemplateId)
+                                                 .category(AuditCategory.DICTIONARY.name())
+                                                 .message("Dictionary type was deleted.")
+                                                 .details(Map.of("Type", type))
+                                                 .build());
+            } catch (FeignException e) {
+                errorIds.add(type);
+            }
+        }
+
+        if (errorIds.size() > 0) {
+            throw new BadRequestException("Failed to delete dictionary types: " + errorIds);
+        }
+    }
+
+
+    @Override
+    public TypeResponse getAllTypes(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                                    @RequestParam(value = DOSSIER_ID_PARAMETER_NAME, required = false) String dossierId,
+                                    @RequestParam(value = INCLUDE_DELETED_PARAMETER_NAME, required = false, defaultValue = "false") boolean includeDeleted) {
+
+        return dictionaryService.getAllTypes(dossierTemplateId, dossierId, includeDeleted);
+    }
+
+
+    @Override
+    public Colors getColors(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId) {
+
+        return dictionaryService.getColors(dossierTemplateId);
+    }
+
+
+    @Override
+    public void uploadDictionary(@RequestPart(name = "file", required = false) MultipartFile file,
+                                 @PathVariable(TYPE_PARAMETER_NAME) String type,
+                                 @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                                 @RequestParam(value = DOSSIER_ID_PARAMETER_NAME, required = false) String dossierId,
+                                 @RequestParam(value = DICTIONARY_ENTRY_TYPE_PARAM, required = false, defaultValue = DEFAULT_DICTIONARY_ENTRY_TYPE) DictionaryEntryType dictionaryEntryType) {
+
+        validateFile(file);
+
+        try {
+            addEntries(type,
+                       dossierTemplateId,
+                       new String(file.getBytes(), StandardCharsets.UTF_8).lines()
+                               .collect(Collectors.toList()),
+                       true,
+                       dossierId,
+                       dictionaryEntryType);
+        } catch (IOException e) {
+            log.debug(e.getMessage(), e);
+            throw new BadRequestException("Could not upload file.", e);
+        }
+
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(dossierTemplateId)
+                                         .category(AuditCategory.DICTIONARY.name())
+                                         .message("Dictionary has been uploaded.")
+                                         .details(Map.of("Type", type))
+                                         .build());
+    }
+
+
+    private void validateFile(@RequestPart(name = "file", required = false) MultipartFile file) {
+
+        if (file == null || file.isEmpty()) {
+            throw new BadRequestException("File cannot be null or empty");
+        }
+    }
+
+
+    @Override
+    public ResponseEntity<?> downloadDictionary(@PathVariable(TYPE_PARAMETER_NAME) String type,
+                                                @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                                                @RequestParam(value = DOSSIER_ID_PARAMETER_NAME, required = false) String dossierId,
+                                                @RequestParam(value = DICTIONARY_ENTRY_TYPE_PARAM, required = false, defaultValue = DEFAULT_DICTIONARY_ENTRY_TYPE) DictionaryEntryType dictionaryEntryType) {
+
+        byte[] data = null;
+        switch (dictionaryEntryType) {
+            case ENTRY:
+                data = String.join("\n", getDictionaryForType(type, dossierTemplateId, dossierId).getEntries()).getBytes();
+                break;
+            case FALSE_POSITIVE:
+                data = String.join("\n", getDictionaryForType(type, dossierTemplateId, dossierId).getFalsePositiveEntries()).getBytes();
+                break;
+            case FALSE_RECOMMENDATION:
+                data = String.join("\n", getDictionaryForType(type, dossierTemplateId, dossierId).getFalseRecommendationEntries()).getBytes();
+                break;
+        }
+
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setContentType(MediaType.TEXT_PLAIN);
+
+        httpHeaders.add("Content-Disposition", "attachment; filename*=utf-8''" + StringEncodingUtils.urlEncode(type) + ".txt");
+        InputStream is = new ByteArrayInputStream(data);
+
+        return new ResponseEntity<>(new InputStreamResource(is), httpHeaders, HttpStatus.OK);
+    }
+
+
+    @Override
+    public Dictionary getDictionaryForType(@PathVariable(TYPE_PARAMETER_NAME) String type,
+                                           @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                                           @RequestParam(value = DOSSIER_ID_PARAMETER_NAME, required = false) String dossierId) {
+
+        return dictionaryService.getDictionaryForType(type, dossierTemplateId, dossierId);
+    }
+
+
+    @Override
+    public Dictionary getMergedDictionaries(@PathVariable(TYPE_PARAMETER_NAME) String type,
+                                            @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                                            @RequestParam(value = DOSSIER_ID_PARAMETER_NAME) String dossierId) {
+
+        return dictionaryService.getMergedDictionaryForType(type, dossierTemplateId, dossierId);
+    }
+
+
+    @Override
+    public void setColors(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @RequestBody Colors colors) {
+
+        dictionaryService.setColors(dossierTemplateId, colors);
+
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(dossierTemplateId)
+                                         .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                         .message("Colors have been changed.")
+                                         .build());
+    }
+
+
+    @Override
+    public void changeFlags(@PathVariable(TYPE_PARAMETER_NAME) String type,
+                            @PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
+                            @PathVariable(value = DOSSIER_ID_PARAMETER_NAME) String dossierId,
+                            @RequestParam(value = "addToDictionaryAction") boolean addToDictionaryAction) {
+
+        dictionaryService.changeAddToDictionary(type, dossierTemplateId, dossierId, addToDictionaryAction);
+    }
+
+
+    @Override
+    public DictionaryDifferenceResponse getDictionaryDifference(String dossierTemplateId, Set<String> types) {
+
+        DictionaryDifferenceResponse dictionaryDifferenceResponse = dictionaryDifferenceService.calculatedDictionaryDifference(dossierTemplateId, types);
+        auditClient.insertRecord(AuditRequest.builder()
+                                         .userId(KeycloakSecurity.getUserId())
+                                         .objectId(dossierTemplateId)
+                                         .category(AuditCategory.DICTIONARY.name())
+                                         .message("Dictionary differences was calculated.")
+                                         .details(Map.of("DictionaryDifferenceResponse", dictionaryDifferenceResponse, "types", types))
+                                         .build());
+        return dictionaryDifferenceResponse;
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DigitalSignatureController.java

@@ -0,0 +1,198 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DIGITAL_SIGNATURE;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_DIGITAL_SIGNATURE;
+
+import java.util.Base64;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DigitalSignatureEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DigitalSignatureKmsEntity;
+import com.iqser.red.service.persistence.management.v1.processor.service.DigitalSignatureKmsService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DigitalSignatureService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DigitalSignatureTypeService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DigitalSignatureResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DigitalSignatureKms;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DigitalSignatureKmsViewModel;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DigitalSignatureViewModel;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.DigitalSignature;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.DigitalSignatureType;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class DigitalSignatureController implements DigitalSignatureResource {
+
+    private static final String DIGITAL_SIGNATURE_AUDIT_ID = "DigitalSignature";
+    private final DigitalSignatureTypeService digitalSignatureTypeService;
+    private final DigitalSignatureService digitalSignatureService;
+    private final DigitalSignatureKmsService digitalSignatureKmsService;
+    private final AuditPersistenceService auditPersistenceService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DIGITAL_SIGNATURE + "')")
+    public DigitalSignatureType getActiveDigitalSignatureType() {
+
+        return digitalSignatureTypeService.getActiveDigitalSignatureType();
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DIGITAL_SIGNATURE + "')")
+    public void setActiveDigitalSignatureType(DigitalSignatureType digitalSignatureType) {
+
+        digitalSignatureTypeService.setActiveDigitalSignatureType(digitalSignatureType);
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(DIGITAL_SIGNATURE_AUDIT_ID)
+                                                     .category(AuditCategory.SETTINGS.name())
+                                                     .message("Digital signature type has been updated.")
+                                                     .build());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DIGITAL_SIGNATURE + "')")
+    public DigitalSignatureViewModel saveDigitalSignature(@RequestBody DigitalSignature digitalSignatureModel) {
+
+        DigitalSignatureViewModel digitalSignatureViewModel = convertToView(digitalSignatureService.saveDigitalSignature(convert(digitalSignatureModel)));
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(DIGITAL_SIGNATURE_AUDIT_ID)
+                                                     .category(AuditCategory.SETTINGS.name())
+                                                     .message("Digital signature has been saved.")
+                                                     .build());
+        return digitalSignatureViewModel;
+
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DIGITAL_SIGNATURE + "')")
+    public void updateDigitalSignature(@RequestBody DigitalSignatureViewModel digitalSignatureModel) {
+
+        digitalSignatureService.updateDigitalSignature(convert(digitalSignatureModel));
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(DIGITAL_SIGNATURE_AUDIT_ID)
+                                                     .category(AuditCategory.SETTINGS.name())
+                                                     .message("Digital signature has been updated.")
+                                                     .build());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DIGITAL_SIGNATURE + "')")
+    public DigitalSignatureViewModel getDigitalSignature() {
+
+        return convertToView(digitalSignatureService.getDigitalSignature());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DIGITAL_SIGNATURE + "')")
+    public void deleteDigitalSignature() {
+
+        digitalSignatureService.deleteDigitalSignature();
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(DIGITAL_SIGNATURE_AUDIT_ID)
+                                                     .category(AuditCategory.SETTINGS.name())
+                                                     .message("Digital signature has been deleted.")
+                                                     .build());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DIGITAL_SIGNATURE + "')")
+    public DigitalSignatureKmsViewModel saveDigitalSignatureKms(@RequestBody DigitalSignatureKms digitalSignature) {
+
+        DigitalSignatureKmsViewModel result = convert(digitalSignatureKmsService.saveDigitalSignature(digitalSignature));
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(DIGITAL_SIGNATURE_AUDIT_ID)
+                                                     .category(AuditCategory.SETTINGS.name())
+                                                     .message("Digital KMS signature has been saved.")
+                                                     .build());
+        return result;
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DIGITAL_SIGNATURE + "')")
+    public DigitalSignatureKmsViewModel getDigitalSignatureKms() {
+
+        return convert(digitalSignatureKmsService.getDigitalSignature());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DIGITAL_SIGNATURE + "')")
+    public void deleteDigitalSignatureKms() {
+
+        digitalSignatureKmsService.deleteDigitalSignature();
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(DIGITAL_SIGNATURE_AUDIT_ID)
+                                                     .category(AuditCategory.SETTINGS.name())
+                                                     .message("Digital KMS signature has been deleted.")
+                                                     .build());
+    }
+
+
+    private DigitalSignatureKmsViewModel convert(DigitalSignatureKmsEntity digitalSignature) {
+
+        return DigitalSignatureKmsViewModel.builder()
+                .kmsAccessKey(digitalSignature.getKmsAccessKey())
+                .kmsKeyId(digitalSignature.getKmsKeyId())
+                .kmsRegion(digitalSignature.getKmsRegion())
+                .kmsServiceEndpoint(digitalSignature.getKmsServiceEndpoint())
+                .certificateName(digitalSignature.getCertificateName())
+                .build();
+    }
+
+
+    private DigitalSignatureEntity convert(DigitalSignatureViewModel digitalSignature) {
+
+        return DigitalSignatureEntity.builder()
+                .certificateName(digitalSignature.getCertificateName())
+                .contactInfo(digitalSignature.getContactInfo())
+                .location(digitalSignature.getLocation())
+                .reason(digitalSignature.getReason())
+                .build();
+    }
+
+
+    public DigitalSignatureViewModel convertToView(DigitalSignatureEntity model) {
+
+        return DigitalSignatureViewModel.builder()
+                .certificateName(model.getCertificateName())
+                .contactInfo(model.getContactInfo())
+                .location(model.getLocation())
+                .reason(model.getReason())
+                .build();
+    }
+
+
+    public DigitalSignatureEntity convert(DigitalSignature digitalSignature) {
+
+        return DigitalSignatureEntity.builder()
+                .certificateName(digitalSignature.getCertificateName())
+                .contactInfo(digitalSignature.getContactInfo())
+                .location(digitalSignature.getLocation())
+                .password(digitalSignature.getPassword())
+                .reason(digitalSignature.getReason())
+                .privateKey(Base64.getDecoder().decode(digitalSignature.getBase64EncodedPrivateKey()))
+                .build();
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DocumentController.java

@@ -0,0 +1,186 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_REDACTION_LOG;
+import static com.iqser.red.service.persistence.management.v1.processor.service.FeignExceptionHandler.processFeignException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
+import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService;
+import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusService;
+import com.iqser.red.service.persistence.management.v1.processor.utils.StringEncodingUtils;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DocumentResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+
+import feign.FeignException;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+@RestController
+@RequiredArgsConstructor
+public class DocumentController implements DocumentResource {
+
+    private final FileStatusService fileStatusService;
+    private final FileManagementStorageService fileManagementStorageService;
+    private final AccessControlService accessControlService;
+
+
+    @SneakyThrows
+    @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
+    public ResponseEntity<?> getDocumentText(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId) {
+
+        // check access to resources and check for deletion
+        accessControlService.checkDossierExistenceAndViewPermissionsToDossier(dossierId);
+        accessControlService.validateFileResourceExistence(fileId);
+
+        try {
+            return buildZipFileResponseEntity(fileId, dossierId, FileType.DOCUMENT_TEXT);
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    @SneakyThrows
+    @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
+    public ResponseEntity<?> getDocumentPositions(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId) {
+
+        // check access to resources and check for deletion
+        accessControlService.checkDossierExistenceAndViewPermissionsToDossier(dossierId);
+        accessControlService.validateFileResourceExistence(fileId);
+
+        try {
+            return buildZipFileResponseEntity(fileId, dossierId, FileType.DOCUMENT_POSITION);
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    @SneakyThrows
+    @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
+    public ResponseEntity<?> getDocumentStructure(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId) {
+
+        // check access to resources and check for deletion
+        accessControlService.checkDossierExistenceAndViewPermissionsToDossier(dossierId);
+        accessControlService.validateFileResourceExistence(fileId);
+        try {
+            return buildZipFileResponseEntity(fileId, dossierId, FileType.DOCUMENT_STRUCTURE);
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    @SneakyThrows
+    @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
+    public ResponseEntity<?> getDocumentPages(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId) {
+
+        // check access to resources and check for deletion
+        accessControlService.checkDossierExistenceAndViewPermissionsToDossier(dossierId);
+        accessControlService.validateFileResourceExistence(fileId);
+        try {
+            return buildZipFileResponseEntity(fileId, dossierId, FileType.DOCUMENT_PAGES);
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    @SneakyThrows
+    @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
+    public ResponseEntity<?> getSimplifiedSectionText(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId) {
+
+        // check access to resources and check for deletion
+        accessControlService.checkDossierExistenceAndViewPermissionsToDossier(dossierId);
+        accessControlService.validateFileResourceExistence(fileId);
+
+        try {
+
+            HttpHeaders httpHeaders = new HttpHeaders();
+            httpHeaders.setContentType(MediaType.parseMediaType("application/zip"));
+
+            var fileStatus = fileStatusService.getStatus(fileId);
+            String filename = fileStatus.getFilename();
+            if (filename != null) {
+                var index = filename.lastIndexOf(".");
+                String prefix = filename.substring(0, index);
+                filename = prefix + ".json";
+                httpHeaders.add("Content-Disposition", "attachment; filename*=utf-8''" + StringEncodingUtils.urlEncode(prefix) + ".zip");
+            }
+
+            byte[] zipBytes = getZippedBytes(dossierId, fileId, filename, FileType.SIMPLIFIED_TEXT);
+            return new ResponseEntity<>(zipBytes, httpHeaders, HttpStatus.OK);
+
+        } catch (StorageObjectDoesNotExist e) {
+            throw new RuntimeException("Simplified Text is not available", e);
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    private ResponseEntity<byte[]> buildZipFileResponseEntity(String fileId, String dossierId, FileType fileType) throws IOException {
+
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setContentType(MediaType.parseMediaType("application/zip"));
+
+        var fileStatus = fileStatusService.getStatus(fileId);
+        String filename = fileStatus.getFilename();
+        if (filename != null) {
+            var index = filename.lastIndexOf(".");
+            String prefix = filename.substring(0, index);
+            filename = prefix + ".json";
+            httpHeaders.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=utf-8''" + StringEncodingUtils.urlEncode(prefix) + ".zip");
+        }
+
+        byte[] zipBytes = getZippedBytes(dossierId, fileId, filename, fileType);
+        httpHeaders.setContentLength(zipBytes.length);
+        return new ResponseEntity<>(zipBytes, httpHeaders, HttpStatus.OK);
+    }
+
+
+    private byte[] getZippedBytes(String dossierId, String fileId, String filename, FileType fileType) throws IOException {
+
+        try {
+            String objectId = dossierId + "/" + fileId + "." + fileType.name() + fileType.getExtension();
+
+            try (var inputStream = fileManagementStorageService.getObject(TenantContext.getTenantId(), objectId)) {
+                byte[] input = inputStream.readAllBytes();
+                inputStream.close();
+                return zipBytes(filename, input);
+            }
+
+        } catch (StorageObjectDoesNotExist e) {
+            throw new RuntimeException(String.format("%s is not available", fileType.name()), e);
+        }
+    }
+
+
+    public static byte[] zipBytes(String filename, byte[] input) throws IOException {
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ZipOutputStream zos = new ZipOutputStream(baos);
+        ZipEntry entry = new ZipEntry(filename);
+        entry.setSize(input.length);
+        zos.putNextEntry(entry);
+        zos.write(input);
+        zos.closeEntry();
+        zos.close();
+        return baos.toByteArray();
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierAttributesController.java

@@ -0,0 +1,195 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOSSIER_ATTRIBUTES;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOSSIER_ATTRIBUTES_CONFIG;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_DOSSIER_ATTRIBUTES;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_DOSSIER_ATTRIBUTES_CONFIG;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_FILE_ATTRIBUTES;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.utils.DossierAttributeConfigMapper;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity;
+import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierAttributesManagementService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributeConfigPersistenceService;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DossierAttributesResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierAttributes;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierAttributesConfig;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierAttributeConfig;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierAttribute;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class DossierAttributesController implements DossierAttributesResource {
+
+    private final DossierPersistenceService dossierPersistenceService;
+    private final DossierAttributeConfigPersistenceService dossierAttributeConfigPersistenceService;
+    private final AuditPersistenceService auditPersistenceService;
+    private final DossierAttributesManagementService dossierAttributesManagementService;
+    private final AccessControlService accessControlService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES_CONFIG + "')")
+    public DossierAttributesConfig setDossierAttributesConfig(String dossierTemplateId, DossierAttributesConfig dossierAttributesConfig) {
+
+        var result = MagicConverter.convert(dossierAttributeConfigPersistenceService.setDossierAttributesConfig(dossierTemplateId,
+                                                                                                                MagicConverter.convert(dossierAttributesConfig.getDossierAttributeConfigs(),
+                                                                                                                                       DossierAttributeConfigEntity.class)),
+                                            DossierAttributeConfig.class, new DossierAttributeConfigMapper());
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(dossierTemplateId)
+                                                     .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                                     .message("Changed dossier attributes base configuration.")
+                                                     .build());
+        return new DossierAttributesConfig(result);
+
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES_CONFIG + "')")
+    public DossierAttributeConfig addOrUpdateDossierAttributeConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
+                                                                    @RequestBody DossierAttributeConfig dossierAttribute) {
+
+        var result = MagicConverter.convert(dossierAttributeConfigPersistenceService.addOrUpdateDossierAttribute(dossierTemplateId,
+                                                                                                                 MagicConverter.convert(dossierAttribute,
+                                                                                                                                        DossierAttributeConfigEntity.class)),
+                                            DossierAttributeConfig.class, new DossierAttributeConfigMapper());
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(dossierTemplateId)
+                                                     .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                                     .message("Dossier attributes added/updated")
+                                                     .build());
+
+        return result;
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES_CONFIG + "')")
+    public void deleteDossierAttributeConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @PathVariable(DOSSIER_ATTRIBUTE_ID) String dossierAttributeId) {
+
+        dossierAttributeConfigPersistenceService.deleteDossierAttribute(dossierAttributeId);
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(dossierTemplateId)
+                                                     .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                                     .message("Dossier attributes removed")
+                                                     .details(Map.of("DossierAttributeId", dossierAttributeId))
+                                                     .build());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES_CONFIG + "')")
+    public void deleteDossierAttributesConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestParam(DOSSIER_ATTRIBUTE_IDS) List<String> dossierAttributeIds) {
+
+        dossierAttributeConfigPersistenceService.deleteDossierAttributes(dossierAttributeIds);
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(dossierTemplateId)
+                                                     .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                                     .message("Dossier attributes removed")
+                                                     .details(Map.of("DossierAttributeId", dossierAttributeIds))
+                                                     .build());
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_ATTRIBUTES_CONFIG + "')")
+    public DossierAttributesConfig getDossierAttributesConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
+
+        var result = dossierAttributeConfigPersistenceService.getDossierAttributes(dossierTemplateId);
+        return new DossierAttributesConfig(MagicConverter.convert(result, DossierAttributeConfig.class, new DossierAttributeConfigMapper()));
+    }
+
+
+    @PreAuthorize("hasAuthority('" + WRITE_FILE_ATTRIBUTES + "')")
+    public DossierAttributes setDossierAttributes(@PathVariable(DOSSIER_ID) String dossierId, @RequestBody DossierAttributes dossierAttributes) {
+
+        accessControlService.checkDossierExistenceAndAccessPermissionsToDossier(dossierId);
+        accessControlService.verifyUserIsDossierOwner(dossierId);
+        var result = dossierAttributesManagementService.setDossierAttributes(dossierId, dossierAttributes.getDossierAttributeList());
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(dossierId)
+                                                     .category(AuditCategory.DOSSIER.name())
+                                                     .message("Changed dossier attributes.")
+                                                     .build());
+        return new DossierAttributes(result);
+
+    }
+
+
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES + "')")
+    public DossierAttributes addOrUpdateDossierAttribute(String dossierId, DossierAttribute dossierAttribute) {
+
+        accessControlService.checkDossierExistenceAndAccessPermissionsToDossier(dossierId);
+        accessControlService.verifyUserIsDossierOwner(dossierId);
+        DossierAttribute result = dossierAttributesManagementService.addOrUpdateDossierAttribute(dossierId, dossierAttribute);
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(dossierId)
+                                                     .category(AuditCategory.DOSSIER.name())
+                                                     .message("Added or updated dossier attributes.")
+                                                     .build());
+        return new DossierAttributes(List.of(result)); // TODO should be single Object???
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_ATTRIBUTES + "')")
+    public DossierAttributes getDossierAttributes(String dossierId) {
+
+        //check if dossier exists before verifying permissions
+        dossierPersistenceService.findByDossierId(dossierId);
+
+        List<DossierAttribute> result = Collections.emptyList();
+        if (accessControlService.hasUserViewPermissionsForDossier(dossierId)) {
+            result = dossierAttributesManagementService.getDossierAttributes(dossierId);
+        }
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(dossierId)
+                                                     .category(AuditCategory.DOSSIER.name())
+                                                     .message("Got dossier attributes.")
+                                                     .build());
+        return new DossierAttributes(result);
+
+    }
+
+
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES + "')")
+    public void deleteDossierAttribute(String dossierId, String dossierAttributeId) {
+
+        accessControlService.checkDossierExistenceAndAccessPermissionsToDossier(dossierId);
+        accessControlService.verifyUserIsDossierOwner(dossierId);
+        dossierAttributesManagementService.deleteDossierAttribute(dossierId, dossierAttributeId);
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(dossierId)
+                                                     .category(AuditCategory.DOSSIER.name())
+                                                     .message("Changed dossier attributes.")
+                                                     .build());
+
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierController.java

@@ -0,0 +1,633 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.ADD_UPDATE_DOSSIER;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.ARCHIVE_DOSSIER;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.DELETE_DOSSIER;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOSSIER;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.UNARCHIVE_DOSSIER;
+
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeEntity;
+import com.iqser.red.service.persistence.management.v1.processor.model.websocket.DossierEventType;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierCreatorService;
+
+import com.iqser.red.service.persistence.management.v1.processor.service.FilterByPermissionsService;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierChangeResponseV2;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.JsonNode;
+import org.apache.commons.lang3.StringUtils;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.prepost.PostFilter;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.access.prepost.PreFilter;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.google.common.collect.Lists;
+import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService;
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.roles.ApplicationRoles;
+import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierManagementService;
+import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusManagementService;
+import com.iqser.red.service.persistence.management.v1.processor.service.websocket.WebsocketService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributePersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.NotificationPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.users.UserService;
+import com.iqser.red.service.persistence.management.v1.processor.service.users.model.User;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DossierResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierChangeEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierInformation;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AddNotificationRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierAttributes;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.notification.NotificationType;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class DossierController implements DossierResource {
+
+    private static final Set<String> VALID_MEMBER_ROLES = Set.of(ApplicationRoles.RED_USER_ROLE, ApplicationRoles.RED_MANAGER_ROLE);
+
+    private final DossierManagementService dossierManagementService;
+    private final UserService userService;
+    private final FilterByPermissionsService filterByPermissionsService;
+    private final FileStatusManagementService fileStatusManagementService;
+    private final AuditPersistenceService auditPersistenceService;
+    private final NotificationPersistenceService notificationPersistenceService;
+    private final AccessControlService accessControlService;
+    private final DossierACLService dossierACLService;
+    private final DossierCreatorService dossierCreatorService;
+    private final WebsocketService websocketService;
+    private final DossierAttributePersistenceService dossierAttributePersistenceService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public DossierInformation getDossierInformation() {
+
+        return dossierManagementService.getDossierInformation(dossierACLService.getDossierIdsWithViewPermission());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    @PostFilter("hasPermission(filterObject.dossierId, 'Dossier', 'VIEW_OBJECT')")
+    public List<DossierChangeEntry> changesSince(@RequestBody JSONPrimitive<OffsetDateTime> since) {
+
+        return dossierManagementService.changesSince(since)
+                .stream()
+                .map(d -> new DossierChangeEntry(d.getDossierId(), d.isDossierChanges(), d.isFileChanges()))
+                .collect(Collectors.toList());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public DossierChangeResponseV2 changesSinceV2(@RequestBody JSONPrimitive<OffsetDateTime> since) {
+
+        DossierChangeResponseV2 changes = dossierManagementService.changesSinceV2(since);
+
+        // filter only viewables
+        changes.setFileChanges(filterByPermissionsService.onlyViewableHavingDossierId(changes.getFileChanges()));
+        changes.setDossierChanges(filterByPermissionsService.onlyViewableHavingDossierId(changes.getDossierChanges()));
+
+        return changes;
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + ADD_UPDATE_DOSSIER + "') && (#dossierRequest.dossierId == null || hasPermission(#dossierRequest.dossierId, 'Dossier', 'ACCESS_OBJECT') )")
+    public ResponseEntity<Dossier> createDossierOrUpdateDossier(@RequestBody DossierRequest dossierRequest) {
+
+        if (dossierRequest.getDossierId() != null && dossierRequest.getOwnerId() == null) {
+            throw new BadRequestException("Owner must be set for any update");
+        }
+
+        // this code always executes - members, approvers and owner must be valid
+        String ownerId = getAndValidateOwnerId(dossierRequest.getOwnerId());
+        Set<String> members = getAndValidateMembers(ownerId, dossierRequest.getMemberIds());
+        Set<String> approvers = getAndValidateMembers(ownerId, dossierRequest.getApproverIds());
+        members.addAll(approvers);
+
+        if ((dossierRequest.getDownloadFileTypes() == null || dossierRequest.getDownloadFileTypes().isEmpty()) && (dossierRequest.getReportTemplateIds() == null
+                                                                                                                   || dossierRequest.getReportTemplateIds().isEmpty())) {
+            throw new BadRequestException("Download and report types cannot both be empty");
+        }
+
+        // if dossierId is set - load dossier
+        if (StringUtils.isNotEmpty(dossierRequest.getDossierId())) {
+
+            Dossier existingDossier = dossierACLService.enhanceDossierWithACLData(dossierManagementService.getDossierById(dossierRequest.getDossierId(), true, false));
+
+            if (existingDossier.getArchivedTime() != null) {
+                checkValidityForArchivedDossierUpdateRequest(dossierRequest, existingDossier);
+            }
+
+            // update using data from request and computed owner/members/approvers
+            Dossier updatedDossier = dossierManagementService.updateDossier(CreateOrUpdateDossierRequest.builder()
+                                                                                    .dossierName(dossierRequest.getDossierName())
+                                                                                    .description(dossierRequest.getDescription())
+                                                                                    .dossierTemplateId(dossierRequest.getDossierTemplateId())
+                                                                                    .downloadFileTypes(dossierRequest.getDownloadFileTypes())
+                                                                                    .dueDate(dossierRequest.getDueDate())
+                                                                                    .reportTemplateIds(new ArrayList<>(dossierRequest.getReportTemplateIds()))
+                                                                                    .watermarkId(dossierRequest.getWatermarkId())
+                                                                                    .previewWatermarkId(dossierRequest.getPreviewWatermarkId())
+                                                                                    .dossierStatusId(dossierRequest.getDossierStatusId())
+                                                                                    .build(), existingDossier.getId());
+
+            dossierACLService.updateDossierACL(members, approvers, ownerId, updatedDossier.getId());
+            dossierACLService.enhanceDossierWithACLData(updatedDossier);
+
+            updateFileStatusForDossierFiles(updatedDossier.getId(), members);
+
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(KeycloakSecurity.getUserId())
+                                                  .objectId(updatedDossier.getId())
+                                                  .category(AuditCategory.DOSSIER.name())
+                                                  .message("Dossier has been updated.")
+                                                  .build());
+
+            if (existingDossier.getOwnerId() == null || !existingDossier.getOwnerId().equals(ownerId)) {
+                if (ownerId != null && !ownerId.equals(KeycloakSecurity.getUserId())) {
+                    notificationPersistenceService.insertNotification(AddNotificationRequest.builder()
+                                                                              .userId(ownerId)
+                                                                              .issuerId(KeycloakSecurity.getUserId())
+                                                                              .notificationType(NotificationType.DOSSIER_OWNER_SET.name())
+                                                                              .target(Map.of("dossierId", dossierRequest.getDossierId()))
+                                                                              .build());
+                }
+                if (existingDossier.getOwnerId() != null && !existingDossier.getOwnerId().equals(KeycloakSecurity.getUserId())) {
+                    notificationPersistenceService.insertNotification(AddNotificationRequest.builder()
+                                                                              .userId(existingDossier.getOwnerId())
+                                                                              .issuerId(KeycloakSecurity.getUserId())
+                                                                              .notificationType(NotificationType.DOSSIER_OWNER_REMOVED.name())
+                                                                              .target(Map.of("dossierId", dossierRequest.getDossierId()))
+                                                                              .build());
+                }
+            }
+
+            Set<String> uniqueMembers = new LinkedHashSet<>(members);
+            uniqueMembers.addAll(approvers);
+
+            uniqueMembers.stream()
+                    .filter(member -> !member.equals(ownerId) && !member.equals(KeycloakSecurity.getUserId()) && (existingDossier.getMemberIds() == null
+                                                                                                                  || !existingDossier.getMemberIds().contains(member)))
+                    .forEach(member -> notificationPersistenceService.insertNotification(AddNotificationRequest.builder()
+                                                                                                 .userId(member)
+                                                                                                 .issuerId(KeycloakSecurity.getUserId())
+                                                                                                 .notificationType(NotificationType.USER_BECOMES_DOSSIER_MEMBER.name())
+                                                                                                 .target(Map.of("dossierId", dossierRequest.getDossierId()))
+                                                                                                 .build()));
+
+            if (existingDossier.getMemberIds() != null) {
+                existingDossier.getMemberIds()
+                        .stream()
+                        .filter(member -> !members.contains(member) && !approvers.contains(member) && !member.equals(KeycloakSecurity.getUserId()))
+                        .forEach(member -> notificationPersistenceService.insertNotification(AddNotificationRequest.builder()
+                                                                                                     .userId(member)
+                                                                                                     .issuerId(KeycloakSecurity.getUserId())
+                                                                                                     .notificationType(NotificationType.USER_REMOVED_AS_DOSSIER_MEMBER.name())
+                                                                                                     .target(Map.of("dossierId", dossierRequest.getDossierId()))
+                                                                                                     .build()));
+            }
+
+            approvers.stream()
+                    .filter(approver -> !KeycloakSecurity.getUserId().equals(approver) && existingDossier.getMemberIds() != null && existingDossier.getMemberIds()
+                            .contains(approver) && (existingDossier.getApproverIds() == null || !existingDossier.getApproverIds().contains(approver)))
+                    .forEach(approver -> notificationPersistenceService.insertNotification(AddNotificationRequest.builder()
+                                                                                                   .userId(approver)
+                                                                                                   .issuerId(KeycloakSecurity.getUserId())
+                                                                                                   .notificationType(NotificationType.USER_PROMOTED_TO_APPROVER.name())
+                                                                                                   .target(Map.of("dossierId", dossierRequest.getDossierId()))
+                                                                                                   .build()));
+
+            members.stream()
+                    .filter(member -> !member.equals(KeycloakSecurity.getUserId())
+                                      && existingDossier.getApproverIds() != null
+                                      && existingDossier.getApproverIds().contains(member)
+                                      && !approvers.contains(member))
+                    .forEach(member -> notificationPersistenceService.insertNotification(AddNotificationRequest.builder()
+                                                                                                 .userId(member)
+                                                                                                 .issuerId(KeycloakSecurity.getUserId())
+                                                                                                 .notificationType(NotificationType.USER_DEGRADED_TO_REVIEWER.name())
+                                                                                                 .target(Map.of("dossierId", dossierRequest.getDossierId()))
+                                                                                                 .build()));
+
+            websocketService.sendDossierEvent(dossierRequest.getDossierId(), DossierEventType.UPDATE);
+
+            updatedDossier.setDossierAttributes(convertDossierAttributes(dossierAttributePersistenceService.getDossierAttributes(updatedDossier.getId())));
+
+            HttpHeaders httpHeaders = new HttpHeaders();
+            httpHeaders.setContentType(MediaType.APPLICATION_JSON);
+            return new ResponseEntity<>(updatedDossier, httpHeaders, HttpStatus.OK);
+
+        } else {
+            Dossier created = createNewDossier(dossierRequest, ownerId, members, approvers);
+
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(KeycloakSecurity.getUserId())
+                                                  .objectId(created.getId())
+                                                  .category(AuditCategory.DOSSIER.name())
+                                                  .message("Dossier has been created.")
+                                                  .build());
+
+            websocketService.sendDossierEvent(created.getId(), DossierEventType.CREATE);
+            HttpHeaders httpHeaders = new HttpHeaders();
+            httpHeaders.setContentType(MediaType.APPLICATION_JSON);
+            return new ResponseEntity<>(created, httpHeaders, HttpStatus.CREATED);
+        }
+
+    }
+
+
+    private String getAndValidateOwnerId(String ownerId) {
+
+        String currentUserId = KeycloakSecurity.getUserId();
+        // quick check if self, just proceed
+        if (currentUserId.equals(ownerId)) {
+            return currentUserId;
+        }
+
+        String actualOwnerId = ownerId == null ? currentUserId : ownerId;
+
+        var user = userService.getUserById(actualOwnerId);
+        if (user.isEmpty()) {
+            userService.removeDeletedUsers(Collections.singleton(ownerId));
+            actualOwnerId = null;
+        }
+
+        // check he has a manager role, thus he can be the owner
+        if (user.isPresent() && user.get().getRoles()
+                .stream()
+                .noneMatch(ApplicationRoles.RED_MANAGER_ROLE::equals)) {
+            throw new BadRequestException("Make sure provided user id has the manager role.");
+        }
+
+        return actualOwnerId;
+
+    }
+
+
+    private Set<String> getAndValidateMembers(String ownerId, Set<String> memberIds) {
+
+        Set<String> actualMemberIds = memberIds == null ? new TreeSet<>() : memberIds;
+        if (actualMemberIds.stream()
+                .anyMatch(Objects::isNull)) {
+            throw new BadRequestException("Member IDs cannot be null");
+        }
+
+        // add owner automatically
+        if (ownerId != null) {
+            actualMemberIds.add(ownerId);
+        }
+
+        List<User> users = userService.getUsersByIds(actualMemberIds);
+        if (users.size() != actualMemberIds.size()) {
+            Set<String> deletedUserIds = userService.removeDeletedUsers(actualMemberIds);
+            actualMemberIds.removeAll(deletedUserIds);
+        }
+        if (users.stream()
+                .anyMatch(u -> u.getRoles()
+                        .stream()
+                        .noneMatch(VALID_MEMBER_ROLES::contains))) {
+            throw new BadRequestException("Make sure each provided member id has the permission to be a member of a dossier.");
+        }
+        return actualMemberIds;
+    }
+
+
+    private void checkValidityForArchivedDossierUpdateRequest(DossierRequest updatedDossier, Dossier existingDossier) {
+        //these must not be editted for archived dossiers
+        checkEquality(updatedDossier.getDossierTemplateId(), existingDossier.getDossierTemplateId(), "dossier template id");
+        checkEquality(updatedDossier.getDossierName(), existingDossier.getDossierName(), "dossier name");
+        checkEquality(updatedDossier.getDescription(), existingDossier.getDescription(), "the description");
+        checkEquality(updatedDossier.getDueDate(), existingDossier.getDueDate(), "the due date");
+        checkEquality(updatedDossier.getDossierStatusId(), existingDossier.getDossierStatusId(), "dossier status id");
+    }
+
+
+    private void updateFileStatusForDossierFiles(String dossierId, Collection<String> members) {
+
+        fileStatusManagementService.getDossierStatus(dossierId)
+                .stream()
+                .filter(fileStatus -> !fileStatus.isSoftOrHardDeleted())
+                .forEach(f -> {
+
+                    if (f.getAssignee() != null && !members.contains(f.getAssignee())) {
+                        fileStatusManagementService.setCurrentFileAssignee(dossierId, f.getId(), null);
+                    }
+                });
+
+    }
+
+
+    private Dossier createNewDossier(DossierRequest dossier, String ownerId, Set<String> members, Set<String> approvers) {
+
+        Dossier newDossier = dossierCreatorService.addDossier(CreateOrUpdateDossierRequest.builder()
+                                                                      .dossierName(dossier.getDossierName().trim())
+                                                                      .description(dossier.getDescription())
+                                                                      .dossierTemplateId(dossier.getDossierTemplateId())
+                                                                      .downloadFileTypes(dossier.getDownloadFileTypes())
+                                                                      .dueDate(dossier.getDueDate())
+                                                                      .reportTemplateIds(dossier.getReportTemplateIds()
+                                                                                         != null ? new ArrayList<>(dossier.getReportTemplateIds()) : Lists.newArrayList())
+                                                                      .watermarkId(dossier.getWatermarkId())
+                                                                      .previewWatermarkId(dossier.getPreviewWatermarkId())
+                                                                      .dossierStatusId(dossier.getDossierStatusId())
+                                                                      .build(), members, approvers, ownerId);
+
+        dossierACLService.enhanceDossierWithACLData(newDossier);
+        newDossier.setDossierAttributes(new DossierAttributes());
+
+        return newDossier;
+
+    }
+
+
+    private <T> void checkEquality(T updatedValue, T existingValue, String message) {
+
+        if (updatedValue == null && existingValue != null || updatedValue != null && existingValue == null) {
+            throw new BadRequestException(String.format("You cannot edit %s in an archived dossier.", message));
+        }
+        if (updatedValue == null && existingValue == null) {
+            return;
+        }
+
+        if (!updatedValue.equals(existingValue)) {
+            throw new BadRequestException(String.format("You cannot edit %s in an archived dossier.", message));
+        }
+    }
+
+
+    @PreAuthorize("hasAuthority('" + DELETE_DOSSIER + "')")
+    public void deleteDossier(@PathVariable(DOSSIER_ID_PARAM) String dossierId) {
+
+        Dossier dossier = dossierACLService.enhanceDossierWithACLData(dossierManagementService.getDossierById(dossierId, true, false));
+        accessControlService.checkAccessPermissionsToDossier(dossierId);
+
+        if (dossier.getOwnerId() != null && !dossier.getOwnerId().equals(KeycloakSecurity.getUserId())) {
+            throw new AccessDeniedException("Can not delete dossier that is owned by a different user");
+        }
+
+
+        dossierManagementService.softDeleteDossier(dossierId);
+
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(dossierId)
+                                              .category(AuditCategory.DOSSIER.name())
+                                              .message("Dossier moved to trash.")
+                                              .build());
+
+        dossier.getMemberIds()
+                .stream()
+                .filter(m -> !KeycloakSecurity.getUserId().equals(m))
+                .forEach(member -> notificationPersistenceService.insertNotification(AddNotificationRequest.builder()
+                                                                                             .userId(member)
+                                                                                             .issuerId(KeycloakSecurity.getUserId())
+                                                                                             .notificationType(NotificationType.DOSSIER_DELETED.name())
+                                                                                             .target(Map.of("dossierId", dossierId, "dossierName", dossier.getDossierName()))
+                                                                                             .build()));
+
+        websocketService.sendDossierEvent(dossierId, DossierEventType.SOFT_DELETE);
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public JSONPrimitive<Map<String, Dossier>> getDossiersByIds(@RequestBody JSONPrimitive<Set<String>> dossierIds) {
+
+        // filter dossiers based on view
+        var viewableDossierIds = filterByPermissionsService.onlyViewableDossierIds(dossierIds.getValue());
+        // load dossiers
+        var dossiers = dossierManagementService.getDossiersByIds(viewableDossierIds);
+
+        // add attributes and ACL - already filtered before loading
+        enhanceDossiersWithAttributeAndACLData(dossiers,false);
+
+        // build response
+        var responseMap = new LinkedHashMap<String, Dossier>();
+        for (var dossier : dossiers) {
+            responseMap.put(dossier.getId(), dossier);
+        }
+
+        return new JSONPrimitive<>(responseMap);
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public Dossier getDossier(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
+                              @RequestParam(name = INCLUDE_ARCHIVED_PARAM, defaultValue = "false", required = false) boolean includeArchived,
+                              @RequestParam(name = INCLUDE_DELETED_PARAM, defaultValue = "false", required = false) boolean includeDeleted) {
+
+        accessControlService.checkViewPermissionsToDossier(dossierId);
+        var dossier = dossierManagementService.getDossierById(dossierId, includeArchived, includeDeleted);
+        dossier.setDossierAttributes(convertDossierAttributes(dossierAttributePersistenceService.getDossierAttributes(dossierId)));
+        return dossierACLService.enhanceDossierWithACLData(dossier);
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public List<Dossier> getDossiers(@RequestParam(name = INCLUDE_ARCHIVED_PARAM, defaultValue = "false", required = false) boolean includeArchived,
+                                     @RequestParam(name = INCLUDE_DELETED_PARAM, defaultValue = "false", required = false) boolean includeDeleted) {
+
+        var dossiers = dossierManagementService.getAllDossiers(includeArchived, includeDeleted);
+        return enhanceDossiersWithAttributeAndACLData(dossiers);
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public List<Dossier> getDossiersForDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId,
+                                                       @RequestParam(name = INCLUDE_ARCHIVED_PARAM, defaultValue = "false", required = false) boolean includeArchived,
+                                                       @RequestParam(name = INCLUDE_DELETED_PARAM, defaultValue = "false", required = false) boolean includeDeleted) {
+
+        var dossiers = dossierManagementService.getAllDossiersForDossierTemplateId(dossierTemplateId, includeArchived, includeDeleted);
+        return enhanceDossiersWithAttributeAndACLData(dossiers);
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public List<Dossier> getSoftDeletedDossiers() {
+
+        var dossiers = dossierManagementService.getSoftDeletedDossiers();
+        return enhanceDossiersWithAttributeAndACLData(dossiers);
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public List<Dossier> getArchivedDossiers() {
+
+        var dossiers = dossierManagementService.getArchivedDossiers();
+        return enhanceDossiersWithAttributeAndACLData(dossiers);
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public List<Dossier> getArchivedDossiersForDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId) {
+
+        var dossiers = dossierManagementService.getArchivedDossiersForDossierTemplateId(dossierTemplateId);
+        return enhanceDossiersWithAttributeAndACLData(dossiers);
+    }
+
+
+    @PreAuthorize("hasAuthority('" + ARCHIVE_DOSSIER + "')")
+    @PreFilter("hasPermission(filterObject, 'Dossier', 'ACCESS_OBJECT')")
+    public void archiveDossiers(@RequestBody Set<String> dossierIds) {
+
+        for (String dossierId : dossierIds) {
+            accessControlService.verifyUserIsDossierOwner(dossierId);
+        }
+        dossierManagementService.archiveDossiers(dossierIds);
+
+        for (String dossierId : dossierIds) {
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(KeycloakSecurity.getUserId())
+                                                  .objectId(dossierId)
+                                                  .category(AuditCategory.DOSSIER.name())
+                                                  .message("Dossier archived.")
+                                                  .build());
+            websocketService.sendDossierEvent(dossierId, DossierEventType.ARCHIVE);
+        }
+    }
+
+
+    @PreAuthorize("hasAuthority('" + UNARCHIVE_DOSSIER + "')")
+    @PreFilter("hasPermission(filterObject, 'Dossier', 'ACCESS_OBJECT')")
+    public void unarchiveDossiers(@RequestBody Set<String> dossierIds) {
+
+        dossierManagementService.unarchiveDossiers(dossierIds);
+
+        for (String dossierId : dossierIds) {
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(KeycloakSecurity.getUserId())
+                                                  .objectId(dossierId)
+                                                  .category(AuditCategory.DOSSIER.name())
+                                                  .message("Dossier restored from archive.")
+                                                  .build());
+            websocketService.sendDossierEvent(dossierId, DossierEventType.UNARCHIVE);
+        }
+    }
+
+
+    @PreAuthorize("hasAuthority('" + DELETE_DOSSIER + "')")
+    @PreFilter("hasPermission(filterObject, 'Dossier', 'ACCESS_OBJECT')")
+    public void hardDeleteDossiers(@RequestParam(DOSSIER_ID_PARAM) Set<String> dossierIds) {
+
+        var filteredDossierIds = filterDossierIdsByOwnedKeepUnowned(dossierIds);
+
+        dossierManagementService.hardDeleteDossiers(filteredDossierIds);
+
+        for (String dossierId : filteredDossierIds) {
+
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(KeycloakSecurity.getUserId())
+                                                  .objectId(dossierId)
+                                                  .category(AuditCategory.DOSSIER.name())
+                                                  .message("Dossier permanently deleted.")
+                                                  .build());
+            websocketService.sendDossierEvent(dossierId, DossierEventType.HARD_DELETE);
+        }
+    }
+
+
+    @PreAuthorize("hasAuthority('" + DELETE_DOSSIER + "')")
+    @PreFilter("hasPermission(filterObject, 'Dossier', 'ACCESS_OBJECT')")
+    public void undeleteDossiers(@RequestBody Set<String> dossierIds) {
+
+        var filteredDossierIds = filterDossierIdsByOwnedKeepUnowned(dossierIds);
+
+        dossierManagementService.undeleteDossiers(filteredDossierIds);
+
+        for (String dossierId : filteredDossierIds) {
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(KeycloakSecurity.getUserId())
+                                                  .objectId(dossierId)
+                                                  .category(AuditCategory.DOSSIER.name())
+                                                  .message("Dossier restored from trash.")
+                                                  .build());
+            websocketService.sendDossierEvent(dossierId, DossierEventType.UNDELETE);
+
+        }
+    }
+
+
+    private Set<String> filterDossierIdsByOwnedKeepUnowned(Set<String> dossierIds) {
+
+        return dossierIds.stream()
+                .map(id -> dossierManagementService.getDossierById(id, true, true))
+                .map(dossierACLService::enhanceDossierWithACLData)
+                .filter(dossier -> dossier.getOwnerId() == null || dossier.getOwnerId().equals(KeycloakSecurity.getUserId()))
+                .map(Dossier::getId)
+                .collect(Collectors.toSet());
+    }
+
+
+    private DossierAttributes convertDossierAttributes(List<DossierAttributeEntity> dossierAttributeEntities) {
+
+        Map<String, String> attributeIdToValue = new HashMap<>();
+        for (DossierAttributeEntity dossierAttributeEntity : dossierAttributeEntities) {
+            attributeIdToValue.put(dossierAttributeEntity.getId().getDossierAttributeConfigId(), dossierAttributeEntity.getValue());
+        }
+        return new DossierAttributes(attributeIdToValue);
+    }
+
+    private List<Dossier> enhanceDossiersWithAttributeAndACLData(List<Dossier> dossiers) {
+
+            return enhanceDossiersWithAttributeAndACLData(dossiers, true);
+    }
+
+    private List<Dossier> enhanceDossiersWithAttributeAndACLData(List<Dossier> dossiers, boolean filter) {
+
+        // filter first, only load attributes and ACL for viewable dossiers
+        List<Dossier> filteredDossiers = filter ? filterByPermissionsService.onlyViewableDossiers(dossiers) : dossiers;
+
+        // load all attributes at once
+        var attributes = dossierAttributePersistenceService.getDossierAttributes(filteredDossiers.stream().map(Dossier::getId).collect(Collectors.toSet()));
+        var attributesMap = new HashMap<String, List<DossierAttributeEntity>>();
+        for (DossierAttributeEntity attribute : attributes) {
+            attributesMap.computeIfAbsent(attribute.getId().getDossierId(), k -> new ArrayList<>()).add(attribute);
+        }
+
+        for (var dossier : filteredDossiers) {
+            // set attributes
+            dossier.setDossierAttributes(convertDossierAttributes(attributesMap.getOrDefault(dossier.getId(), new ArrayList<>())));
+            // set ACL data
+            dossierACLService.enhanceDossierWithACLData(dossier);
+        }
+        return filteredDossiers;
+    }
+
+}
+

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierStatsController.java

@@ -0,0 +1,52 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOSSIER;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.access.prepost.PreFilter;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierStatsService;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DossierStatsResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierStats;
+
+import feign.FeignException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class DossierStatsController implements DossierStatsResource {
+
+    private final DossierStatsService dossierStatsService;
+    private final AccessControlService accessControlService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    public DossierStats getDossierStats(@PathVariable(DOSSIER_ID_PARAM) String dossierId) {
+
+        accessControlService.checkViewPermissionsToDossier(dossierId);
+        return dossierStatsService.getDossierStats(dossierId);
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER + "')")
+    @PreFilter("hasPermission(filterObject, 'Dossier', 'VIEW_OBJECT')")
+    public List<DossierStats> getDossierStats(@RequestBody Set<String> dossierIds) {
+
+        return dossierIds.stream()
+                .map(dossierStatsService::getDossierStats)
+                .collect(Collectors.toList());
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierStatusController.java

@@ -0,0 +1,121 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOSSIER_STATUS;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_DOSSIER_STATUS;
+
+import java.util.List;
+
+import jakarta.transaction.Transactional;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierStatusPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.utils.ColorUtils;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DossierStatusResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierStatusRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.CreateOrUpdateDossierStatusRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierStatusInfo;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class DossierStatusController implements DossierStatusResource {
+
+    private final DossierStatusPersistenceService dossierStatusPersistenceService;
+    private final AuditPersistenceService auditPersistenceService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_STATUS + "')")
+    public DossierStatusInfo createOrUpdateDossierStatus(@RequestBody DossierStatusRequest dossierStatusRequest) {
+
+        if (dossierStatusRequest.getDossierTemplateId() == null) {
+            throw new BadRequestException("Dossier Template must be set for creation");
+        }
+        if (dossierStatusRequest.getName() == null || dossierStatusRequest.getName().isEmpty()) {
+            throw new BadRequestException("Dossier status name must be set");
+        }
+        //validate color
+        ColorUtils.validateColor(dossierStatusRequest.getColor());
+        //validate rank
+        if (dossierStatusRequest.getRank() < 0) {
+            throw new BadRequestException("The rank must not be negative");
+        }
+        var response = dossierStatusPersistenceService.createOrUpdateDossierStatus(CreateOrUpdateDossierStatusRequest.builder()
+                                                                                           .dossierStatusId(dossierStatusRequest.getDossierStatusId())
+                                                                                           .name(dossierStatusRequest.getName())
+                                                                                           .description(dossierStatusRequest.getDescription())
+                                                                                           .dossierTemplateId(dossierStatusRequest.getDossierTemplateId())
+                                                                                           .rank(dossierStatusRequest.getRank())
+                                                                                           .color(dossierStatusRequest.getColor())
+                                                                                           .build());
+
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(dossierStatusRequest.getDossierTemplateId())
+                                              .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                              .message("Dossier states have been updated.")
+                                              .build());
+
+
+        return MagicConverter.convert(response, DossierStatusInfo.class);
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_STATUS + "')")
+    public List<DossierStatusInfo> getAllDossierStatusForTemplate(@PathVariable("dossierTemplateId") String dossierTemplateId) {
+
+        return dossierStatusPersistenceService.getAllDossierStatusForTemplate(dossierTemplateId);
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_STATUS + "')")
+    public List<DossierStatusInfo> getAllDossierStatuses(@RequestBody List<String> dossierTemplateIds) {
+
+        return dossierStatusPersistenceService.getAllDossierStatuses(dossierTemplateIds);
+    }
+
+
+    @Override
+    @Transactional
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_STATUS + "')")
+    public DossierStatusInfo getDossierStatus(@PathVariable("dossierStatusId") String dossierStatusId) {
+
+        return dossierStatusPersistenceService.getDossierStatusInfo(dossierStatusId);
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_STATUS + "')")
+    public void deleteDossierStatus(@PathVariable("dossierStatusId") String dossierStatusId,
+                                    @RequestParam(value = DOSSIER_STATUS_REPLACE_ID, required = false) String replaceDossierStatusId) {
+
+        var dossierTemplateId = dossierStatusPersistenceService.getDossierStatus(dossierStatusId).getDossierTemplateId();
+
+        dossierStatusPersistenceService.deleteDossierStatus(dossierStatusId, replaceDossierStatusId);
+
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(dossierTemplateId)
+                                              .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                              .message("Dossier state has been deleted.")
+                                              .build());
+
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java

@@ -0,0 +1,320 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOSSIER_TEMPLATES;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_DOSSIER_TEMPLATES;
+import static com.iqser.red.service.persistence.management.v1.processor.service.FeignExceptionHandler.processFeignException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService;
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierManagementService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierTemplateManagementService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierTemplateStatsService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.users.UserService;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DossierTemplateResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DownloadResponse;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.CloneDossierTemplateRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.CreateOrUpdateDossierTemplateRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplate;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplateStats;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplateStatus;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ExportDownloadRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.importexport.ImportDossierTemplateRequest;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+
+import feign.FeignException;
+import io.micrometer.core.annotation.Timed;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class DossierTemplateController implements DossierTemplateResource {
+
+    private final DossierTemplateManagementService dossierTemplateManagementService;
+    private final DossierTemplateStatsService dossierTemplateStatsService;
+    private final AuditPersistenceService auditPersistenceService;
+    private final DossierManagementService dossierManagementService;
+    private final DossierACLService dossierACLService;
+    private final UserService userService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_TEMPLATES + "')")
+    public DossierTemplateModel createOrUpdateDossierTemplate(@RequestBody DossierTemplateModel dossierTemplateModel) {
+
+        String userId = KeycloakSecurity.getUserId();
+        dossierTemplateModel.setCreatedBy(userId);
+        dossierTemplateModel.setModifiedBy(userId);
+        var dossierTemplate = new CreateOrUpdateDossierTemplateRequest();
+        BeanUtils.copyProperties(dossierTemplateModel, dossierTemplate);
+        try {
+            DossierTemplateModel response = convert(dossierTemplateManagementService.createOrUpdateDossierTemplate(dossierTemplate));
+
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(KeycloakSecurity.getUserId())
+                                                  .objectId(response.getDossierTemplateId())
+                                                  .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                                  .message("Dossier Template has been added or updated")
+                                                  .build());
+            return response;
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_TEMPLATES + "')")
+    public List<DossierTemplateModel> getAllDossierTemplates() {
+
+        return dossierTemplateManagementService.getAllDossierTemplates()
+                .stream()
+                .map(this::convert)
+                .collect(Collectors.toList());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_TEMPLATES + "')")
+    public DossierTemplateModel getDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
+
+        try {
+            return convert(dossierTemplateManagementService.getDossierTemplate(dossierTemplateId));
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_TEMPLATES + "')")
+    public void deleteDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
+
+        String userId = KeycloakSecurity.getUserId();
+
+        List<Dossier> dossiers = dossierManagementService.getAllDossiers(true, false);
+        if (dossiers != null && dossiers.stream()
+                .anyMatch(dossier -> dossier.getDossierTemplateId().equals(dossierTemplateId))) {
+            throw new ConflictException("Can not delete dossier template because there are dossiers based on it");
+        }
+
+        dossierTemplateManagementService.deleteDossierTemplate(dossierTemplateId, userId);
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(dossierTemplateId)
+                                              .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                              .message("Dossier Template has been deleted")
+                                              .build());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_TEMPLATES + "')")
+    public void deleteDossierTemplates(@RequestBody List<String> dossierTemplateIds) {
+
+        String userId = KeycloakSecurity.getUserId();
+        List<String> errorIds = new ArrayList<>();
+
+        for (String dossierTemplateId : dossierTemplateIds) {
+            try {
+                List<Dossier> dossiers = dossierManagementService.getAllDossiers(true, false);
+                if (dossiers != null && dossiers.stream()
+                        .anyMatch(dossier -> dossier.getDossierTemplateId().equals(dossierTemplateId))) {
+                    throw new ConflictException("Can not delete dossier template because there are dossiers based on it");
+                }
+
+                dossierTemplateManagementService.deleteDossierTemplate(dossierTemplateId, userId);
+                auditPersistenceService.audit(AuditRequest.builder()
+                                                      .userId(KeycloakSecurity.getUserId())
+                                                      .objectId(dossierTemplateId)
+                                                      .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                                      .message("Dossier template has been deleted")
+                                                      .build());
+            } catch (FeignException e) {
+                errorIds.add(dossierTemplateId);
+            }
+        }
+
+        if (!errorIds.isEmpty()) {
+            throw new BadRequestException("Failed to delete dossier templates with ids: " + errorIds);
+        }
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_TEMPLATES + "')")
+    public DossierTemplateModel cloneDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
+                                                     @RequestBody CloneDossierTemplateRequest cloneDossierTemplateRequest) {
+
+        String userId = KeycloakSecurity.getUserId();
+
+        try {
+
+            DossierTemplateModel response = convert(dossierTemplateManagementService.cloneDossierTemplate(dossierTemplateId, cloneDossierTemplateRequest));
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(userId)
+                                                  .objectId(response.getDossierTemplateId())
+                                                  .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                                  .message("Dossier Template has been cloned")
+                                                  .build());
+            return response;
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_TEMPLATES + "')")
+    public DossierTemplateStats getDossierTemplateStats(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
+
+        try {
+            var stats = dossierTemplateStatsService.getDossierTemplateStats(dossierTemplateId);
+            enhanceDossierTemplateStatsWithACLMemberDetails(stats);
+            return stats;
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_TEMPLATES + "')")
+    public List<DossierTemplateStats> getDossierTemplateStats() {
+
+        try {
+            var statsList = dossierTemplateStatsService.getDossierTemplateStats();
+            statsList.forEach(this::enhanceDossierTemplateStatsWithACLMemberDetails);
+            return statsList;
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_TEMPLATES + "')")
+    public DownloadResponse prepareExportDownload(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
+
+        try {
+            ExportDownloadRequest request = ExportDownloadRequest.builder().dossierTemplateId(dossierTemplateId).userId(KeycloakSecurity.getUserId()).build();
+            var response = dossierTemplateManagementService.prepareExportDownload(request);
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(KeycloakSecurity.getUserId())
+                                                  .objectId(response.getValue())
+                                                  .category(AuditCategory.DOWNLOAD.name())
+                                                  .message("Export Download was prepared")
+                                                  .details(Map.of("dossierTemplateId", request.getDossierTemplateId()))
+                                                  .build());
+            return new DownloadResponse(response.getValue());
+        } catch (FeignException e) {
+            throw processFeignException(e);
+        }
+    }
+
+
+    @Timed
+    @PreAuthorize("hasAuthority('" + WRITE_DOSSIER_TEMPLATES + "')")
+    public DossierTemplateModel importDossierTemplate(@RequestPart(name = "file") MultipartFile file,
+                                                      @RequestParam(value = DOSSIER_TEMPLATE_ID, required = false) String dossierTemplateId,
+                                                      @RequestParam(value = "updateExistingDossierTemplate", required = false, defaultValue = "false") boolean updateExistingDossierTemplate) {
+
+        String originalFileName = file.getOriginalFilename();
+        if (originalFileName == null || originalFileName.isEmpty()) {
+            throw new BadRequestException("Could not upload file, no filename provided.");
+        }
+        var extension = originalFileName.substring(originalFileName.lastIndexOf(".") + 1).toLowerCase(Locale.ROOT);
+        if ("zip".equalsIgnoreCase(extension)) {
+            if (StringUtils.isEmpty(dossierTemplateId) && updateExistingDossierTemplate) {
+                throw new BadRequestException("Could not update with dossier template empty");
+            }
+            try {
+                if (dossierTemplateId != null && updateExistingDossierTemplate) {
+                    dossierTemplateManagementService.getDossierTemplate(dossierTemplateId); //check if the dossierTemplate to update exists
+                }
+
+                ImportDossierTemplateRequest request = ImportDossierTemplateRequest.builder()
+                        .dossierTemplateId(dossierTemplateId)
+                        .updateExistingDossierTemplate(updateExistingDossierTemplate)
+                        .userId(KeycloakSecurity.getUserId())
+                        .archive(file.getBytes())
+                        .build();
+                DossierTemplate loadedDossierTemplate = dossierTemplateManagementService.importDossierTemplate(request);
+                auditPersistenceService.audit(AuditRequest.builder()
+                                                      .userId(KeycloakSecurity.getUserId())
+                                                      .objectId(loadedDossierTemplate.getId())
+                                                      .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                                      .message("Dossier template was imported")
+                                                      .details(Map.of("dossierTemplateId", loadedDossierTemplate.getId()))
+                                                      .build());
+                return convert(loadedDossierTemplate);
+            } catch (IOException e) {
+                throw new BadRequestException(e.getMessage(), e);
+            } catch (FeignException e) {
+                throw processFeignException(e);
+            }
+        } else {
+            throw new BadRequestException("Invalid extension");
+        }
+    }
+
+
+    private void enhanceDossierTemplateStatsWithACLMemberDetails(DossierTemplateStats stats) {
+
+        Set<String> members = new HashSet<>();
+        stats.getDossiersInTemplate()
+                .forEach(d -> members.addAll(dossierACLService.getMembers(d)));
+        stats.setNumberOfPeople(members.size());
+    }
+
+
+    private DossierTemplateModel convert(DossierTemplate dossierTemplate) {
+
+        return DossierTemplateModel.builder()
+                .id(dossierTemplate.getId())
+                .name(dossierTemplate.getName())
+                .description(dossierTemplate.getDescription())
+                .dateAdded(dossierTemplate.getDateAdded())
+                .dateModified(dossierTemplate.getDateModified())
+                .createdBy(dossierTemplate.getCreatedBy())
+                .modifiedBy(dossierTemplate.getModifiedBy())
+                .validFrom(dossierTemplate.getValidFrom())
+                .validTo(dossierTemplate.getValidTo())
+                .downloadFileTypes(dossierTemplate.getDownloadFileTypes())
+                .status(DossierTemplateStatus.valueOf(dossierTemplate.getDossierTemplateStatus().name()))
+                .keepImageMetadata(dossierTemplate.isKeepImageMetadata())
+                .keepHiddenText(dossierTemplate.isKeepHiddenText())
+                .keepOverlappingObjects(dossierTemplate.isKeepOverlappingObjects())
+                .applyDictionaryUpdatesToAllDossiersByDefault(dossierTemplate.isApplyDictionaryUpdatesToAllDossiersByDefault())
+                .ocrByDefault(dossierTemplate.isOcrByDefault())
+                .removeWatermark(dossierTemplate.isRemoveWatermark())
+                .build();
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateStatsController.java

@@ -0,0 +1,33 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOSSIER_TEMPLATES;
+
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierTemplateStatsService;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DossierTemplateStatsResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplateDictionaryStats;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class DossierTemplateStatsController implements DossierTemplateStatsResource {
+
+    private final DossierTemplateStatsService dossierTemplateStatsService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + READ_DOSSIER_TEMPLATES + "')")
+    public List<DossierTemplateDictionaryStats> getDossierTemplateStats(Set<String> dossierTemplateIds) {
+
+        return dossierTemplateStatsService.getDossierTemplateStats(dossierTemplateIds);
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java

@@ -0,0 +1,342 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.PROCESS_DOWNLOAD;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOWNLOAD_STATUS;
+
+import java.io.BufferedInputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import com.iqser.red.persistence.service.v1.external.api.impl.service.OneTimeTokenService;
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
+import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierManagementService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DownloadService;
+import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService;
+import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusManagementService;
+import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.utils.StringEncodingUtils;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.DownloadResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DownloadResponse;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.DownloadStatusResponse;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.PrepareDownloadRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.PrepareDownloadWithOptionRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.RemoveDownloadRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DownloadFileType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileModel;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadStatus;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadWithOptionRequest;
+import com.iqser.red.storage.commons.service.StorageService;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class DownloadController implements DownloadResource {
+
+    private static final Pattern COLOR_PATTERN = Pattern.compile("^#[\\da-f]{6,6}$");
+
+    private final DossierManagementService dossierService;
+    private final FileStatusService fileStatusService;
+    private final DownloadService downloadService;
+    private final StorageService storageService;
+    private final AuditPersistenceService auditPersistenceService;
+    private final OneTimeTokenService oneTimeTokenDownloadService;
+    private final AccessControlService accessControlService;
+    private final FileManagementStorageService fileManagementStorageService;
+    private final FileStatusManagementService fileStatusManagementService;
+
+    private final String REPORT_INFO = "/REPORT_INFO.json";
+
+    @Value("${storage.backend}")
+    private String storageBackend;
+
+
+    @Deprecated(forRemoval = true)
+    @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
+    public DownloadResponse prepareDownload(@RequestBody PrepareDownloadRequest request) {
+
+        if (request.getIncludeUnprocessed() == null) {
+            request.setIncludeUnprocessed(true);
+        }
+
+        // check the user is non-member or reviewer
+        accessControlService.verifyUserIsDossierOwnerOrApprover(request.getDossierId());
+        var response = downloadService.prepareDownload(convert(request));
+        auditPersistenceService.insertRecord(AuditRequest.builder()
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(response.getValue())
+                                                     .category(AuditCategory.DOWNLOAD.name())
+                                                     .message("Download was prepared")
+                                                     .details(Map.of("dossierId", request.getDossierId()))
+                                                     .build());
+        return new DownloadResponse(response.getValue());
+    }
+
+
+    @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
+    public DownloadResponse prepareDownload(@RequestBody PrepareDownloadWithOptionRequest request) {
+
+        if (request.getIncludeUnprocessed() == null) {
+            request.setIncludeUnprocessed(true);
+        }
+
+        validateDossierId(request.getDossierId());
+
+        validateAndFilterFileIds(request);
+
+        if ((request.getDownloadFileTypes() == null || request.getDownloadFileTypes().isEmpty()) && (request.getReportTemplateIds() == null || request.getReportTemplateIds()
+                .isEmpty())) {
+            throw new BadRequestException("Download and report types cannot both be empty");
+        }
+
+        if (request.getRedactionPreviewColor() != null && !COLOR_PATTERN.matcher(request.getRedactionPreviewColor()).matches()) {
+            throw new BadRequestException("The specified redaction-preview-color is malformed.");
+        }
+
+        var response = downloadService.prepareDownload(convert(request));
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(response.getValue())
+                                              .category(AuditCategory.DOWNLOAD.name())
+                                              .message("Download was prepared")
+                                              .details(Map.of("dossierId", request.getDossierId()))
+                                              .build());
+        return new DownloadResponse(response.getValue());
+    }
+
+
+    private void validateDossierId(String dossierId) {
+
+        if (StringUtils.isBlank(dossierId)) {
+            throw new BadRequestException("Empty dossier id");
+        }
+        dossierService.getDossierById(dossierId, true, false);
+        accessControlService.verifyUserIsDossierOwnerOrApprover(dossierId);
+    }
+
+
+    private void validateAndFilterFileIds(PrepareDownloadWithOptionRequest request) {
+
+        List<FileModel> validFiles = fileStatusService.getDossierStatus(request.getDossierId());
+        var fileIds = request.getFileIds();
+        if (fileIds != null && !fileIds.isEmpty()) { // validate the ids provided
+            if(fileIds.size() == 1) {
+                fileStatusManagementService.getFileStatus(fileIds.get(0), false);
+            }
+            validFiles = validFiles.stream()
+                    .filter(f -> fileIds.contains(f.getId()))
+                    .collect(Collectors.toList());
+            if (validFiles.isEmpty()) {
+                throw new NotFoundException("No provided file id was found");
+            }
+        } // otherwise consider the files from dossier
+
+        var validFilesAndNotProcessed = validFiles.stream()
+                .filter(f -> !(f.getAnalysisVersion() > 0 && f.getNumberOfAnalyses() > 0 && !f.isSoftOrHardDeleted()))
+                .collect(Collectors.toList());
+        if (!validFilesAndNotProcessed.isEmpty()) {
+            throw new BadRequestException("At least a file is in its initial analysis process");
+        }
+
+        request.setFileIds(validFiles.stream()
+                                   .map(FileModel::getId)
+                                   .collect(Collectors.toList()));
+        var approvedFiles = validFiles.stream()
+                .filter(f -> f.getWorkflowStatus().equals(WorkflowStatus.APPROVED))
+                .toList();
+        // special corner case: unapproved files, no reports and only REDACTED type selected
+        if (approvedFiles.isEmpty()
+            && (request.getReportTemplateIds() == null || request.getReportTemplateIds().isEmpty())
+            && request.getDownloadFileTypes() != null
+            && request.getDownloadFileTypes().size() == 1
+            && request.getDownloadFileTypes().contains(DownloadFileType.REDACTED)) {
+            throw new BadRequestException("Unapproved files in redacted state with no reports cannot be included");
+        }
+    }
+
+
+    private DownloadWithOptionRequest convert(PrepareDownloadWithOptionRequest request) {
+
+        return DownloadWithOptionRequest.builder()
+                .dossierId(request.getDossierId())
+                .userId(KeycloakSecurity.getUserId())
+                .fileIds(request.getFileIds())
+                .downloadFileTypes(request.getDownloadFileTypes())
+                .reportTemplateIds(request.getReportTemplateIds())
+                .redactionPreviewColor(request.getRedactionPreviewColor())
+                .includeUnprocessed(request.getIncludeUnprocessed())
+                .build();
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
+    public void deleteDownloadStatus(@RequestBody RemoveDownloadRequest removeDownloadRequest) {
+
+        removeDownloadRequest.getStorageIds()
+                .forEach(storageId -> {
+                    downloadService.deleteDownloadStatus(JSONPrimitive.of(storageId));
+
+                    fileManagementStorageService.deleteObject(storageId);
+
+                    if (storageBackend.equals("s3")) {
+                        var storageIdForS3 = generateReportJsonStorageIdForS3(storageId);
+                        log.info("Deleting Report Json from S3 Storage {}", storageIdForS3);
+                        fileManagementStorageService.deleteObject(storageIdForS3);
+                    } else {
+                        var storageIdForAzure = generateReportJsonStorageIdForAzure(storageId);
+                        log.info("Deleting Report Json from Azure Storage {}", storageIdForAzure);
+                        fileManagementStorageService.deleteObject(storageIdForAzure);
+                    }
+
+                    auditPersistenceService.audit(AuditRequest.builder()
+                                                          .userId(KeycloakSecurity.getUserId())
+                                                          .objectId(storageId)
+                                                          .category(AuditCategory.DOWNLOAD.name())
+                                                          .message("Remove Prepared Download")
+                                                          .build());
+                });
+
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_DOWNLOAD_STATUS + "')")
+    public DownloadStatusResponse getDownloadStatus() {
+
+        var resp = downloadService.getDownloadStatus(KeycloakSecurity.getUserId());
+        return new DownloadStatusResponse(resp);
+    }
+
+
+    @SneakyThrows
+    @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
+    public void downloadFile(@RequestParam(STORAGE_ID) String storageId) {
+
+        var requestAttributes = RequestContextHolder.getRequestAttributes();
+        HttpServletResponse response = ((ServletRequestAttributes) requestAttributes).getResponse();
+
+        var userId = KeycloakSecurity.getUserId();
+        var downloadStatus = getDownloadStatus(storageId, userId);
+        var fileDownloadStream = getFileForDownload(storageId, userId);
+
+        response.setContentType("application/zip");
+        response.setHeader("Content-Disposition", "attachment" + "; filename*=utf-8''" + StringEncodingUtils.urlEncode(downloadStatus.getFilename()));
+        response.setHeader("Content-Length", String.valueOf(downloadStatus.getFileSize()));
+
+        org.apache.commons.io.IOUtils.copyLarge(fileDownloadStream.getInputStream(), response.getOutputStream());
+        response.flushBuffer();
+    }
+
+
+    private DownloadStatus getDownloadStatus(String storageId, String userId) {
+        // TODO Add endpoint to get single download status for userId and storageId.
+        var downloadStatusResponse = downloadService.getDownloadStatus(userId);
+        Optional<DownloadStatus> downloadStatusOptional = downloadStatusResponse.stream()
+                .filter(ds -> ds.getStorageId().equals(storageId))
+                .findFirst();
+
+        return downloadStatusOptional.orElseThrow(() -> new NotFoundException("Download status not found for this user"));
+    }
+
+
+    private InputStreamResource getFileForDownload(String storageId, String userId) {
+
+        try {
+            var response = storageService.getObject(TenantContext.getTenantId(), storageId);
+
+            auditPersistenceService.audit(AuditRequest.builder()
+                                                  .userId(userId)
+                                                  .objectId(storageId)
+                                                  .category(AuditCategory.DOWNLOAD.name())
+                                                  .message("File was downloaded.")
+                                                  .build());
+            downloadService.setDownloaded(JSONPrimitive.of(storageId));
+
+            return new InputStreamResource(new BufferedInputStream(response.getInputStream()));
+        } catch (Exception e) {
+            throw new NotFoundException(e.getMessage(), e);
+        }
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
+    public JSONPrimitive<String> generateOneTimeToken(@RequestBody JSONPrimitive<String> storageIdWrapper) {
+
+        log.debug("Generate one time token");
+        return JSONPrimitive.of(oneTimeTokenDownloadService.createToken(storageIdWrapper.getValue(), KeycloakSecurity.getUserId()).getTokenId());
+    }
+
+
+    @Override
+    @SneakyThrows
+    public void downloadFileUsingOTT(@PathVariable(OTT) String oneTimeToken, @RequestParam(value = "tenantId") String tenantId) {
+
+        TenantContext.setTenantId(tenantId);
+        var token = oneTimeTokenDownloadService.getToken(oneTimeToken);
+        var requestAttributes = RequestContextHolder.getRequestAttributes();
+        HttpServletResponse response = ((ServletRequestAttributes) requestAttributes).getResponse();
+
+        var downloadStatus = getDownloadStatus(token.getStorageId(), token.getUserId());
+        var fileDownloadStream = getFileForDownload(token.getStorageId(), token.getUserId());
+
+        response.setContentType("application/zip");
+        response.setHeader("Content-Disposition", "attachment" + "; filename*=utf-8''" + StringEncodingUtils.urlEncode(downloadStatus.getFilename()));
+        response.setHeader("Content-Length", String.valueOf(downloadStatus.getFileSize()));
+
+        org.apache.commons.io.IOUtils.copyLarge(fileDownloadStream.getInputStream(), response.getOutputStream());
+        response.flushBuffer();
+    }
+
+
+    private DownloadRequest convert(PrepareDownloadRequest request) {
+
+        return DownloadRequest.builder()
+                .dossierId(request.getDossierId())
+                .userId(KeycloakSecurity.getUserId())
+                .fileIds(request.getFileIds())
+                .includeUnprocessed(request.getIncludeUnprocessed())
+                .build();
+    }
+
+
+    private String generateReportJsonStorageIdForS3(String storageId) {
+
+        return storageId.substring(0, storageId.length() - 3) + REPORT_INFO;
+    }
+
+
+    private String generateReportJsonStorageIdForAzure(String storageId) {
+
+        return storageId.substring(0, storageId.length() - 4) + REPORT_INFO;
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/EntityLogController.java

@@ -0,0 +1,80 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_REDACTION_LOG;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.mapper.EntityLogResponseMapper;
+import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
+import com.iqser.red.service.persistence.management.v1.processor.service.EntityLogService;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.EntityLogResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogResponse;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.FilteredEntityLogRequest;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class EntityLogController implements EntityLogResource {
+
+    private final EntityLogService entityLogService;
+    private final AccessControlService accessControlService;
+    private final EntityLogResponseMapper entityLogResponseMapper = EntityLogResponseMapper.INSTANCE;
+
+
+    @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
+    public EntityLogResponse getEntityLog(@PathVariable(DOSSIER_ID) String dossierId,
+                                          @PathVariable(FILE_ID) String fileId,
+                                          @RequestParam(value = "excludedTypes", required = false, defaultValue = "") List<String> excludedTypes,
+                                          @RequestParam(value = "includeUnprocessed", required = false, defaultValue = FALSE) boolean includeUnprocessed) {
+
+        accessControlService.checkViewPermissionsToDossier(dossierId);
+        accessControlService.validateFileResourceExistence(fileId);
+        return entityLogResponseMapper.toLogResponse(entityLogService.getEntityLog(dossierId,
+                                                                                   fileId,
+                                                                                   excludedTypes == null ? new ArrayList<>() : excludedTypes,
+                                                                                   includeUnprocessed));
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
+    public EntityLogResponse getFilteredEntityLog(@PathVariable(DOSSIER_ID) String dossierId,
+                                                  @PathVariable(FILE_ID) String fileId,
+                                                  @RequestBody FilteredEntityLogRequest filteredEntityLogRequest) {
+
+        accessControlService.checkViewPermissionsToDossier(dossierId);
+        accessControlService.validateFileResourceExistence(fileId);
+        return entityLogResponseMapper.toLogResponse(entityLogService.getFilteredEntityLog(dossierId, fileId, filteredEntityLogRequest));
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
+    public EntityLogResponse getEntityLogWithEntriesOnPages(@PathVariable(DOSSIER_ID) String dossierId,
+                                                            @PathVariable(FILE_ID) String fileId,
+                                                            @RequestParam(value = "pageNumbers", defaultValue = "") List<Integer> pageNumbers) {
+
+        accessControlService.checkViewPermissionsToDossier(dossierId);
+        accessControlService.validateFileResourceExistence(fileId);
+        return entityLogResponseMapper.toLogResponse(entityLogService.getEntityLogWithEntriesOnPages(dossierId, fileId, pageNumbers));
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
+    public EntityLogResponse getEntityLogDeltaUpdate(@PathVariable(DOSSIER_ID) String dossierId,
+                                                     @PathVariable(FILE_ID) String fileId,
+                                                     @PathVariable(ANALYSIS_NUMBER) Integer analysisNumber,
+                                                     @RequestParam(value = "includeUnprocessed", required = false, defaultValue = FALSE) boolean includeUnprocessed) {
+
+        accessControlService.checkViewPermissionsToDossier(dossierId);
+        accessControlService.validateFileResourceExistence(fileId);
+        return entityLogResponseMapper.toLogResponse(entityLogService.getEntityLogWithEntriesWithEntriesSinceAnalysisNumber(dossierId, fileId, analysisNumber, includeUnprocessed));
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ExternalControllerAdvice.java

@@ -0,0 +1,180 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
+import com.iqser.red.commons.spring.ErrorMessage;
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
+import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException;
+import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+import com.mchange.rmi.NotAuthorizedException;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import org.quartz.JobDataMap;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.support.MissingServletRequestPartException;
+
+import java.time.OffsetDateTime;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RequiredArgsConstructor
+@RestControllerAdvice
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class ExternalControllerAdvice {
+
+    private final Scheduler scheduler;
+
+
+    @Hidden
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+    @ExceptionHandler(value = NotFoundException.class)
+    public ErrorMessage handleContentNotFoundException(NotFoundException e) {
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+
+    /* error handling */
+
+
+    @Hidden
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(value = BadRequestException.class)
+    public ErrorMessage handleBadRequestException(BadRequestException e) {
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+
+    @Hidden
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.CONFLICT)
+    @ExceptionHandler(value = {ConflictException.class})
+    protected ErrorMessage handleConflictException(ConflictException e) {
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.FORBIDDEN)
+    @ExceptionHandler({AccessDeniedException.class})
+    public ErrorMessage handleAccessDeniedException(AccessDeniedException e) {
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.UNAUTHORIZED)
+    @ExceptionHandler({NotAuthorizedException.class})
+    public ErrorMessage handleNotAuthorizedException(NotAuthorizedException e) {
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.FORBIDDEN)
+    @ExceptionHandler({NotAllowedException.class})
+    public ErrorMessage handleNotAllowedException(NotAllowedException e) {
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+
+    @Hidden
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
+    @ExceptionHandler({org.springframework.security.acls.model.NotFoundException.class})
+    public ErrorMessage handleACLNotFound(org.springframework.security.acls.model.NotFoundException e) {
+
+        // in case this error occurs on a rest request / force trigger the sync job
+        try {
+            scheduler.triggerJob(new JobKey("SyncUserPermissionsJob"), new JobDataMap(Map.of("tenantId", TenantContext.getTenantId())));
+        } catch (SchedulerException ex) {
+            log.debug("Failed to force trigger SyncUserPermissionsJob", ex);
+        }
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+
+    @Hidden
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.BAD_REQUEST)
+    @ExceptionHandler({MethodArgumentNotValidException.class})
+    public ErrorMessage handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
+
+        var errorList = e.getFieldErrors();
+        String errorListAsString = errorList.stream()
+                .map(fieldError -> fieldError.getField() + ": " + fieldError.getDefaultMessage())
+                .collect(Collectors.joining(", "));
+        return new ErrorMessage(OffsetDateTime.now(), String.format("You have empty/wrong formatted parameters: %s", errorListAsString));
+    }
+
+
+    @Hidden
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.BAD_REQUEST)
+    @ExceptionHandler({MissingServletRequestPartException.class})
+    public ErrorMessage handleMissingServletRequestPartException(MissingServletRequestPartException e) {
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+
+    @Hidden
+    @ResponseBody
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler({HttpMessageNotReadableException.class})
+    public ErrorMessage handleHttpMessageNotReadableException(HttpMessageNotReadableException e) {
+
+        var cause = e.getCause();
+        if (cause instanceof InvalidFormatException) {
+            InvalidFormatException invalidFormatException = (InvalidFormatException) cause;
+
+            Class<?> targetType = invalidFormatException.getTargetType();
+            if (targetType != null && targetType.isEnum()) {
+                return new ErrorMessage(OffsetDateTime.now(), String.format("Unsupported value for %s", targetType.getSimpleName()));
+            }
+
+            return new ErrorMessage(OffsetDateTime.now(), cause.getMessage());
+        }
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+
+    @Order(10000)
+    public static class BinderControllerAdvice {
+
+        @InitBinder
+        public void setAllowedFields(WebDataBinder dataBinder) {
+            // This code protects Spring Core from a "Remote Code Execution" attack (dubbed "Spring4Shell").
+            // By applying this mitigation, you prevent the "Class Loader Manipulation" attack vector from firing.
+            // For more details, see this post: https://www.lunasec.io/docs/blog/spring-rce-vulnerabilities/
+            String[] denylist = new String[]{"class.*", "Class.*", "*.class.*", "*.Class.*"};
+            dataBinder.setDisallowedFields(denylist);
+        }
+
+    }
+
+}

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileAttributesController.java

@@ -0,0 +1,180 @@
+package com.iqser.red.persistence.service.v1.external.api.impl.controller;
+
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_FILE_ATTRIBUTES_CONFIG;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_FILE_ATTRIBUTES;
+import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.WRITE_FILE_ATTRIBUTES_CONFIG;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.persistence.management.v1.processor.model.websocket.FileEventType;
+import com.iqser.red.service.persistence.management.v1.processor.service.websocket.WebsocketService;
+import com.iqser.red.service.persistence.management.v1.processor.utils.FileAttributeConfigMapper;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.FileAttributesGeneralConfigurationEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity;
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException;
+import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
+import com.iqser.red.service.persistence.management.v1.processor.service.FileAttributesManagementService;
+import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileAttributeConfigPersistenceService;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
+import com.iqser.red.service.persistence.service.v1.api.external.resource.FileAttributesResource;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttributes;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttributesConfig;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.FileAttributesGeneralConfiguration;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileAttributeConfig;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class FileAttributesController implements FileAttributesResource {
+
+    private final FileAttributesManagementService fileAttributesManagementService;
+    private final FileAttributeConfigPersistenceService fileAttributeConfigPersistenceService;
+    private final AuditPersistenceService auditPersistenceService;
+    private final FileStatusService fileStatusService;
+    private final AccessControlService accessControlService;
+    private final WebsocketService websocketService;
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_FILE_ATTRIBUTES_CONFIG + "')")
+    public FileAttributesConfig setFileAttributesConfig(String dossierTemplateId, FileAttributesConfig fileAttributesConfig) {
+
+        if (StringUtils.isEmpty(fileAttributesConfig.getEncoding()) || !encodingList.contains(fileAttributesConfig.getEncoding().trim())) {
+            throw new BadRequestException("Invalid encoding setting");
+        }
+        fileAttributeConfigPersistenceService.setFileAttributesGeneralConfig(dossierTemplateId,
+                                                                             MagicConverter.convert(fileAttributesConfig, FileAttributesGeneralConfigurationEntity.class));
+        fileAttributeConfigPersistenceService.setFileAttributesConfig(dossierTemplateId,
+                                                                      MagicConverter.convert(fileAttributesConfig.getFileAttributeConfigs(), FileAttributeConfigEntity.class));
+
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(dossierTemplateId)
+                                              .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                              .message("Changed file attributes base configuration & attribute configuration ( CSV Import )")
+                                              .build());
+        return FileAttributesConfig.builder()
+                .filenameMappingColumnHeaderName(fileAttributesConfig.getFilenameMappingColumnHeaderName())
+                .delimiter(fileAttributesConfig.getDelimiter())
+                .encoding(fileAttributesConfig.getEncoding())
+                .fileAttributeConfigs(MagicConverter.convert(fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplateId),
+                                                             FileAttributeConfig.class,
+                                                             new FileAttributeConfigMapper()))
+                .build();
+
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_FILE_ATTRIBUTES_CONFIG + "')")
+    public FileAttributeConfig addOrUpdateFileAttribute(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @Valid @RequestBody FileAttributeConfig fileAttribute) {
+
+        var result = fileAttributeConfigPersistenceService.addOrUpdateFileAttribute(dossierTemplateId, MagicConverter.convert(fileAttribute, FileAttributeConfigEntity.class));
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(dossierTemplateId)
+                                              .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                              .message("File attributes added/updated")
+                                              .details(Map.of("FileAttributeName",
+                                                              fileAttribute.getLabel() != null ? fileAttribute.getLabel() : "",
+                                                              "dossierTemplateId",
+                                                              dossierTemplateId))
+                                              .build());
+
+        return MagicConverter.convert(result, FileAttributeConfig.class, new FileAttributeConfigMapper());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_FILE_ATTRIBUTES_CONFIG + "')")
+    public void deleteFileAttribute(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @PathVariable(FILE_ATTRIBUTE_ID) String fileAttributeId) {
+
+        fileAttributeConfigPersistenceService.deleteFileAttribute(fileAttributeId);
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(dossierTemplateId)
+                                              .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                              .message("File attributes removed")
+                                              .details(Map.of("FileAttributeId", fileAttributeId))
+                                              .build());
+    }
+
+
+    @Override
+    @PreAuthorize("hasAuthority('" + WRITE_FILE_ATTRIBUTES_CONFIG + "')")
+    public void deleteFileAttributes(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody List<String> fileAttributeIds) {
+
+        fileAttributeConfigPersistenceService.deleteFileAttributes(fileAttributeIds);
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(dossierTemplateId)
+                                              .category(AuditCategory.DOSSIER_TEMPLATE.name())
+                                              .message("File attributes removed")
+                                              .details(Map.of("FileAttributeId", fileAttributeIds))
+                                              .build());
+    }
+
+
+    @PreAuthorize("hasAuthority('" + READ_FILE_ATTRIBUTES_CONFIG + "')")
+    public FileAttributesConfig getFileAttributesConfiguration(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
+
+        var fileAttributeConfigs = fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplateId);
+        FileAttributesGeneralConfiguration generalConfig = new FileAttributesGeneralConfiguration();
+        try {
+            generalConfig = MagicConverter.convert(fileAttributeConfigPersistenceService.getFileAttributesGeneralConfiguration(dossierTemplateId),
+                                                   FileAttributesGeneralConfiguration.class);
+        } catch (Exception e) {
+            log.debug("No general config defined", e);
+        }
+        return FileAttributesConfig.builder()
+                .filenameMappingColumnHeaderName(generalConfig.getFilenameMappingColumnHeaderName())
+                .delimiter(generalConfig.getDelimiter())
+                .encoding(generalConfig.getEncoding())
+                .fileAttributeConfigs(MagicConverter.convert(fileAttributeConfigs, FileAttributeConfig.class, new FileAttributeConfigMapper()))
+                .build();
+    }
+
+
+    @PreAuthorize("hasAuthority('" + WRITE_FILE_ATTRIBUTES + "')")
+    public void setFileAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody FileAttributes fileAttributes) {
+
+        accessControlService.checkDossierExistenceAndAccessPermissionsToDossier(dossierId);
+        var file = fileStatusService.getStatus(fileId);
+
+        if (file.getWorkflowStatus().equals(WorkflowStatus.APPROVED)) {
+            throw new NotAllowedException("File is approved. File attributes are not editable anymore.");
+        }
+        if (file.getWorkflowStatus().equals(WorkflowStatus.UNDER_APPROVAL)) {
+            accessControlService.verifyUserIsApprover(dossierId);
+        }
+        accessControlService.verifyUserIsMemberOrApprover(dossierId);
+        fileAttributesManagementService.setFileAttributes(dossierId, fileId, fileAttributes.getAttributeIdToValue());
+        websocketService.sendFileEvent(dossierId, fileId, FileEventType.UPDATE);
+        auditPersistenceService.audit(AuditRequest.builder()
+                                              .userId(KeycloakSecurity.getUserId())
+                                              .objectId(fileId)
+                                              .category(AuditCategory.DOCUMENT.name())
+                                              .message("File attributes has been edited for a document.")
+                                              .build());
+
+    }
+
+}