Merge pull request shopizer-ecommerce#386 from wtune/add_getProductWithOnlyMerchantStoreById

Add a dedicated query to reduce the amount of unnecessary joined table for product

Author: shopizer-ecommerce

sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/ProductRepositoryCustom.java

@@ -35,6 +35,7 @@ Product getProductForLocale(long productId, Language language,
 				Locale locale);
 
 		Product getById(Long productId);
+	  Product getProductWithOnlyMerchantStoreById(Long productId);
 		Product getById(Long productId, MerchantStore merchant);
 
 		Product getByCode(String productCode, Language language);

sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/ProductRepositoryImpl.java

@@ -5,10 +5,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.*;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -40,7 +38,23 @@ public Product getById(Long productId) {
 	  return this.get(productId, null);
 	}
 
-	    private Product get(Long productId, MerchantStore merchant) {
+	@Override
+	public Product getProductWithOnlyMerchantStoreById(Long productId) {
+		final String hql = "select distinct p from Product as p " +
+				"join fetch p.merchantStore merch " +
+				"where p.id=:pid";
+
+		final Query q = this.em.createQuery(hql);
+		q.setParameter("pid", productId);
+
+		try {
+			return (Product)q.getSingleResult();
+		} catch (NoResultException ignored) {
+			return null;
+		}
+  }
+
+	private Product get(Long productId, MerchantStore merchant) {
 
 	        try {
 

sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/ProductService.java

@@ -40,6 +40,7 @@ List<Product> getProducts(List<Long> categoryIds, Language language)
 
 	Product getBySeUrl(MerchantStore store, String seUrl, Locale locale);
 
+	Product getProductWithOnlyMerchantStoreById(Long productId);
 	/**
 	 * Get a product by sku (code) field  and the language
 	 * @param productCode

sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/ProductServiceImpl.java

@@ -113,6 +113,11 @@ public List<Product> getProducts(List<Long> categoryIds) throws ServiceException
 	public Product getById(Long productId) {
 		return productRepository.getById(productId);
 	}
+
+	@Override
+	public Product getProductWithOnlyMerchantStoreById(Long productId) {
+		return productRepository.getProductWithOnlyMerchantStoreById(productId);
+	}
 
 	@Override
 	public List<Product> getProducts(List<Long> categoryIds, Language language) throws ServiceException {

sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductReviewController.java

@@ -104,7 +104,7 @@ public String displayProductReviews(@RequestParam("id") long productId,Model mod
 
 		try {
 
-			product = productService.getById(productId);
+			product = productService.getProductWithOnlyMerchantStoreById(productId);
 
 
 			if(product==null) {