Revize 0e115bb2

Fixed N+1 problem when fetching catalog

re #9244

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

@@ -7 +7 @@
 import cz.zcu.kiv.backendapi.writtenform.WrittenForm;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
@@ -23 +25 @@
 @NoArgsConstructor
 @Entity
 @Table(name = "catalog_item")
+//@NamedEntityGraph(name = "graph", attributeNodes = {
+//        @NamedAttributeNode("bibliography"),
+//        @NamedAttributeNode("alternativeNames"),
+//        @NamedAttributeNode("countries"),
+//        @NamedAttributeNode("writtenForms"),
+//        @NamedAttributeNode("types"),
+//})
 public class CatalogItem {
     private static final String INTEGER_PATTERN = "\\d+";
     private static final String DOUBLE_PATTERN = "(\\d+[.]\\d+)|(\\d+)";
@@ -59 +68 @@
      */
     @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL)
     @LazyCollection(LazyCollectionOption.FALSE)
+    @Fetch(FetchMode.SUBSELECT)
     private Set<Bibliography> bibliography = Collections.emptySet();
 
     /**
@@ -66 +76 @@
      */
     @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL)
     @LazyCollection(LazyCollectionOption.FALSE)
+    @Fetch(FetchMode.SUBSELECT)
     private Set<Country> countries = Collections.emptySet();
 
     /**
@@ -73 +84 @@
      */
     @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL)
     @LazyCollection(LazyCollectionOption.FALSE)
+    @Fetch(FetchMode.SUBSELECT)
     private Set<WrittenForm> writtenForms = Collections.emptySet();
 
     /**
@@ -80 +92 @@
      */
     @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL)
     @LazyCollection(LazyCollectionOption.FALSE)
+    @Fetch(FetchMode.SUBSELECT)
     private Set<AlternativeName> alternativeNames = Collections.emptySet();
 
     /**
      * Set of user roles - many-to-many relationship
      */
     @ManyToMany(fetch = FetchType.EAGER)
+    @Fetch(FetchMode.SUBSELECT)
     @JoinTable(
             name = "catalog_item_type",
             joinColumns = {

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

@@ -21 +21 @@
      * @param type    type - optional
      * @return set of catalog items satisfying filter conditions
      */
-    @Query("SELECT DISTINCT e FROM CatalogItem e LEFT JOIN AlternativeName a ON e = a.catalogItem " +
-            "LEFT JOIN Country c ON e = c.catalogItem " +
-            "INNER JOIN e.types t " +
+    @Query("SELECT DISTINCT e FROM CatalogItem e " +
+            "LEFT JOIN FETCH AlternativeName a ON e = a.catalogItem " +
+            "LEFT JOIN FETCH Country c ON e = c.catalogItem " +
+            "INNER JOIN FETCH e.types t " +
             "WHERE (?1 = '' OR UPPER(e.name) LIKE UPPER(?1) OR UPPER(a.name) LIKE UPPER(?1)) " +
             "AND (?2 = '' OR UPPER(c.name) LIKE UPPER(?2)) " +
             "AND (?3 = '' OR UPPER(t.type) LIKE UPPER(?3))")

backend/src/main/java/cz/zcu/kiv/backendapi/security/SecurityConfig.java

@@ -69 +69 @@
                 .antMatchers("/delete/**").hasAuthority(Permission.DELETE.name())
                 .anyRequest()
                 .authenticated();
-
     }
 
     /**

backend/src/main/java/cz/zcu/kiv/backendapi/security/jwt/JwtUsernameAndPasswordAuthenticationFilter.java

@@ -6 +6 @@
 import cz.zcu.kiv.backendapi.user.UserEntity;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -61 +62 @@
             return authenticationManager.authenticate(authentication);
         } catch (IOException e) {
             log.error("Error getting authentication request from request: " + e.getMessage());
-            throw new RuntimeException(e);
+            throw new AuthenticationCredentialsNotFoundException(e.getMessage());
         }
     }
 

backend/src/main/resources/application.properties

@@ -7 +7 @@
 spring.jpa.open-in-view=false
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL10Dialect
 spring.jpa.properties.hibernate.format_sql=true
-spring.jpa.show-sql=true
+#spring.jpa.show-sql=true
 
 
 application.jwt.secretKey=securesecuresecuresecuresecuresecuresecuresecuresecuresecuresecuresecuresecure