From 3d82f821d88fa1eb1aa01f36e0cb7446e6408499 Mon Sep 17 00:00:00 2001 From: devplant Date: Wed, 25 Jan 2023 14:56:31 +0200 Subject: [PATCH 1/2] RED-5784 - As the admin I want to configure the applied redaction color - in case the applied redaction color is not provided, set the default one (#000000) --- .../management/v1/processor/service/ColorsService.java | 2 ++ 1 file changed, 2 insertions(+) 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 1b8aa2258..9b23f00cc 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 @@ -47,6 +47,8 @@ public class ColorsService { public ColorsEntity saveColors(ColorsEntity colors) { + if (colors.getAppliedRedactionColor() == null) // store the default one in case non is provided + colors.setAppliedRedactionColor("#000000"); return colorsRepository.save(colors); } From b8653ce0ba0d391a8019eb9bf31f83259c39f22b Mon Sep 17 00:00:00 2001 From: devplant Date: Wed, 25 Jan 2023 15:07:31 +0200 Subject: [PATCH 2/2] RED-5784 - As the admin I want to configure the applied redaction color - update junit tests --- .../v1/server/integration/tests/TypeTest.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 32e1579e2..94a997acf 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 @@ -115,7 +115,19 @@ public class TypeTest extends AbstractPersistenceServerServiceTest { dictionaryClient.setColors(dossierTemplate.getId(), colors); var savedColors = dictionaryClient.getColors(dossierTemplate.getId()); - assertThat(savedColors).isEqualTo(colors); + assertThat(savedColors).isNotEqualTo(colors); + assertThat(savedColors.getRequestAddColor()).isEqualTo(colors.getRequestAddColor()); + assertThat(savedColors.getRequestRemoveColor()).isEqualTo(colors.getRequestRemoveColor()); + assertThat(savedColors.getDictionaryRequestColor()).isEqualTo(colors.getDictionaryRequestColor()); + assertThat(savedColors.getPreviewColor()).isEqualTo(colors.getPreviewColor()); + assertThat(savedColors.getAnalysisColor()).isEqualTo(colors.getAnalysisColor()); + assertThat(savedColors.getUpdatedColor()).isEqualTo(colors.getUpdatedColor()); + assertThat(savedColors.getRecommendationColor()).isEqualTo(colors.getRecommendationColor()); + assertThat(savedColors.getHintColor()).isEqualTo(colors.getHintColor()); + assertThat(savedColors.getRedactionColor()).isEqualTo(colors.getRedactionColor()); + assertThat(savedColors.getIgnoredHintColor()).isEqualTo(colors.getIgnoredHintColor()); + assertThat(savedColors.getSkippedColor()).isEqualTo(colors.getSkippedColor()); + assertThat(savedColors.getAppliedRedactionColor()).isEqualTo("#000000"); } }