Revize ad885d86

Loading of path speeded up

re #9753

backend/pom.xml

@@ -10 +10 @@
     </parent>
     <groupId>cz.zcu.kiv</groupId>
     <artifactId>backend-api</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0</version>
     <name>backend-api</name>
     <description>Backend API for Neo-assyrian web application</description>
     <properties>

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

@@ -1 +1 @@
 package cz.zcu.kiv.backendapi.catalog;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 import java.util.UUID;
 
 /**
- * Catalog repository
+ * Catalog item repository
  */
 @Repository
 public interface CatalogItemRepository extends JpaRepository<CatalogItem, UUID> {
 
-    /**
-     * Selects catalog items with given name (alternative name)
-     *
-     * @param name name
-     * @return list of catalog items with given name
-     */
-    @Query("SELECT DISTINCT a.catalogItem FROM CatalogItemName a WHERE ?1 = a.name")
-    List<CatalogItem> getItemsByName(String name);
 }

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

@@ -137 +137 @@
 
         Set<String> types = typeService.getAllTypesAsString();
 
+        List<CatalogItem> catalog = catalogItemRepository.findAll();
+        Map<String, List<CatalogItem>> nameToCatalogItemMap = new HashMap<>();
+        for (CatalogItem catalogItem : catalog) {
+            for (CatalogItemName name : catalogItem.getAllNames()) {
+                if (!nameToCatalogItemMap.containsKey(name.getName())) {
+                    nameToCatalogItemMap.put(name.getName(), new ArrayList<>());
+                }
+                nameToCatalogItemMap.get(name.getName()).add(catalogItem);
+            }
+        }
+
         String[] tokens = text.split("((?<=\\s)|(?=\\s+))");
         for (String token : tokens) {
             if (StringUtils.isBlank(token) || token.matches(START_PUNCTUATION_REGEX)) {
@@ -169 +180 @@
             if (types.contains(textToFind)) {
                 textToFind = "<b>" + textToFind + "</b>";
             } else {
-                List<CatalogItem> foundItems = catalogItemRepository.getItemsByName(textToFind);
-                if (!foundItems.isEmpty()) {
+                if (nameToCatalogItemMap.containsKey(textToFind)) {
+                    List<CatalogItem> foundItems = nameToCatalogItemMap.get(textToFind);
                     if (foundItems.stream().anyMatch(c -> c.getLatitude() != null && c.getLongitude() != null)) {
                         textToFind = "<span style='color:green'>" + textToFind + "</span>";
                     } else {

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

@@ -1 @@
-package cz.zcu.kiv.backendapi.catalog;
-
-import cz.zcu.kiv.backendapi.alternativename.CatalogItemName;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@DataJpaTest
-class CatalogItemRepositoryTest {
-
-    @Autowired
-    private CatalogItemRepository underTest;
-
-    @Test
-    void testItemsByName() {
-        // given
-        String nameFirst = "first";
-        String nameFirstUpper = "First";
-        String nameSecond = "second";
-        String nameSedond = "sedond";
-        String nameThird = "third";
-        String nameTwelve = "twelve";
-        String nameTwentyUpper = "TWENTY";
-
-        CatalogItem catalogItem1 = new CatalogItem();
-        CatalogItem catalogItem2 = new CatalogItem();
-        CatalogItem catalogItem3 = new CatalogItem();
-        CatalogItem catalogItem4 = new CatalogItem();
-        CatalogItem catalogItem5 = new CatalogItem();
-
-        catalogItem1.setName(nameFirst);
-
-        catalogItem2.setName(nameSecond);
-        catalogItem2.setAllNames(Stream.of(new CatalogItemName(nameTwelve, catalogItem2, 1), new CatalogItemName(nameThird, catalogItem2, 2)).collect(Collectors.toCollection(LinkedHashSet::new)));
-
-        catalogItem3.setName(nameThird);
-        catalogItem3.setAllNames(Stream.of(new CatalogItemName(nameTwentyUpper, catalogItem3, 1), new CatalogItemName(nameSedond, catalogItem3, 2)).collect(Collectors.toCollection(LinkedHashSet::new)));
-
-        catalogItem4.setAllNames(Stream.of(new CatalogItemName(nameTwelve, catalogItem4, 1), new CatalogItemName(nameFirstUpper, catalogItem4, 2)).collect(Collectors.toCollection(LinkedHashSet::new)));
-
-        catalogItem5.setName(nameSedond);
-        catalogItem5.setAllNames(Stream.of(new CatalogItemName(nameThird, catalogItem5, 1)).collect(Collectors.toCollection(LinkedHashSet::new)));
-
-        underTest.saveAll(List.of(catalogItem1, catalogItem2, catalogItem3, catalogItem4, catalogItem5));
-
-
-        String name = "twelve";
-
-        // when
-        List<CatalogItem> res = underTest.getItemsByName(name);
-
-        // then
-        assertThat(res.size()).isEqualTo(2);
-        assertTrue(res.contains(catalogItem2));
-        assertTrue(res.contains(catalogItem4));
-    }
-}

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

@@ -440 +440 @@
 
 
         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()));
-        given(catalogItemRepository.getItemsByName("Huga")).willReturn(Stream.of(catalogItem4, catalogItem5).collect(Collectors.toList()));
-        given(catalogItemRepository.getItemsByName("Duga")).willReturn(Stream.of(catalogItem6).collect(Collectors.toList()));
+        given(catalogItemRepository.findAll()).willReturn(List.of(catalogItem1, catalogItem2, catalogItem3, catalogItem4, catalogItem5, catalogItem6));
 
         // when
         PathDto pathDto = underTest.getPath(text);
 
         // then
-        verify(catalogItemRepository).getItemsByName("Azbar");
-        verify(catalogItemRepository).getItemsByName("U-re-me-re");
-        verify(catalogItemRepository).getItemsByName("Huga");
-        verify(catalogItemRepository).getItemsByName("Duga");
-        verify(catalogItemRepository).getItemsByName("Puga");
+        verify(catalogItemRepository).findAll();
 
         assertThat(pathDto.getText()).isEqualTo(highlightedText);