Revize fb55e8e9

Catalog change
- one-to-many associations now persist order
- text for search persists separators

re #9751
re #9754

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

@@ -1 +1 @@
 package cz.zcu.kiv.backendapi.catalog;
 
-import cz.zcu.kiv.backendapi.alternativename.AlternativeName;
+import cz.zcu.kiv.backendapi.alternativename.CatalogItemName;
 import cz.zcu.kiv.backendapi.bibliography.Bibliography;
 import cz.zcu.kiv.backendapi.country.Country;
 import cz.zcu.kiv.backendapi.exception.ApiRequestException;
@@ -50 +50 @@
 
         CatalogItem catalogItem = new CatalogItem();
         catalogItem.setName("aaacbbbbbbbaa");
-        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("aaaabbaa", catalogItem)));
-        catalogItem.setWrittenForms(Set.of(new WrittenForm("written", catalogItem)));
+        catalogItem.setBibliography(Stream.of(new Bibliography("bibl", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setTypes(Stream.of(type).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setAllNames(Stream.of(new CatalogItemName("altName", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setCountries(Stream.of(new Country("aaaabbaa", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setWrittenForms(Stream.of(new WrittenForm("written", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItem.setCertainty(0);
         catalogItem.setLatitude(0.1);
         catalogItem.setLongitude(0.2);
 
         CatalogItem catalogItem2 = new CatalogItem();
         catalogItem2.setName("name");
-        catalogItem2.setBibliography(Set.of(new Bibliography("bibl", catalogItem2)));
-        catalogItem2.setTypes(Set.of(type));
-        catalogItem2.setAlternativeNames(Set.of(new AlternativeName("aaaabbbbbbaa", catalogItem2)));
-        catalogItem2.setCountries(Set.of(new Country("aaaabbcccefaa", catalogItem2)));
-        catalogItem2.setWrittenForms(Set.of(new WrittenForm("written", catalogItem2)));
+        catalogItem2.setBibliography(Stream.of(new Bibliography("bibl", catalogItem2, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem2.setTypes(Stream.of(type).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem2.setAllNames(Stream.of(new CatalogItemName("aaaabbbbbbaa", catalogItem2, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem2.setCountries(Stream.of(new Country("aaaabbcccefaa", catalogItem2, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem2.setWrittenForms(Stream.of(new WrittenForm("written", catalogItem2, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItem2.setCertainty(1);
         catalogItem2.setLatitude(1.1);
         catalogItem2.setLongitude(1.2);
@@ -88 +88 @@
         // given
         CatalogItemDto catalogItemDto = new CatalogItemDto();
         catalogItemDto.setName("name");
-        catalogItemDto.setBibliography(Stream.of("bibl").collect(Collectors.toSet()));
-        catalogItemDto.setTypes(Stream.of("type").collect(Collectors.toSet()));
-        catalogItemDto.setAlternativeNames(Stream.of("altName").collect(Collectors.toSet()));
-        catalogItemDto.setCountries(Stream.of("country").collect(Collectors.toSet()));
-        catalogItemDto.setWrittenForms(Stream.of("written").collect(Collectors.toSet()));
+        catalogItemDto.setBibliography(Stream.of("bibl").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setTypes(Stream.of("type").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setAllNames(Stream.of("altName").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setCountries(Stream.of("country").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setWrittenForms(Stream.of("written").collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto.setCertainty(0);
         catalogItemDto.setLatitude(0.1);
         catalogItemDto.setLongitude(0.2);
@@ -102 +102 @@
 
         CatalogItem catalogItem = new CatalogItem();
         catalogItem.setName("name");
-        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), new AlternativeName("name", 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.setBibliography(Stream.of(new Bibliography("bibl", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setTypes(Stream.of(type).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setAllNames(Stream.of(new CatalogItemName("altName", catalogItem, 1), new CatalogItemName("name", catalogItem, 2)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setCountries(Stream.of(new Country("country", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setWrittenForms(Stream.of(new WrittenForm("written", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItem.setCertainty(0);
         catalogItem.setLatitude(0.1);
         catalogItem.setLongitude(0.2);
@@ -129 +129 @@
         assertThat(capturedItem.getLongitude()).isEqualTo(catalogItem.getLongitude());
         assertThat(capturedItem.getLatitude()).isEqualTo(catalogItem.getLatitude());
         assertThat(capturedItem.getCertainty()).isEqualTo(catalogItem.getCertainty());
-        assertThat(capturedItem.getAlternativeNames().size()).isEqualTo(catalogItem.getAlternativeNames().size());
+        assertThat(capturedItem.getAllNames().size()).isEqualTo(catalogItem.getAllNames().size());
         assertThat(capturedItem.getBibliography().size()).isEqualTo(catalogItem.getBibliography().size());
         assertThat(capturedItem.getCountries().size()).isEqualTo(catalogItem.getCountries().size());
         assertThat(capturedItem.getWrittenForms().size()).isEqualTo(catalogItem.getWrittenForms().size());
@@ -177 +177 @@
 
         CatalogItemDto catalogItemDto = new CatalogItemDto();
         catalogItemDto.setName("name");
-        catalogItemDto.setBibliography(Stream.of("bibl").collect(Collectors.toSet()));
-        catalogItemDto.setTypes(Stream.of("type").collect(Collectors.toSet()));
-        catalogItemDto.setAlternativeNames(Stream.of("altName").collect(Collectors.toSet()));
-        catalogItemDto.setCountries(Stream.of("country").collect(Collectors.toSet()));
-        catalogItemDto.setWrittenForms(Stream.of("written").collect(Collectors.toSet()));
+        catalogItemDto.setBibliography(Stream.of("bibl").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setTypes(Stream.of("type").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setAllNames(Stream.of("altName").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setCountries(Stream.of("country").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setWrittenForms(Stream.of("written").collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto.setCertainty(0);
         catalogItemDto.setLatitude(0.1);
         catalogItemDto.setLongitude(0.2);
@@ -193 +193 @@
         CatalogItem catalogItem = new CatalogItem();
         catalogItem.setId(id);
         catalogItem.setName("name");
-        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.setBibliography(Stream.of(new Bibliography("bibl", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setTypes(Stream.of(type).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setAllNames(Stream.of(new CatalogItemName("altName", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setCountries(Stream.of(new Country("country", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItem.setWrittenForms(Stream.of(new WrittenForm("written", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
         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(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.setBibliography(Stream.of(new Bibliography("old", oldCatalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        oldCatalogItem.setTypes(Stream.of(typeOld).collect(Collectors.toCollection(LinkedHashSet::new)));
+        oldCatalogItem.setAllNames(Stream.of(new CatalogItemName("old", oldCatalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        oldCatalogItem.setCountries(Stream.of(new Country("old", oldCatalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        oldCatalogItem.setWrittenForms(Stream.of(new WrittenForm("old", catalogItem, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
         oldCatalogItem.setCertainty(10);
         oldCatalogItem.setLatitude(10.1);
         oldCatalogItem.setLongitude(10.2);
@@ -236 +236 @@
         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()));
-        Set<String> alternativeNamesEntity = catalogItem.getAlternativeNames().stream().map(AlternativeName::getName).collect(Collectors.toSet());
+        assertThat(capturedCatalogItem.getTypes().stream().map(Type::getType).collect(Collectors.toSet())).isEqualTo(catalogItem.getTypes().stream().map(Type::getType).collect(Collectors.toCollection(LinkedHashSet::new)));
+        Set<String> alternativeNamesEntity = catalogItem.getAllNames().stream().map(CatalogItemName::getName).collect(Collectors.toCollection(LinkedHashSet::new));
         alternativeNamesEntity.add(catalogItem.getName());
-        assertThat(capturedCatalogItem.getAlternativeNames().stream().map(AlternativeName::getName).collect(Collectors.toSet())).isEqualTo(alternativeNamesEntity);
-        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()));
+        assertThat(capturedCatalogItem.getAllNames().stream().map(CatalogItemName::getName).collect(Collectors.toSet())).isEqualTo(alternativeNamesEntity);
+        assertThat(capturedCatalogItem.getCountries().stream().map(Country::getName).collect(Collectors.toSet())).isEqualTo(catalogItem.getCountries().stream().map(Country::getName).collect(Collectors.toCollection(LinkedHashSet::new)));
+        assertThat(capturedCatalogItem.getBibliography().stream().map(Bibliography::getSource).collect(Collectors.toSet())).isEqualTo(catalogItem.getBibliography().stream().map(Bibliography::getSource).collect(Collectors.toCollection(LinkedHashSet::new)));
+        assertThat(capturedCatalogItem.getWrittenForms().stream().map(WrittenForm::getForm).collect(Collectors.toSet())).isEqualTo(catalogItem.getWrittenForms().stream().map(WrittenForm::getForm).collect(Collectors.toCollection(LinkedHashSet::new)));
     }
 
     @Test
@@ -252 +252 @@
 
         CatalogItemDto catalogItemDto = new CatalogItemDto();
         catalogItemDto.setName("name");
-        catalogItemDto.setBibliography(Set.of("bibl"));
-        catalogItemDto.setTypes(Set.of("type"));
-        catalogItemDto.setAlternativeNames(Set.of("altName"));
-        catalogItemDto.setCountries(Set.of("country"));
-        catalogItemDto.setWrittenForms(Set.of("written"));
+        catalogItemDto.setBibliography(Stream.of("bibl").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setTypes(Stream.of("type").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setAllNames(Stream.of("altName").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setCountries(Stream.of("country").collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setWrittenForms(Stream.of("written").collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto.setCertainty(0);
         catalogItemDto.setLatitude(0.1);
         catalogItemDto.setLongitude(0.2);
@@ -300 +300 @@
     }
 
 
-
     @Test
     void testSearchedTest() {
         // given
-        String text = "The city of Azbar was found in first century near the ocean. " +
-                "⌈U-re-me-re⌉, another town, was found " +
-                "in 1956. The location of Huga and Duga is not known, but it was probably near Puga.";
-        String highlightedText = "The <b>city</b> of <span style='color:green'>Azbar</span> was found in first century near the <b>ocean</b>. " +
-                "⌈<span style='color:green'>U-re-me-re</span>⌉, another town, was found " +
-                "in 1956. The location of <span style='color:red'>Huga</span> and <span style='color:red'>Duga</span> is not known, but it was probably near Puga.";
+        String text = "The city of Azbar was found in first century near the ocean.  " +
+                "⌈U-re-me-re⌉, another town , was found " +
+                "in 1956.\nThe location of Huga and Duga is not known, but it was probably near Puga.";
+        String highlightedText = "The <b>city</b> of <span style='color:green'>Azbar</span> was found in first century near the <b>ocean</b>.  " +
+                "⌈<span style='color:green'>U-re-me-re</span>⌉, another town , was found " +
+                "in 1956.\nThe location of <span style='color:red'>Huga</span> and <span style='color:red'>Duga</span> is not known, but it was probably near Puga.";
 
         CatalogItem catalogItem1 = new CatalogItem();
-        catalogItem1.setAlternativeNames(Stream.of(new AlternativeName("Azbar", catalogItem1)).collect(Collectors.toSet()));
+        catalogItem1.setAllNames(Stream.of(new CatalogItemName("Azbar", catalogItem1, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItem1.setLatitude(5.0);
         catalogItem1.setLongitude(5.0);
 
         CatalogItem catalogItem2 = new CatalogItem();
-        catalogItem2.setAlternativeNames(Stream.of(new AlternativeName("Azbar", catalogItem2), new AlternativeName("Azbarasdf", catalogItem2)).collect(Collectors.toSet()));
+        catalogItem2.setAllNames(Stream.of(new CatalogItemName("Azbar", catalogItem2, 1), new CatalogItemName("Azbarasdf", catalogItem2, 2)).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItem2.setLatitude(null);
         catalogItem2.setLongitude(null);
 
         CatalogItem catalogItem3 = new CatalogItem();
-        catalogItem3.setAlternativeNames(Stream.of(new AlternativeName("U-re-me-re", catalogItem3)).collect(Collectors.toSet()));
+        catalogItem3.setAllNames(Stream.of(new CatalogItemName("U-re-me-re", catalogItem3, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItem3.setLatitude(55.0);
         catalogItem3.setLongitude(68.0);
 
         CatalogItem catalogItem4 = new CatalogItem();
-        catalogItem4.setAlternativeNames(Stream.of(new AlternativeName("Huga", catalogItem4)).collect(Collectors.toSet()));
+        catalogItem4.setAllNames(Stream.of(new CatalogItemName("Huga", catalogItem4, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItem4.setLatitude(null);
         catalogItem4.setLongitude(null);
 
         CatalogItem catalogItem5 = new CatalogItem();
-        catalogItem5.setAlternativeNames(Stream.of(new AlternativeName("Huga", catalogItem5), new AlternativeName("Hugaa", catalogItem5)).collect(Collectors.toSet()));
+        catalogItem5.setAllNames(Stream.of(new CatalogItemName("Huga", catalogItem5, 1), new CatalogItemName("Hugaa", catalogItem5, 2)).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItem5.setLatitude(null);
         catalogItem5.setLongitude(null);
 
         CatalogItem catalogItem6 = new CatalogItem();
-        catalogItem6.setAlternativeNames(Stream.of(new AlternativeName("Duga", catalogItem6)).collect(Collectors.toSet()));
+        catalogItem6.setAllNames(Stream.of(new CatalogItemName("Duga", catalogItem6, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItem6.setLatitude(null);
         catalogItem6.setLongitude(null);
 
         CatalogItemDto catalogItemDto1 = new CatalogItemDto();
         catalogItemDto1.setId(catalogItem1.getId());
-        catalogItemDto1.setAlternativeNames(Stream.of("Azbar").collect(Collectors.toSet()));
+        catalogItemDto1.setAllNames(Stream.of("Azbar").collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto1.setLatitude(5.0);
         catalogItemDto1.setLongitude(5.0);
 
         CatalogItemDto catalogItemDto2 = new CatalogItemDto();
         catalogItemDto2.setId(catalogItem2.getId());
-        catalogItemDto2.setAlternativeNames(Stream.of("Azbar", "Azbarasdf").collect(Collectors.toSet()));
+        catalogItemDto2.setAllNames(Stream.of("Azbar", "Azbarasdf").collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto2.setLatitude(null);
         catalogItemDto2.setLongitude(null);
 
         CatalogItemDto catalogItemDto3 = new CatalogItemDto();
         catalogItemDto3.setId(catalogItem3.getId());
-        catalogItemDto3.setAlternativeNames(Stream.of("U-re-me-re").collect(Collectors.toSet()));
+        catalogItemDto3.setAllNames(Stream.of("U-re-me-re").collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto3.setLatitude(55.0);
         catalogItemDto3.setLongitude(68.0);
 
         CatalogItemDto catalogItemDto4 = new CatalogItemDto();
         catalogItemDto4.setId(catalogItem4.getId());
-        catalogItemDto4.setAlternativeNames(Stream.of("Huga").collect(Collectors.toSet()));
+        catalogItemDto4.setAllNames(Stream.of("Huga").collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto4.setLatitude(null);
         catalogItemDto4.setLongitude(null);
 
         CatalogItemDto catalogItemDto5 = new CatalogItemDto();
         catalogItemDto5.setId(catalogItem5.getId());
-        catalogItemDto5.setAlternativeNames(Stream.of("Huga", "Hugaa").collect(Collectors.toSet()));
+        catalogItemDto5.setAllNames(Stream.of("Huga", "Hugaa").collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto5.setLatitude(null);
         catalogItemDto5.setLongitude(null);
 
         CatalogItemDto catalogItemDto6 = new CatalogItemDto();
         catalogItemDto6.setId(catalogItem6.getId());
-        catalogItemDto6.setAlternativeNames(Stream.of("Duga").collect(Collectors.toSet()));
+        catalogItemDto6.setAllNames(Stream.of("Duga").collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto6.setLatitude(null);
         catalogItemDto6.setLongitude(null);
 
 
-        given(typeService.getAllTypesAsString()).willReturn(Stream.of("city", "ocean").collect(Collectors.toSet()));
+        given(typeService.getAllTypesAsString()).willReturn(Stream.of("city", "ocean").collect(Collectors.toCollection(LinkedHashSet::new)));
         given(catalogItemRepository.getItemsByName(anyString())).willReturn(Collections.emptyList());
         given(catalogItemRepository.getItemsByName("Azbar")).willReturn(Stream.of(catalogItem1, catalogItem2).collect(Collectors.toList()));
         given(catalogItemRepository.getItemsByName("U-re-me-re")).willReturn(Stream.of(catalogItem3).collect(Collectors.toList()));