Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #598: Feature/RED-5784 1

Browse Source 
Merge in RED/persistence-service from feature/RED-5784-1 to master

* commit 'b8653ce0ba0d391a8019eb9bf31f83259c39f22b':
  RED-5784 - As the admin I want to configure the applied redaction color
  RED-5784 - As the admin I want to configure the applied redaction color
This commit is contained in:
Corina Olariu 2023-01-26 08:48:42 +01:00
commit 5317ac259a
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ColorsService.java
View File

@ -47,6 +47,8 @@ public class ColorsService {
public ColorsEntity saveColors(ColorsEntity colors) { 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); return colorsRepository.save(colors);
} }

14
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java
View File

@ -115,7 +115,19 @@ public class TypeTest extends AbstractPersistenceServerServiceTest {
dictionaryClient.setColors(dossierTemplate.getId(), colors); dictionaryClient.setColors(dossierTemplate.getId(), colors);
var savedColors = dictionaryClient.getColors(dossierTemplate.getId()); 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");
} }
} }