diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/Colors.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/Colors.java index 388bf8b72..9183f0e71 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/Colors.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/Colors.java @@ -29,4 +29,6 @@ public class Colors { private String ignoredHintColor; private String skippedColor; + private String appliedRedactionColor; + } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/ColorsEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/ColorsEntity.java index 1dec5346b..5fa42c9db 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/ColorsEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/ColorsEntity.java @@ -44,5 +44,7 @@ public class ColorsEntity { private String ignoredHintColor; @Column private String skippedColor; + @Column + private String appliedRedactionColor; } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ColorsService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ColorsService.java index f1a7d2763..1b8aa2258 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ColorsService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ColorsService.java @@ -39,6 +39,7 @@ public class ColorsService { entity.setRedactionColor(defaultColor); entity.setIgnoredHintColor(defaultColor); entity.setSkippedColor(defaultColor); + entity.setAppliedRedactionColor("#000000"); return colorsRepository.save(entity); }); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java index c66cd58c7..605f766eb 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java @@ -83,6 +83,7 @@ public class DownloadPreparationService { } else { previewColor = storedPreviewColor; } + String appliedRedactionColor = colorsService.getColors(dossier.getDossierTemplateId()).getAppliedRedactionColor(); RedactionMessage message = RedactionMessage.builder() .dossierId(dossier.getId()) @@ -95,6 +96,7 @@ public class DownloadPreparationService { .map(FileEntity::getId) .collect(Collectors.toSet())) .redactionPreviewColor(previewColor) + .appliedRedactionColor(appliedRedactionColor) .build(); log.info("Sending redaction request for downloadId:{} to pdftron-redaction-queue", message.getDownloadId()); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml index da7e7150d..421bfa244 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml @@ -109,3 +109,5 @@ databaseChangeLog: file: db/changelog/tenant/43-add-reports-information-column.changelog.yaml - include: file: db/changelog/tenant/44-add-redaction-preview-color-column.changelog.yaml + - include: + file: db/changelog/tenant/sql/43-add-applied-redaction-color.sql diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/tenant/sql/43-add-applied-redaction-color.sql b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/tenant/sql/43-add-applied-redaction-color.sql new file mode 100644 index 000000000..c6fdc9160 --- /dev/null +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/tenant/sql/43-add-applied-redaction-color.sql @@ -0,0 +1,5 @@ +-- add new column +alter table color_configuration add column applied_redaction_color VARCHAR(255); + +update color_configuration set applied_redaction_color = "#000000"; -- default is black + diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java index f40b7b53a..32e1579e2 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java @@ -108,6 +108,8 @@ public class TypeTest extends AbstractPersistenceServerServiceTest { colors.setSkippedColor("#dddddd"); colors.setIgnoredHintColor("#dddddd"); + colors.setAnalysisColor("#dddddd"); + colors.setDossierTemplateId(dossierTemplate.getId()); dictionaryClient.setColors(dossierTemplate.getId(), colors); diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index 0e19dee95..12fcca797 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -27,7 +27,7 @@ 3.206.0 2.39.0 - 3.150.0 + 3.157.0 3.63.0