Revize abaa5f46

Experiment with database

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

@@ -11 +11 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
  * Catalog item service implementation
  */
 @Service
-@Transactional
+//@Transactional(readOnly = true)
 @RequiredArgsConstructor
 @Slf4j
 public class CatalogItemServiceImpl implements ICatalogItemService {
@@ -62 +62 @@
     private final ITypeService typeService;
 
     @Override
-    public void saveCatalog(List<CatalogItem> catalogItems) {
+    public void saveCatalog(List<CatalogItemDto> catalogItems) {
         log.info("Saving catalog");
-        catalogItems.forEach(this::saveCatalogEntity);
+
+        catalogItems.forEach(this::saveCatalogItem);
     }
 
     @Override
@@ -98 +99 @@
 
     @Override
     public List<CatalogItemDto> getCatalog(String name, String country, String type) {
-        log.info("Retrieving catalog");
+        List<CatalogItem> catalogItems;
+//        if (name.equals("") && country.equals("") && type.equals("")) {
+//            catalogItems = catalogItemRepository.findAll();
+//        } else {
         name = name.replaceAll(WILDCARD_CHARACTER_REGEX, WILDCARD_CHARACTER_REGEX_SQL);
         name = name.replaceAll(WILDCARD_CHARACTERS_REGEX, WILDCARD_CHARACTERS_REGEX_SQL);
         country = country.replaceAll(WILDCARD_CHARACTER_REGEX, WILDCARD_CHARACTER_REGEX_SQL);
         country = country.replaceAll(WILDCARD_CHARACTERS_REGEX, WILDCARD_CHARACTERS_REGEX_SQL);
         type = type.replaceAll(WILDCARD_CHARACTER_REGEX, WILDCARD_CHARACTER_REGEX_SQL);
         type = type.replaceAll(WILDCARD_CHARACTERS_REGEX, WILDCARD_CHARACTERS_REGEX_SQL);
-        Set<CatalogItem> entities = catalogItemRepository.filterCatalog(name, country, type);
-        return entities.stream().map(this::convertEntityToDto).collect(Collectors.toList());
+        long start = System.currentTimeMillis();
+        catalogItems = catalogItemRepository.filterCatalog(name, country, type);
+        catalogItemRepository.flush();
+//        System.out.println("time: " + (System.currentTimeMillis() - start));
+//        }
+        return catalogItems.stream().map(this::convertEntityToDto).collect(Collectors.toList());
+    }
+
+    public List<CatalogItemDto> getCatalog2(String name, String country, String type) {
+        List<CatalogItem> catalogItems;
+//        if (name.equals("") && country.equals("") && type.equals("")) {
+//            catalogItems = catalogItemRepository.findAll();
+//        } else {
+        name = name.replaceAll(WILDCARD_CHARACTER_REGEX, WILDCARD_CHARACTER_REGEX_SQL);
+        name = name.replaceAll(WILDCARD_CHARACTERS_REGEX, WILDCARD_CHARACTERS_REGEX_SQL);
+        country = country.replaceAll(WILDCARD_CHARACTER_REGEX, WILDCARD_CHARACTER_REGEX_SQL);
+        country = country.replaceAll(WILDCARD_CHARACTERS_REGEX, WILDCARD_CHARACTERS_REGEX_SQL);
+        type = type.replaceAll(WILDCARD_CHARACTER_REGEX, ".");
+//        type = type.replaceAll(WILDCARD_CHARACTERS_REGEX, WILDCARD_CHARACTERS_REGEX_SQL);
+        long start = System.currentTimeMillis();
+        catalogItems = catalogItemRepository.filterCatalog2(name, country);
+        if (!type.equals("")) {
+            Pattern pattern = Pattern.compile(type);
+            catalogItems = catalogItems.stream().filter(i -> i.getTypes().stream().anyMatch(t -> pattern.matcher(t.getType()).matches())).collect(Collectors.toList());
+        }
+//        System.out.println("time: " + (System.currentTimeMillis() - start));
+//        }
+        return catalogItems.stream().map(this::convertEntityToDto).collect(Collectors.toList());
+    }
+
+    public List<CatalogItemDto> getCatalog3(String name, String country, String type) {
+        List<CatalogItem> catalogItems;
+//        if (name.equals("") && country.equals("") && type.equals("")) {
+//            catalogItems = catalogItemRepository.findAll();
+//        } else {
+
+        name = name.replaceAll(WILDCARD_CHARACTER_REGEX, ".");
+        country = country.replaceAll(WILDCARD_CHARACTER_REGEX, ".");
+        type = type.replaceAll(WILDCARD_CHARACTER_REGEX, ".");
+        name = name.replaceAll(WILDCARD_CHARACTERS_REGEX, ".*");
+        country = country.replaceAll(WILDCARD_CHARACTERS_REGEX, ".*");
+        type = type.replaceAll(WILDCARD_CHARACTERS_REGEX, ".*");
+        Pattern patternName = Pattern.compile(name, Pattern.CASE_INSENSITIVE);
+        Pattern patternCountry = Pattern.compile(country, Pattern.CASE_INSENSITIVE);
+        Pattern patternType = Pattern.compile(type, Pattern.CASE_INSENSITIVE);
+        long start = System.currentTimeMillis();
+        catalogItems = catalogItemRepository.findAll();
+        String finalType = type;
+        Predicate<CatalogItem> predicateType = i -> finalType.equals("") || i.getTypes().stream().anyMatch(t -> patternType.matcher(t.getType()).matches());
+        String finalCountry = country;
+        Predicate<CatalogItem> predicateCountry = i -> finalCountry.equals("") || i.getCountries().stream().anyMatch(t -> patternCountry.matcher(t.getName()).matches());
+        String finalName = name;
+        Predicate<CatalogItem> predicateName = i -> finalName.equals("") || patternName.matcher(i.getName()).matches() || i.getAlternativeNames().stream().anyMatch(t -> patternName.matcher(t.getName()).matches());
+//        System.out.println("time: " + (System.currentTimeMillis() - start));
+//        }
+        catalogItems = catalogItems.stream().filter(predicateName.and(predicateCountry).and(predicateType)).collect(Collectors.toList());
+        return catalogItems.stream().map(this::convertEntityToDto).collect(Collectors.toList());
     }
 
     /**
@@ -134 +193 @@
         catalogItem.setCertainty(catalogItemDto.getCertainty());
         catalogItem.setLatitude(catalogItemDto.getLatitude());
         catalogItem.setLongitude(catalogItemDto.getLongitude());
-        catalogItem.setBibliography(catalogItemDto.getBibliography()
-                .stream().map(s -> new Bibliography(s, catalogItem)).collect(Collectors.toSet()));
-        catalogItem.setTypes(catalogItemDto.getTypes()
-                .stream().map(Type::new).collect(Collectors.toSet()));
-        catalogItem.setCountries(catalogItemDto.getCountries()
-                .stream().map(s -> new Country(s, catalogItem)).collect(Collectors.toSet()));
-        catalogItem.setAlternativeNames(catalogItemDto.getAlternativeNames()
-                .stream().map(s -> new AlternativeName(s, catalogItem)).collect(Collectors.toSet()));
-        catalogItem.setWrittenForms(catalogItemDto.getWrittenForms()
-                .stream().map(s -> new WrittenForm(s, catalogItem)).collect(Collectors.toSet()));
+
+        catalogItem.getBibliography().clear();
+        catalogItem.getBibliography().addAll((catalogItemDto.getBibliography()
+                .stream().map(s -> new Bibliography(s, catalogItem)).collect(Collectors.toSet())));
+
+        catalogItem.getTypes().clear();
+        catalogItem.getTypes().addAll((catalogItemDto.getTypes()
+                .stream().map(Type::new).collect(Collectors.toSet())));
+
+        catalogItem.getCountries().clear();
+        catalogItem.getCountries().addAll((catalogItemDto.getCountries()
+                .stream().map(s -> new Country(s, catalogItem)).collect(Collectors.toSet())));
+
+        catalogItem.getAlternativeNames().clear();
+        catalogItem.getAlternativeNames().addAll((catalogItemDto.getAlternativeNames()
+                .stream().map(s -> new AlternativeName(s, catalogItem)).collect(Collectors.toSet())));
+
+        catalogItem.getWrittenForms().clear();
+        catalogItem.getWrittenForms().addAll((catalogItemDto.getWrittenForms()
+                .stream().map(s -> new WrittenForm(s, catalogItem)).collect(Collectors.toSet())));
     }
 
     /**