Revize cf12d561

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

re #9751
re #9754

backend/src/main/java/cz/zcu/kiv/backendapi/catalog/CatalogItemServiceImpl.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;
@@ -10 +10 @@
 import cz.zcu.kiv.backendapi.writtenform.WrittenForm;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -140 +139 @@
 
         Set<String> types = typeService.getAllTypesAsString();
 
-        String[] tokens = text.split("\\s+");
+        String[] tokens = text.split("((?<=\\s)|(?=\\s+))");
         for (String token : tokens) {
+            if (StringUtils.isBlank(token)) {
+                highlightedText.append(token);
+                continue;
+            }
             Matcher matcherStart = START_PUNCTUATION_PATTERN.matcher(token);
             Matcher matcherEnd = END_PUNCTUATION_PATTERN.matcher(token);
             String prefix = "";
@@ -162 +165 @@
             }
 
             if (endTextIndex < startTextIndex) {
-                highlightedText.append(prefix).append(" ");
+                highlightedText.append(prefix);
                 continue;
             }
 
@@ -181 +184 @@
                     foundCatalogItems.add(foundItems.stream().map(this::convertEntityToDto).collect(Collectors.toList()));
                 }
             }
-            highlightedText.append(prefix).append(textToFind).append(suffix).append(" ");
+            highlightedText.append(prefix).append(textToFind).append(suffix);
         }
-        highlightedText.setLength(highlightedText.length() - 1);
 
         pathDto.setText(highlightedText.toString());
         pathDto.setFoundCatalogItems(foundCatalogItems);
@@ -207 +209 @@
 
         Predicate<CatalogItem> predicateType = i -> finalType.equals("") || i.getTypes().stream().anyMatch(t -> patternType.matcher(t.getType()).matches());
         Predicate<CatalogItem> predicateCountry = i -> finalCountry.equals("") || i.getCountries().stream().anyMatch(t -> patternCountry.matcher(t.getName()).matches());
-        Predicate<CatalogItem> predicateName = i -> finalName.equals("") || patternName.matcher(i.getName()).matches() || i.getAlternativeNames().stream().anyMatch(t -> patternName.matcher(t.getName()).matches());
+        Predicate<CatalogItem> predicateName = i -> finalName.equals("") || patternName.matcher(i.getName()).matches() || i.getAllNames().stream().anyMatch(t -> patternName.matcher(t.getName()).matches());
         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());
@@ -215 +217 @@
     }
 
     /**
-     * Saves catalog entity to database
+     * Saves catalog item to database
      *
-     * @param catalogItem catalog entity
+     * @param catalogItem catalog item
      */
     private void saveCatalogEntity(CatalogItem catalogItem) {
         for (Type type : catalogItem.getTypes()) {
@@ -235 +237 @@
      * @param catalogItem    catalog item entity
      */
     private void convertDtoToEntity(CatalogItemDto catalogItemDto, CatalogItem catalogItem) {
+        AtomicInteger counter = new AtomicInteger(1);
+
         catalogItem.setName(catalogItemDto.getName());
         catalogItem.setCertainty(catalogItemDto.getCertainty());
         catalogItem.setLatitude(catalogItemDto.getLatitude());
@@ -242 +246 @@
 
         catalogItem.getBibliography().clear();
         catalogItem.getBibliography().addAll(catalogItemDto.getBibliography()
-                .stream().map(s -> new Bibliography(s, catalogItem)).collect(Collectors.toSet()));
+                .stream().map(s -> new Bibliography(s, catalogItem, counter.getAndIncrement())).collect(Collectors.toCollection(LinkedHashSet::new)));
 
         catalogItem.getTypes().clear();
         catalogItem.getTypes().addAll(catalogItemDto.getTypes()
-                .stream().map(Type::new).collect(Collectors.toSet()));
+                .stream().map(Type::new).collect(Collectors.toCollection(LinkedHashSet::new)));
 
         catalogItem.getCountries().clear();
+        counter.set(1);
         catalogItem.getCountries().addAll(catalogItemDto.getCountries()
-                .stream().map(s -> new Country(s, catalogItem)).collect(Collectors.toSet()));
+                .stream().map(s -> new Country(s, catalogItem, counter.getAndIncrement())).collect(Collectors.toCollection(LinkedHashSet::new)));
 
-        catalogItemDto.getAlternativeNames().add(catalogItemDto.getName());
-        catalogItem.getAlternativeNames().clear();
-        catalogItem.getAlternativeNames().addAll(catalogItemDto.getAlternativeNames()
-                .stream().map(s -> new AlternativeName(s, catalogItem)).collect(Collectors.toSet()));
+        catalogItem.getAllNames().clear();
+        counter.set(1);
+        Set<String> allNames = new LinkedHashSet<>();
+        allNames.add(catalogItemDto.getName());
+        allNames.addAll(catalogItemDto.getAllNames());
+        catalogItem.getAllNames().addAll(allNames
+                .stream().map(s -> new CatalogItemName(s, catalogItem, counter.getAndIncrement())).collect(Collectors.toCollection(LinkedHashSet::new)));
 
         catalogItem.getWrittenForms().clear();
+        counter.set(1);
         catalogItem.getWrittenForms().addAll(catalogItemDto.getWrittenForms()
-                .stream().map(s -> new WrittenForm(s, catalogItem)).collect(Collectors.toSet()));
+                .stream().map(s -> new WrittenForm(s, catalogItem, counter.getAndIncrement())).collect(Collectors.toCollection(LinkedHashSet::new)));
 
         catalogItem.setDescription(catalogItemDto.getDescription());
     }
@@ -278 +287 @@
         catalogItemDto.setLongitude(catalogItem.getLongitude());
         catalogItemDto.setCertainty(catalogItem.getCertainty());
         catalogItemDto.setBibliography(catalogItem.getBibliography()
-                .stream().map(Bibliography::getSource).collect(Collectors.toSet()));
+                .stream().map(Bibliography::getSource).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto.setTypes(catalogItem.getTypes()
-                .stream().map(Type::getType).collect(Collectors.toSet()));
+                .stream().map(Type::getType).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto.setCountries(catalogItem.getCountries()
-                .stream().map(Country::getName).collect(Collectors.toSet()));
-        catalogItemDto.setAlternativeNames(catalogItem.getAlternativeNames()
-                .stream().map(AlternativeName::getName).collect(Collectors.toSet()));
+                .stream().map(Country::getName).collect(Collectors.toCollection(LinkedHashSet::new)));
+        catalogItemDto.setAllNames(catalogItem.getAllNames()
+                .stream().map(CatalogItemName::getName).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto.setWrittenForms(catalogItem.getWrittenForms()
-                .stream().map(WrittenForm::getForm).collect(Collectors.toSet()));
+                .stream().map(WrittenForm::getForm).collect(Collectors.toCollection(LinkedHashSet::new)));
         catalogItemDto.setDescription(catalogItem.getDescription());
         return catalogItemDto;
     }