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

Pull request #53: RED-2386: Avoid insert duplications to dictionaries

Browse Source 
Merge in RED/persistence-service from RED-2386 to master

* commit 'f2e1f409f915ca3d83ddba09ff8d8163fe60bd08':
  RED-2386: Avoid insert duplications to dictionaries
This commit is contained in:
Dominique Eiflaender 2021-10-11 16:01:20 +02:00
commit b00696c636
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
View File

@ -56,16 +56,15 @@ public class DictionaryController implements DictionaryResource {
// To check whether the type exists, type should not be added into database implicitly by addEntry.
Type typeResult = convert(dictionaryPersistenceService.getType(typeId), Type.class);
// List<String> entriesToSearch = new ArrayList<>();
var currentVersion = getCurrentVersion(typeResult);
List<String> existing = entryPersistenceService.getEntries(typeId)
.stream()
.filter(e -> !e.isDeleted())
.map(DictionaryEntryEntity::getValue)
.collect(toList());
if (removeCurrent) {
List<String> existing = entryPersistenceService.getEntries(typeId)
.stream()
.filter(e -> !e.isDeleted())
.map(DictionaryEntryEntity::getValue)
.collect(toList());
List<String> removed = new ArrayList<>(existing);
removed.removeAll(cleanEntries);
@ -76,11 +75,14 @@ public class DictionaryController implements DictionaryResource {
entryPersistenceService.deleteEntries(typeId, removed, currentVersion + 1);
entryPersistenceService.addEntry(typeId, added, currentVersion + 1);
// entriesToSearch.addAll(added);
// entriesToSearch.addAll(removed);
} else {
entryPersistenceService.addEntry(typeId, cleanEntries, currentVersion + 1);
// entriesToSearch.addAll(cleanEntries);
List<String> added = new ArrayList<>(cleanEntries);
added.removeAll(existing);
if(added.isEmpty()){
return;
}
entryPersistenceService.addEntry(typeId, added, currentVersion + 1);
}
dictionaryPersistenceService.incrementVersion(typeId);