From af70fd8ecd4168da12f8375d7719e140ba930735 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Tue, 15 Mar 2022 17:40:17 +0100 Subject: [PATCH] test --- .../v1/server/redaction/service/DictionaryService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 0a5d26ca..5ace815f 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 @@ -99,8 +99,14 @@ public class DictionaryService { } Set entries = new HashSet<>(); + var newEntries = convertEntries(t.getId(), currentVersion); + var newValues = newEntries.stream().map(v -> v.getValue()).collect(Collectors.toSet()); + + // add old entries from existing DictionaryModel - oldModel.ifPresent(dictionaryModel -> entries.addAll(dictionaryModel.getEntries())); + oldModel.ifPresent(dictionaryModel -> entries.addAll(dictionaryModel.getEntries().stream().filter( + f -> newValues.contains(f.getValue())).collect(Collectors.toList()) + )); // Add Increments entries.addAll(convertEntries(t.getId(), currentVersion));