Revize ba120f65

Added orphan removal to catalog item

re #9492

backend/src/main/java/cz/zcu/kiv/backendapi/catalog/CatalogItemServiceImpl.java

@@ -191 +191 @@
     @Override
     public List<CatalogItemDto> getCatalog(String name, String country, String type, String writtenForm) {
         log.info("Retrieving catalog");
-
         String finalName = name.replaceAll(WILDCARD_CHARACTER_REGEX, WILDCARD_CHARACTER_REGEX_JAVA).replaceAll(WILDCARD_CHARACTERS_REGEX, WILDCARD_CHARACTERS_REGEX_JAVA);
         String finalCountry = country.replaceAll(WILDCARD_CHARACTER_REGEX, WILDCARD_CHARACTER_REGEX_JAVA).replaceAll(WILDCARD_CHARACTERS_REGEX, WILDCARD_CHARACTERS_REGEX_JAVA);
         String finalType = type.replaceAll(WILDCARD_CHARACTER_REGEX, WILDCARD_CHARACTER_REGEX_JAVA).replaceAll(WILDCARD_CHARACTERS_REGEX, WILDCARD_CHARACTERS_REGEX_JAVA);
@@ -210 +209 @@
         Predicate<CatalogItem> predicateWrittenForm = i -> finalWrittenForm.equals("") || i.getWrittenForms().stream().anyMatch(t -> patternWrittenForm.matcher(t.getForm()).matches());
 
         catalogItems = catalogItems.stream().filter(predicateName.and(predicateCountry).and(predicateType).and(predicateWrittenForm)).collect(Collectors.toList());
-
         return catalogItems.stream().map(this::convertEntityToDto).collect(Collectors.toList());
     }
 
@@ -239 +237 @@
         catalogItem.setCertainty(catalogItemDto.getCertainty());
         catalogItem.setLatitude(catalogItemDto.getLatitude());
         catalogItem.setLongitude(catalogItemDto.getLongitude());
-        catalogItem.setBibliography(catalogItemDto.getBibliography()
+
+        catalogItem.getBibliography().clear();
+        catalogItem.getBibliography().addAll(catalogItemDto.getBibliography()
                 .stream().map(s -> new Bibliography(s, catalogItem)).collect(Collectors.toSet()));
-        catalogItem.setTypes(catalogItemDto.getTypes()
+
+        catalogItem.getTypes().clear();
+        catalogItem.getTypes().addAll(catalogItemDto.getTypes()
                 .stream().map(Type::new).collect(Collectors.toSet()));
-        catalogItem.setCountries(catalogItemDto.getCountries()
+
+        catalogItem.getCountries().clear();
+        catalogItem.getCountries().addAll(catalogItemDto.getCountries()
                 .stream().map(s -> new Country(s, catalogItem)).collect(Collectors.toSet()));
-        catalogItem.setAlternativeNames(catalogItemDto.getAlternativeNames()
+
+        catalogItem.getAlternativeNames().clear();
+        catalogItem.getAlternativeNames().addAll(catalogItemDto.getAlternativeNames()
                 .stream().map(s -> new AlternativeName(s, catalogItem)).collect(Collectors.toSet()));
-        catalogItem.setWrittenForms(catalogItemDto.getWrittenForms()
+
+        catalogItem.getWrittenForms().clear();
+        catalogItem.getWrittenForms().addAll(catalogItemDto.getWrittenForms()
                 .stream().map(s -> new WrittenForm(s, catalogItem)).collect(Collectors.toSet()));
+
         catalogItem.setDescription(catalogItemDto.getDescription());
     }