Revize ba120f65

Added orphan removal to catalog item

re #9492

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

@@ -70 +70 @@
     /**
      * Bibliography
      */
-    @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
     @LazyCollection(LazyCollectionOption.FALSE)
     @Fetch(FetchMode.SUBSELECT)
     private Set<Bibliography> bibliography = new HashSet<>();
@@ -78 +78 @@
     /**
      * Countries
      */
-    @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
     @LazyCollection(LazyCollectionOption.FALSE)
     @Fetch(FetchMode.SUBSELECT)
     private Set<Country> countries = new HashSet<>();
@@ -86 +86 @@
     /**
      * Written forms
      */
-    @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
     @LazyCollection(LazyCollectionOption.FALSE)
     @Fetch(FetchMode.SUBSELECT)
     private Set<WrittenForm> writtenForms = new HashSet<>();
@@ -94 +94 @@
     /**
      * Alternative names
      */
-    @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
     @LazyCollection(LazyCollectionOption.FALSE)
     @Fetch(FetchMode.SUBSELECT)
     private Set<AlternativeName> alternativeNames = new HashSet<>();

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());
     }
 

backend/src/test/java/cz/zcu/kiv/backendapi/catalog/CatalogItemServiceImplTest.java

@@ -193 +193 @@
         CatalogItem catalogItem = new CatalogItem();
         catalogItem.setId(id);
         catalogItem.setName("name");
-        catalogItem.setBibliography(Set.of(new Bibliography("bibl", catalogItem)));
-        catalogItem.setTypes(Set.of(type));
-        catalogItem.setAlternativeNames(Set.of(new AlternativeName("altName", catalogItem)));
-        catalogItem.setCountries(Set.of(new Country("country", catalogItem)));
-        catalogItem.setWrittenForms(Set.of(new WrittenForm("written", catalogItem)));
+        catalogItem.setBibliography(Stream.of(new Bibliography("bibl", catalogItem)).collect(Collectors.toSet()));
+        catalogItem.setTypes(Stream.of(type).collect(Collectors.toSet()));
+        catalogItem.setAlternativeNames(Stream.of(new AlternativeName("altName", catalogItem)).collect(Collectors.toSet()));
+        catalogItem.setCountries(Stream.of(new Country("country", catalogItem)).collect(Collectors.toSet()));
+        catalogItem.setWrittenForms(Stream.of(new WrittenForm("written", catalogItem)).collect(Collectors.toSet()));
         catalogItem.setCertainty(0);
         catalogItem.setLatitude(0.1);
         catalogItem.setLongitude(0.2);
@@ -206 +206 @@
         CatalogItem oldCatalogItem = new CatalogItem();
         oldCatalogItem.setId(id);
         oldCatalogItem.setName("old");
-        oldCatalogItem.setBibliography(Set.of(new Bibliography("old", oldCatalogItem)));
-        oldCatalogItem.setTypes(Set.of(typeOld));
-        oldCatalogItem.setAlternativeNames(Set.of(new AlternativeName("old", oldCatalogItem)));
-        oldCatalogItem.setCountries(Set.of(new Country("old", oldCatalogItem)));
-        oldCatalogItem.setWrittenForms(Set.of(new WrittenForm("old", catalogItem)));
+        oldCatalogItem.setBibliography(Stream.of(new Bibliography("old", oldCatalogItem)).collect(Collectors.toSet()));
+        oldCatalogItem.setTypes(Stream.of(typeOld).collect(Collectors.toSet()));
+        oldCatalogItem.setAlternativeNames(Stream.of(new AlternativeName("old", oldCatalogItem)).collect(Collectors.toSet()));
+        oldCatalogItem.setCountries(Stream.of(new Country("old", oldCatalogItem)).collect(Collectors.toSet()));
+        oldCatalogItem.setWrittenForms(Stream.of(new WrittenForm("old", catalogItem)).collect(Collectors.toSet()));
         oldCatalogItem.setCertainty(10);
         oldCatalogItem.setLatitude(10.1);
         oldCatalogItem.setLongitude(10.2);
@@ -232 +232 @@
         CatalogItem capturedCatalogItem = argumentCaptor.getValue();
 
         assertThat(capturedCatalogItem).isEqualTo(catalogItem);
+        assertThat(capturedCatalogItem.getCertainty()).isEqualTo(catalogItem.getCertainty());
+        assertThat(capturedCatalogItem.getLatitude()).isEqualTo(catalogItem.getLatitude());
+        assertThat(capturedCatalogItem.getLongitude()).isEqualTo(catalogItem.getLongitude());
+        assertThat(capturedCatalogItem.getDescription()).isEqualTo(catalogItem.getDescription());
+        assertThat(capturedCatalogItem.getTypes().stream().map(Type::getType).collect(Collectors.toSet())).isEqualTo(catalogItem.getTypes().stream().map(Type::getType).collect(Collectors.toSet()));
+        assertThat(capturedCatalogItem.getAlternativeNames().stream().map(AlternativeName::getName).collect(Collectors.toSet())).isEqualTo(catalogItem.getAlternativeNames().stream().map(AlternativeName::getName).collect(Collectors.toSet()));
+        assertThat(capturedCatalogItem.getCountries().stream().map(Country::getName).collect(Collectors.toSet())).isEqualTo(catalogItem.getCountries().stream().map(Country::getName).collect(Collectors.toSet()));
+        assertThat(capturedCatalogItem.getBibliography().stream().map(Bibliography::getSource).collect(Collectors.toSet())).isEqualTo(catalogItem.getBibliography().stream().map(Bibliography::getSource).collect(Collectors.toSet()));
+        assertThat(capturedCatalogItem.getWrittenForms().stream().map(WrittenForm::getForm).collect(Collectors.toSet())).isEqualTo(catalogItem.getWrittenForms().stream().map(WrittenForm::getForm).collect(Collectors.toSet()));
     }
 
     @Test