diff --git a/redaction-service-v1/redaction-service-api-v1/pom.xml b/redaction-service-v1/redaction-service-api-v1/pom.xml index eec6528c..20780490 100644 --- a/redaction-service-v1/redaction-service-api-v1/pom.xml +++ b/redaction-service-v1/redaction-service-api-v1/pom.xml @@ -12,7 +12,7 @@ redaction-service-api-v1 - 1.166.0 + 1.238.0 diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java index 8644f0a1..c37a7046 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java @@ -5,12 +5,10 @@ import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ty import com.iqser.red.service.redaction.v1.server.client.DictionaryClient; import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary; import com.iqser.red.service.redaction.v1.server.redaction.model.*; - import feign.FeignException; import io.micrometer.core.annotation.Timed; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.SerializationUtils; import org.springframework.stereotype.Service; @@ -25,6 +23,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class DictionaryService { + private static final String DEFAULT_COLOR = "#cccccc"; private final DictionaryClient dictionaryClient; private final Map dictionariesByDossierTemplate = new HashMap<>(); @@ -178,10 +177,10 @@ public class DictionaryService { Colors colors = dictionaryClient.getColors(dossierTemplateId); - dictionaryRepresentation.setDefaultColor(convertColor(colors.getDefaultColor())); - dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAdd())); - dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemove())); - dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getNotRedacted())); + dictionaryRepresentation.setDefaultColor(convertColor(DEFAULT_COLOR)); + dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAddColor())); + dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemoveColor())); + dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getSkippedColor())); dictionaryRepresentation.setDossierTemplateId(dossierTemplateId); dictionaryRepresentation.setDictionaryVersion(version); dictionaryRepresentation.setDictionary(dictionary); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java index 2d393712..994e07c3 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java @@ -49,6 +49,7 @@ import lombok.extern.slf4j.Slf4j; @RequiredArgsConstructor public class RedactionLogMergeService { + private static final String DELETED_TYPE_COLOR = "#9398a0"; private final SectionTextService sectionTextService; private final RedactionStorageService redactionStorageService; @@ -452,10 +453,10 @@ public class RedactionLogMergeService { List types) { if (requested) { - return convertColor(colors.getRequestRemove()); + return convertColor(colors.getRequestRemoveColor()); } if (skipped || !isRedaction && !isHint(types, type)) { - return convertColor(colors.getNotRedacted()); + return convertColor(colors.getSkippedColor()); } return getColor(types, type); } @@ -464,9 +465,9 @@ public class RedactionLogMergeService { private float[] getColorForManualAdd(String type, Colors colors, AnnotationStatus status, List types) { if (status.equals(AnnotationStatus.REQUESTED)) { - return convertColor(colors.getRequestAdd()); + return convertColor(colors.getRequestAddColor()); } else if (status.equals(AnnotationStatus.DECLINED)) { - return convertColor(colors.getNotRedacted()); + return convertColor(colors.getSkippedColor()); } return getColor(types, type); } @@ -481,7 +482,7 @@ public class RedactionLogMergeService { } Optional firstDeletedType = matchingTypes.stream().findFirst(); return firstDeletedType.map(value -> convertColor(value.getHexColor())) - .orElseGet(() -> convertColor("#9398a0")); + .orElseGet(() -> convertColor(DELETED_TYPE_COLOR)); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java index a782a98c..85b8aeaa 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java @@ -62,7 +62,7 @@ public class DictionaryServiceTest { when(dictionaryClient.getVersion(anyString())).thenReturn(0L); when(dictionaryClient.getColors(anyString())).thenReturn(new Colors("dossierTemplateId", "#cccccc", - "#cccccc", "#cccccc", "#cccccc", "#cccccc", "#cccccc", + "#cccccc", "#cccccc", "#cccccc", "#cccccc", "#cccccc","#cccccc", "#cccccc", "#cccccc", "#cccccc", "#cccccc")); var type1 = new Type(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index a1ee95aa..f5a01599 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -1617,10 +1617,9 @@ public class RedactionIntegrationTest { rankTypeMap.put(DOSSIER_REDACTIONS, 200); rankTypeMap.put(IMPORTED_REDACTION, 200); - colors.setDefaultColor("#acfc00"); - colors.setNotRedacted("#cccccc"); - colors.setRequestAdd("#04b093"); - colors.setRequestRemove("#04b093"); + colors.setSkippedColor("#cccccc"); + colors.setRequestAddColor("#04b093"); + colors.setRequestRemoveColor("#04b093"); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/colors/colors.json b/redaction-service-v1/redaction-service-server-v1/src/test/resources/colors/colors.json index d51ddc52..0a3c9695 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/colors/colors.json +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/colors/colors.json @@ -1,13 +1,14 @@ { "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9", - "defaultColor": "#9398a0", - "requestAdd": "#04b093", - "requestRemove": "#04b093", - "notRedacted": "#c498fa", + "requestAddColor": "#04b093", + "requestRemoveColor": "#04b093", "analysisColor": "#dd4d50", "updatedColor": "#fdbd00", "dictionaryRequestColor": "#5b97db", - "manualRedactionColor": "#9398a0", "previewColor": "#9398a0", - "ignoredHintColor": "#e7d4ff" -} \ No newline at end of file + "ignoredHintColor": "#e7d4ff", + "recommendationColor": "#cccccc", + "hintColor": "#cccccc", + "redactionColor": "#cccccc", + "skippedColor": "#cccccc" +} diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/colors.json b/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/colors.json index 6ae2b97d..0a3c9695 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/colors.json +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/colors.json @@ -1,12 +1,14 @@ { - "defaultColor": "#9398a0", - "requestAdd": "#04b093", - "requestRemove": "#04b093", - "notRedacted": "#c498fa", + "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9", + "requestAddColor": "#04b093", + "requestRemoveColor": "#04b093", "analysisColor": "#dd4d50", "updatedColor": "#fdbd00", "dictionaryRequestColor": "#5b97db", - "manualRedactionColor": "#9398a0", "previewColor": "#9398a0", - "ignoredHintColor": "#e7d4ff" + "ignoredHintColor": "#e7d4ff", + "recommendationColor": "#cccccc", + "hintColor": "#cccccc", + "redactionColor": "#cccccc", + "skippedColor": "#cccccc" }