From a750969fedcb33f5ee389d22ea229099579ef5ff Mon Sep 17 00:00:00 2001 From: cschabert Date: Wed, 30 Mar 2022 15:40:50 +0200 Subject: [PATCH 1/7] automate releases --- bamboo-specs/pom.xml | 2 +- .../src/main/java/buildjob/PlanSpec.java | 6 +- .../src/main/resources/scripts/build-java.sh | 73 +++++++++++-------- 3 files changed, 49 insertions(+), 32 deletions(-) diff --git a/bamboo-specs/pom.xml b/bamboo-specs/pom.xml index 40b250d51..d35f6765d 100644 --- a/bamboo-specs/pom.xml +++ b/bamboo-specs/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 8.0.3 + 8.1.3 diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index e30a99623..50b5ce8cd 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -17,7 +17,9 @@ 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.plan.configuration.ConcurrentBuilds; import com.atlassian.bamboo.specs.api.builders.project.Project; +import com.atlassian.bamboo.specs.api.builders.Variable; import com.atlassian.bamboo.specs.builders.task.*; +import com.atlassian.bamboo.specs.builders.task.InjectVariablesTask; import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger; import com.atlassian.bamboo.specs.builders.trigger.RepositoryPollingTrigger; import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger; @@ -79,6 +81,7 @@ public class PlanSpec { 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")) @@ -161,8 +164,7 @@ public class PlanSpec { .linkedRepositories("RED / " + SERVICE_NAME) .triggers( new ScheduledTrigger() - .scheduleOnceDaily(LocalTime.of(12, 00)), - new BitbucketServerTrigger()) + .scheduleOnceDaily(LocalTime.of(23, 00))) .planBranchManagement(new PlanBranchManagement() .createForVcsBranchMatching("release.*") .notificationForCommitters()); diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index 60dfe783c..a330f6135 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -3,36 +3,56 @@ set -e SERVICE_NAME=$1 -if [[ "${bamboo_version_tag}" = "dev" ]] -then +if [[ "$bamboo_planRepository_branchName" == "master" ]] +then + branchVersion=$(cat pom.xml | grep -Eo ".*" | sed -s 's|\(.*\)\..*\(-*.*\)|\1|') + latestVersion=$(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=$(git tag -l $branchVersion.* | tail -n1) + newVersion="$(semver $latestVersion -p -i patch)" +elif [[ "${bamboo_version_tag}" != "dev" ]] +then + newVersion="${bamboo_version_tag}" +else ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/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 -else - ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ - versions:set \ - -DnewVersion=${bamboo_version_tag} - ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ - versions:set \ - -DnewVersion=${bamboo_version_tag} - ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ - --no-transfer-progress \ - clean deploy \ - -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 + echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag + exit 0 fi +echo "gitTag=${newVersion}" > git.tag + +${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ + --no-transfer-progress \ + -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ + versions:set \ + -DnewVersion=${newVersion} + +${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ + --no-transfer-progress \ + -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ + versions:set \ + -DnewVersion=${newVersion} + +${bamboo_capability_system_builder_mvn3_Maven_3}/bin/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 + ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ @@ -43,9 +63,4 @@ ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ docker:push -if [[ "${bamboo_version_tag}" = "dev" ]] -then - echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag -else - echo "gitTag=${bamboo_version_tag}" > git.tag -fi + From cf9a4d736cd9522f7a5163639a3669d942274739 Mon Sep 17 00:00:00 2001 From: cschabert Date: Wed, 30 Mar 2022 16:50:10 +0200 Subject: [PATCH 2/7] update container version to include semver --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 50b5ce8cd..bf9cc782d 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -114,7 +114,7 @@ public class PlanSpec { .defaultRepository()) .dockerConfiguration( new DockerConfiguration() - .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0") + .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") @@ -154,7 +154,7 @@ public class PlanSpec { .argument(SERVICE_NAME)) .dockerConfiguration( new DockerConfiguration() - .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0") + .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") From 08c9206baa79a60596296ff301c4731bdf46f03a Mon Sep 17 00:00:00 2001 From: deiflaender Date: Thu, 31 Mar 2022 11:27:09 +0200 Subject: [PATCH 3/7] RED-3720: Added TEXT_HIGHLIGHTS to FileType --- .../v1/api/model/dossiertemplate/dossier/file/FileType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java index a9e224926..def75e2ca 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java @@ -3,7 +3,7 @@ package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.d import lombok.Getter; public enum FileType { - UNTOUCHED(".pdf"), ORIGIN(".pdf"), REDACTION_LOG(".json"), SECTION_GRID(".json"), TEXT(".json"), NER_ENTITIES(".json"), IMAGE_INFO(".json"), IMPORTED_REDACTIONS(".json"); + UNTOUCHED(".pdf"), ORIGIN(".pdf"), REDACTION_LOG(".json"), SECTION_GRID(".json"), TEXT(".json"), NER_ENTITIES(".json"), IMAGE_INFO(".json"), IMPORTED_REDACTIONS(".json"), TEXT_HIGHLIGHTS(".json"); @Getter private final String extension; From 0e49beeeded4ae47b955281e9b03211e5292dfba Mon Sep 17 00:00:00 2001 From: cschabert Date: Wed, 30 Mar 2022 17:04:05 +0200 Subject: [PATCH 4/7] update mvn command --- .../src/main/java/buildjob/PlanSpec.java | 4 +- .../src/main/resources/scripts/build-java.sh | 18 +++---- .../src/main/resources/scripts/sonar-java.sh | 53 +++++++++---------- 3 files changed, 33 insertions(+), 42 deletions(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index bf9cc782d..8bf2da382 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -93,6 +93,7 @@ public class PlanSpec { "rm -rf ./*"), new VcsCheckoutTask() .description("Checkout Default Repository") + .cleanCheckout(true) .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask() .description("Build") @@ -146,6 +147,7 @@ public class PlanSpec { "rm -rf ./*"), new VcsCheckoutTask() .description("Checkout Default Repository") + .cleanCheckout(true) .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask() .description("Sonar") @@ -156,7 +158,7 @@ public class PlanSpec { 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("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml") .volume("/var/run/docker.sock", "/var/run/docker.sock") ) ) diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index a330f6135..d5b915b54 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -17,8 +17,7 @@ elif [[ "${bamboo_version_tag}" != "dev" ]] then newVersion="${bamboo_version_tag}" else - ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ + mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ --no-transfer-progress \ ${bamboo_maven_add_param} \ clean install \ @@ -29,20 +28,17 @@ fi echo "gitTag=${newVersion}" > git.tag -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ versions:set \ -DnewVersion=${newVersion} -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ versions:set \ -DnewVersion=${newVersion} -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ +mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ --no-transfer-progress \ clean deploy \ ${bamboo_maven_add_param} \ @@ -53,13 +49,11 @@ ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ -Dmaven.wagon.http.ssl.ignore.validity.dates=true \ -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ package -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ docker:push diff --git a/bamboo-specs/src/main/resources/scripts/sonar-java.sh b/bamboo-specs/src/main/resources/scripts/sonar-java.sh index f1d90a5ef..e141df861 100755 --- a/bamboo-specs/src/main/resources/scripts/sonar-java.sh +++ b/bamboo-specs/src/main/resources/scripts/sonar-java.sh @@ -4,46 +4,41 @@ set -e SERVICE_NAME=$1 echo "build jar binaries" -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ +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" -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +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}" - ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/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 - + 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}" - ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/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 + 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 From e8afcc0afbf68bc945fb32bf1bf4332981c2f52e Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 1 Apr 2022 12:15:23 +0200 Subject: [PATCH 5/7] RED-3720: Save annotations and TextHighlight PathElements on upload to TEXT_HIGHLIGHTS file --- .../dossier/file/FileModel.java | 1 + .../v1/api/resources/ReanalysisResource.java | 5 +++ .../processor/entity/dossier/FileEntity.java | 3 ++ .../FileStatusPersistenceService.java | 12 +++++-- .../repository/FileRepository.java | 8 +++-- .../controller/ReanalysisController.java | 32 ++++++++++++++++--- .../v1/server/service/FileService.java | 9 ++++-- .../v1/server/service/FileStatusService.java | 13 +++++--- ...dded-has-highlights-to-file.changelog.yaml | 11 +++++++ .../db/changelog/db.changelog-master.yaml | 4 ++- persistence-service-v1/pom.xml | 2 +- 11 files changed, 81 insertions(+), 19 deletions(-) create mode 100644 persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/19-added-has-highlights-to-file.changelog.yaml diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java index 9413fb765..fdc9837f0 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java @@ -61,6 +61,7 @@ public class FileModel { private String dossierId; private OffsetDateTime redactionModificationDate; private OffsetDateTime fileManipulationDate; + private boolean hasHighlights; public boolean isAnalysisRequired(){ return this.fullAnalysisRequired || this.reanalysisRequired; diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java index 1d0bf3c8a..0121be7d1 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseStatus; import com.iqser.red.service.pdftron.redaction.v1.api.model.DocumentRequest; +import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightConversionRequest; import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightRequest; import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightResponse; @@ -20,6 +21,7 @@ public interface ReanalysisResource { String REANALYZE_PATH = "/reanalyze"; String IMPORT_REDACTIONS_PATH = "/import-redactions"; String TEXT_HIGHLIGHT_CONVERSION_PATH = "/texthighlights-conversion"; + String CONVERT_TEXT_HIGHLIGHTS_PATH = "/convert-texthighlights"; String OCR_REANALYZE_PATH = "/ocr/reanalyze"; String REINDEX_PATH = "/reindex"; String DOSSIER_ID_PARAM = "dossierId"; @@ -65,4 +67,7 @@ public interface ReanalysisResource { @PostMapping(value = TEXT_HIGHLIGHT_CONVERSION_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) TextHighlightResponse processTextHighlights(@RequestBody TextHighlightRequest textHighlightRequest); + @PostMapping(value = CONVERT_TEXT_HIGHLIGHTS_PATH, consumes = MediaType.APPLICATION_JSON_VALUE) + void convertTextHighlights(@RequestBody TextHighlightConversionRequest textHighlightRequest); + } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java index 3b375f1cd..4c4738e95 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java @@ -138,6 +138,9 @@ public class FileEntity { @Column private OffsetDateTime lastManualChangeDate; + @Column + private boolean hasHighlights; + @Column(columnDefinition = "text", name = "excluded_pages") @Convert(converter = JSONIntegerSetConverter.class) private Set excludedPages = new HashSet<>(); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java index 11ea72a2d..9164ea992 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java @@ -31,7 +31,7 @@ public class FileStatusPersistenceService { private final DossierPersistenceService dossierService; - public void createStatus(String dossierId, String fileId, String filename, String uploader) { + public void createStatus(String dossierId, String fileId, String filename, String uploader, boolean hasHighlights) { OffsetDateTime now = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS); FileEntity file = new FileEntity(); @@ -46,6 +46,7 @@ public class FileStatusPersistenceService { file.setLastUploaded(now); file.setLastUpdated(now); file.setFileManipulationDate(now); + file.setHasHighlights(hasHighlights); fileRepository.save(file); } @@ -295,14 +296,14 @@ public class FileStatusPersistenceService { @Transactional - public void overwriteFile(String fileId, String uploader, String filename) { + public void overwriteFile(String fileId, String uploader, String filename, boolean hasHighlights) { fileRepository.findById(fileId).ifPresent((file) -> { file.setExcludedPages(new HashSet<>()); }); int countUpdate = fileRepository.overwriteFile(fileId, filename, uploader, ProcessingStatus.FULLREPROCESS, WorkflowStatus.NEW, OffsetDateTime.now() - .truncatedTo(ChronoUnit.MILLIS), OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); + .truncatedTo(ChronoUnit.MILLIS), OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS), hasHighlights); if (countUpdate == 0) { throw new NotFoundException("Unknown file=" + fileId); } @@ -364,4 +365,9 @@ public class FileStatusPersistenceService { fileRepository.updateFileModificationDate(fileId, fileManipulationDate); } + @Transactional + public void updateHasHighlights(String fileId, boolean hasHighlights){ + fileRepository.updateHasHighlights(fileId, hasHighlights); + } + } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java index e4bcb80f3..aeb952c35 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java @@ -78,6 +78,10 @@ public interface FileRepository extends JpaRepository { @Query("update FileEntity f set f.fileManipulationDate = :fileManipulationDate where f.id = :fileId") void updateFileModificationDate(String fileId, OffsetDateTime fileManipulationDate); + @Modifying + @Query("update FileEntity f set f.hasHighlights = :hasHighlights where f.id = :fileId") + void updateHasHighlights(String fileId, boolean hasHighlights); + @Modifying @Query("update FileEntity f set f.lastUpdated = :lastUpdated, f.hasAnnotationComments = :hasAnnotationComments where f.id = :fileId") void updateHasComments(String fileId, OffsetDateTime lastUpdated, boolean hasAnnotationComments); @@ -120,10 +124,10 @@ public interface FileRepository extends JpaRepository { "f.assignee = null, f.approvalDate = null, f.numberOfAnalyses = 0, f.lastManualChangeDate = null, f.redactionModificationDate = null," + "f.dictionaryVersion = 0, f.dossierDictionaryVersion = 0, f.rulesVersion = 0, f.hasImages = false, " + "f.hasHints = false, f.hasRedactions = false, f.hasSuggestions = false, f.hasUpdates = false, " + - "f.deleted = null, f.hardDeletedTime = null " + + "f.deleted = null, f.hardDeletedTime = null, f.hasHighlights = :hasHighlights " + "where f.id = :fileId") int overwriteFile(String fileId, String filename, String uploader, ProcessingStatus processingStatus, - WorkflowStatus workflowStatus, OffsetDateTime lastUploaded, OffsetDateTime lastUpdated); + WorkflowStatus workflowStatus, OffsetDateTime lastUploaded, OffsetDateTime lastUpdated, boolean hasHighlights); @Query("select count(f) from FileEntity f where f.dossierId = :dossierId and f.deleted is not null and f.hardDeletedTime is null") int countSoftDeletedFiles(String dossierId); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java index b8cb40903..d1576dbaa 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java @@ -17,6 +17,8 @@ import com.google.common.collect.Sets; import com.iqser.red.service.pdftron.redaction.v1.api.model.DocumentRequest; import com.iqser.red.service.pdftron.redaction.v1.api.model.PdfTronOptimizeRequest; import com.iqser.red.service.pdftron.redaction.v1.api.model.PdfTronOptimizeResponse; +import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightConversionOperation; +import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightConversionRequest; import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightOperation; import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightRequest; import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightResponse; @@ -47,7 +49,8 @@ public class ReanalysisController implements ReanalysisResource { @Override - public void reanalyzeDossier(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force) { + public void reanalyzeDossier(@PathVariable(DOSSIER_ID_PARAM) String dossierId, + @RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force) { var relevantFiles = getAllFilesForDossier(dossierId, true); reanalyseFiles(dossierId, force, relevantFiles); @@ -84,7 +87,8 @@ public class ReanalysisController implements ReanalysisResource { public void reindex(@RequestParam(value = DOSSIER_ID_PARAM, required = false) String dossierId, - @RequestParam(value = "dropIndex", required = false, defaultValue = FALSE) boolean dropIndex, @RequestBody Set fileIds) { + @RequestParam(value = "dropIndex", required = false, defaultValue = FALSE) boolean dropIndex, + @RequestBody Set fileIds) { indexingService.reindex(dossierId, fileIds, dropIndex); } @@ -113,8 +117,11 @@ public class ReanalysisController implements ReanalysisResource { var textHighlightResponse = pDFTronRedactionClient.processTextHighlights(textHighlightRequest); - if (textHighlightRequest.getOperation().equals(TextHighlightOperation.REMOVE) || textHighlightRequest.getOperation().equals(TextHighlightOperation.CONVERT)) { - fileStatusService.updateFileModificationDate(textHighlightRequest.getFileId(), OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); + if (textHighlightRequest.getOperation() + .equals(TextHighlightOperation.REMOVE) || textHighlightRequest.getOperation() + .equals(TextHighlightOperation.CONVERT)) { + fileStatusService.updateFileModificationDate(textHighlightRequest.getFileId(), OffsetDateTime.now() + .truncatedTo(ChronoUnit.MILLIS)); } if (textHighlightRequest.getOperation().equals(TextHighlightOperation.CONVERT)) { fileStatusService.setStatusFullReprocess(textHighlightRequest.getDossierId(), textHighlightRequest.getFileId(), true); @@ -123,6 +130,20 @@ public class ReanalysisController implements ReanalysisResource { } + public void convertTextHighlights(@RequestBody TextHighlightConversionRequest textHighlightRequest) { + + boolean hasTextHighlights = pDFTronRedactionClient.convertTextHighlights(textHighlightRequest); + + fileStatusService.updateHasHighlights(textHighlightRequest.getFileId(), hasTextHighlights); + fileStatusService.updateFileModificationDate(textHighlightRequest.getFileId(), OffsetDateTime.now() + .truncatedTo(ChronoUnit.MILLIS)); + + if (textHighlightRequest.getOperation().equals(TextHighlightConversionOperation.CONVERT)) { + fileStatusService.setStatusFullReprocess(textHighlightRequest.getDossierId(), textHighlightRequest.getFileId(), true); + } + } + + public void ocrFile(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID_PARAM) String fileId, @RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force) { @@ -132,7 +153,8 @@ public class ReanalysisController implements ReanalysisResource { fileStatusService.setStatusOcrProcessing(dossierId, fileId); } else { FileModel dossierFile = fileStatusService.getStatus(fileId); - if (dossierFile.getProcessingStatus().equals(ProcessingStatus.DELETED) || dossierFile.getWorkflowStatus().equals(WorkflowStatus.APPROVED)) { + if (dossierFile.getProcessingStatus().equals(ProcessingStatus.DELETED) || dossierFile.getWorkflowStatus() + .equals(WorkflowStatus.APPROVED)) { throw new ConflictException("Cannot analyse a deleted/approved file"); } if (dossierFile.getLastOCRTime() != null) { diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java index 6b5b703c7..dd03289e8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java @@ -78,8 +78,11 @@ public class FileService { } } + boolean hasHighlights; try { - pdfTronRedactionClient.saveOptimizedAndAnnotations(new DocumentRequest(request.getDossierId(), fileId, request.getData())); + hasHighlights = pdfTronRedactionClient.saveOptimizedAndAnnotations(new DocumentRequest(request.getDossierId(), fileId, request.getData())); + + } catch (FeignException e) { log.warn("Failed to optimize file: {}", request.getFilename(), e); @@ -89,11 +92,11 @@ public class FileService { if (existingStatus != null) { // the file is already uploaded, just reanalyse it. - fileStatusService.overwriteFile(request.getDossierId(), fileId, request.getUploader(), request.getFilename()); + fileStatusService.overwriteFile(request.getDossierId(), fileId, request.getUploader(), request.getFilename(), hasHighlights); } else { // the file is new, should create a new status for it. log.info("File {} has no status yet, creating one and setting to unprocessed.", request.getFilename()); - fileStatusService.createStatus(request.getDossierId(), fileId, request.getUploader(), request.getFilename()); + fileStatusService.createStatus(request.getDossierId(), fileId, request.getUploader(), request.getFilename(), hasHighlights); } return new JSONPrimitive<>(fileId); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java index f799cc8a7..879d3cc40 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java @@ -308,9 +308,9 @@ public class FileStatusService { @Transactional - public void createStatus(String dossierId, String fileId, String uploader, String filename) { + public void createStatus(String dossierId, String fileId, String uploader, String filename, boolean hasHighlights) { - fileStatusPersistenceService.createStatus(dossierId, fileId, filename, uploader); + fileStatusPersistenceService.createStatus(dossierId, fileId, filename, uploader, hasHighlights); addToAnalysisQueue(dossierId, fileId, false, Set.of()); } @@ -356,6 +356,11 @@ public class FileStatusService { } + public void updateHasHighlights(String fileId, boolean hasHighlights){ + fileStatusPersistenceService.updateHasHighlights(fileId, hasHighlights); + } + + public void setAssignee(String fileId, String assignee) { FileEntity fileStatus = fileStatusPersistenceService.getStatus(fileId); @@ -443,9 +448,9 @@ public class FileStatusService { @Transactional - public void overwriteFile(String dossierId, String fileId, String uploader, String filename) { + public void overwriteFile(String dossierId, String fileId, String uploader, String filename, boolean hasHighlights) { - fileStatusPersistenceService.overwriteFile(fileId, uploader, filename); + fileStatusPersistenceService.overwriteFile(fileId, uploader, filename, hasHighlights); wipeFileData(dossierId, fileId); setStatusFullReprocess(dossierId, fileId, false); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/19-added-has-highlights-to-file.changelog.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/19-added-has-highlights-to-file.changelog.yaml new file mode 100644 index 000000000..c07e80fa8 --- /dev/null +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/19-added-has-highlights-to-file.changelog.yaml @@ -0,0 +1,11 @@ +databaseChangeLog: + - changeSet: + id: added-has-highlights-to-file + author: dom + changes: + - addColumn: + columns: + - column: + name: has_highlights + type: BOOLEAN + tableName: file diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml index 08a3de2b9..d2d98bc53 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml @@ -42,4 +42,6 @@ databaseChangeLog: - include: file: db/changelog/17-digital-signature-kms.changelog.yaml - include: - file: db/changelog/18-add-migration-table.yaml \ No newline at end of file + file: db/changelog/18-add-migration-table.yaml + - include: + file: db/changelog/19-added-has-highlights-to-file.changelog.yaml \ No newline at end of file diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index 18045b65b..593f087eb 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -27,7 +27,7 @@ 3.90.0 2.26.0 - 3.53.0 + 3.59.0 3.19.0 From 6f781008dbc1cce245f4e207b2c72e8a67f9e4f7 Mon Sep 17 00:00:00 2001 From: cschabert Date: Fri, 1 Apr 2022 12:43:36 +0200 Subject: [PATCH 6/7] fix multiversion issue --- bamboo-specs/src/main/resources/scripts/build-java.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index d5b915b54..0e83e1d4a 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -6,12 +6,12 @@ SERVICE_NAME=$1 if [[ "$bamboo_planRepository_branchName" == "master" ]] then branchVersion=$(cat pom.xml | grep -Eo ".*" | sed -s 's|\(.*\)\..*\(-*.*\)|\1|') - latestVersion=$(git tag -l $branchVersion.* | tail -n1) + 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=$(git tag -l $branchVersion.* | tail -n1) + latestVersion=$( semver $(git tag -l $branchVersion.*) | tail -n1) newVersion="$(semver $latestVersion -p -i patch)" elif [[ "${bamboo_version_tag}" != "dev" ]] then From 7cf5a7914fa1c0805f5e76b803c0ecfb137e63f9 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 4 Apr 2022 11:23:07 +0300 Subject: [PATCH 7/7] RED-3630 - filtering --- .../service/v1/api/resources/DossierResource.java | 2 +- .../v1/server/controller/DossierController.java | 9 +++++++-- .../v1/server/integration/tests/DossierTest.java | 14 +++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierResource.java index 010ca780b..c5cd9721c 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierResource.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierResource.java @@ -53,7 +53,7 @@ public interface DossierResource { @RequestParam(name = INCLUDE_DELETED_PARAM, defaultValue = "false", required = false) boolean includeDeleted); @GetMapping(value = REST_PATH + INFO_PATH, produces = MediaType.APPLICATION_JSON_VALUE) - DossierInformation getDossierInformation(); + DossierInformation getDossierInformation(@RequestBody List filteredDossierIds); @GetMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE) Dossier getDossierById(@PathVariable(DOSSIER_ID_PARAM) String dossierId, diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java index 09dc66294..b9d40337f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java @@ -107,10 +107,15 @@ public class DossierController implements DossierResource { } @Override - public DossierInformation getDossierInformation() { + public DossierInformation getDossierInformation(@RequestBody List filteredDossierIds) { DossierInformation dossierInformation = new DossierInformation(); - dossierService.getAllDossiers().forEach(d -> { + + var dossiers = dossierService.getAllDossiers(); + if (filteredDossierIds != null && filteredDossierIds.size() > 0) { + dossiers = dossiers.stream().filter(d -> filteredDossierIds.contains(d.getId())).collect(Collectors.toList()); + } + dossiers.forEach(d -> { if (d.getHardDeletedTime() != null) { dossierInformation.setNumberOfHardDeletedDossiers(dossierInformation.getNumberOfHardDeletedDossiers() + 1); } else if (d.getSoftDeletedTime() != null) { diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java index 652bc719e..81a5e897a 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java @@ -113,7 +113,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { assertThatThrownBy(() -> dossierClient.undeleteDossiers(Sets.newHashSet(dossier.getId()))).isInstanceOf(FeignException.class); - var dossierInformation = dossierClient.getDossierInformation(); + var dossierInformation = dossierClient.getDossierInformation(List.of()); assertThat(dossierInformation.getNumberOfActiveDossiers()).isEqualTo(0); assertThat(dossierInformation.getNumberOfSoftDeletedDossiers()).isEqualTo(0); assertThat(dossierInformation.getNumberOfHardDeletedDossiers()).isEqualTo(1); @@ -147,7 +147,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { assertThat(dossierClient.getArchivedDossiers()).hasSize(1); assertThat(dossierClient.getSoftDeletedDossiers()).hasSize(0); - var dossierInformation = dossierClient.getDossierInformation(); + var dossierInformation = dossierClient.getDossierInformation(List.of()); assertThat(dossierInformation.getNumberOfActiveDossiers()).isEqualTo(1); assertThat(dossierInformation.getNumberOfSoftDeletedDossiers()).isEqualTo(0); assertThat(dossierInformation.getNumberOfHardDeletedDossiers()).isEqualTo(0); @@ -158,7 +158,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { assertThat(dossierClient.getAllDossiers(false, false)).hasSize(2); assertThat(dossierClient.getArchivedDossiers()).hasSize(0); - dossierInformation = dossierClient.getDossierInformation(); + dossierInformation = dossierClient.getDossierInformation(List.of()); assertThat(dossierInformation.getNumberOfActiveDossiers()).isEqualTo(2); assertThat(dossierInformation.getNumberOfSoftDeletedDossiers()).isEqualTo(0); assertThat(dossierInformation.getNumberOfHardDeletedDossiers()).isEqualTo(0); @@ -171,7 +171,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { assertThat(dossierClient.getArchivedDossiers()).hasSize(2); assertThat(dossierClient.getSoftDeletedDossiers()).hasSize(0); - dossierInformation = dossierClient.getDossierInformation(); + dossierInformation = dossierClient.getDossierInformation(List.of()); assertThat(dossierInformation.getNumberOfActiveDossiers()).isEqualTo(0); assertThat(dossierInformation.getNumberOfSoftDeletedDossiers()).isEqualTo(0); assertThat(dossierInformation.getNumberOfHardDeletedDossiers()).isEqualTo(0); @@ -187,7 +187,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { assertThat(dossierClient.getArchivedDossiers()).hasSize(1); assertThat(dossierClient.getSoftDeletedDossiers()).hasSize(1); - dossierInformation = dossierClient.getDossierInformation(); + dossierInformation = dossierClient.getDossierInformation(List.of()); assertThat(dossierInformation.getNumberOfActiveDossiers()).isEqualTo(0); assertThat(dossierInformation.getNumberOfSoftDeletedDossiers()).isEqualTo(1); assertThat(dossierInformation.getNumberOfHardDeletedDossiers()).isEqualTo(0); @@ -201,7 +201,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { assertThat(dossierClient.getArchivedDossiers()).hasSize(0); assertThat(dossierClient.getSoftDeletedDossiers()).hasSize(1); - dossierInformation = dossierClient.getDossierInformation(); + dossierInformation = dossierClient.getDossierInformation(List.of()); assertThat(dossierInformation.getNumberOfActiveDossiers()).isEqualTo(1); assertThat(dossierInformation.getNumberOfSoftDeletedDossiers()).isEqualTo(1); assertThat(dossierInformation.getNumberOfHardDeletedDossiers()).isEqualTo(0); @@ -217,7 +217,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { assertThat(dossierClient.getArchivedDossiers()).hasSize(1); assertThat(dossierClient.getSoftDeletedDossiers()).hasSize(0); - dossierInformation = dossierClient.getDossierInformation(); + dossierInformation = dossierClient.getDossierInformation(List.of()); assertThat(dossierInformation.getNumberOfActiveDossiers()).isEqualTo(0); assertThat(dossierInformation.getNumberOfSoftDeletedDossiers()).isEqualTo(0); assertThat(dossierInformation.getNumberOfHardDeletedDossiers()).isEqualTo(1);