shopizer-uncached

diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index 4c9c382..ae65ffc 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Nov 08 12:57:42 EST 2016
+#Wed Nov 09 09:28:41 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index 56347fc..45f16d2 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Nov 08 12:57:41 EST 2016
+#Wed Nov 09 09:28:40 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.java
index dec9f3e..1a943ff 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.java
@@ -66,6 +66,7 @@ public class ProductRelationshipRepositoryImpl implements ProductRelationshipRep
 		qs.append("join fetch pr.relatedProduct rp ");
 		
 		qs.append("left join fetch rp.attributes pattr ");
+		qs.append("left join fetch rp.categories rpc ");
 		qs.append("left join fetch rp.descriptions rpd ");
 		qs.append("left join fetch rp.images pd ");
 		qs.append("left join fetch rp.merchantStore rpm ");
@@ -111,6 +112,7 @@ public class ProductRelationshipRepositoryImpl implements ProductRelationshipRep
 		qs.append("left join fetch pr.relatedProduct rp ");
 		
 		qs.append("left join fetch rp.attributes pattr ");
+		qs.append("left join fetch rp.categories rpc ");
 		qs.append("left join fetch rp.descriptions rpd ");
 		qs.append("left join fetch rp.images pd ");
 		qs.append("left join fetch rp.merchantStore rpm ");
@@ -222,6 +224,7 @@ public class ProductRelationshipRepositoryImpl implements ProductRelationshipRep
 		qs.append("left join fetch pr.product p ");
 		qs.append("left join fetch pr.relatedProduct rp ");
 		qs.append("left join fetch rp.attributes pattr ");
+		qs.append("left join fetch rp.categories rpc ");
 		qs.append("left join fetch p.descriptions pd ");
 		qs.append("left join fetch rp.descriptions rpd ");
 
@@ -256,6 +259,7 @@ public class ProductRelationshipRepositoryImpl implements ProductRelationshipRep
 		qs.append("left join fetch pr.relatedProduct rp ");
 		
 		qs.append("left join fetch rp.attributes pattr ");
+		qs.append("left join fetch rp.categories rpc ");
 		qs.append("left join fetch rp.descriptions rpd ");
 		qs.append("left join fetch rp.images pd ");
 		qs.append("left join fetch rp.merchantStore rpm ");

diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index 02d95cf..86a600b 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Nov 08 12:57:42 EST 2016
+#Wed Nov 09 09:28:42 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
new file mode 100644
index 0000000..b948116
Binary files /dev/null and b/sm-shop/SALESMANAGER.h2.db differ

diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
new file mode 100644
index 0000000..41a36ec
--- /dev/null
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -0,0 +1,4 @@
+#FileLock
+#Wed Nov 09 13:06:58 EST 2016
+id=1584a457842e9e1377802b3d165d466c925966e04aa
+method=file

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
index b89181d..b6b6b32 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
@@ -606,7 +606,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 			
 			if(objects==null) {
 				//load categories
-				loadedCategories = categoryFacade.getCategoryHierarchy(store, 3, language);
+				loadedCategories = categoryFacade.getCategoryHierarchy(store, 0, language);
 				objects = new ConcurrentHashMap<String, List<ReadableCategory>>();
 				objects.put(language.getCode(), loadedCategories);
 				webApplicationCache.putInCache(categoriesKey.toString(), objects);
@@ -616,7 +616,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 			}
 			
 		} else {
-			loadedCategories = categoryFacade.getCategoryHierarchy(store, 3, language);
+			loadedCategories = categoryFacade.getCategoryHierarchy(store, 0, language);
 		}
 		
 		if(loadedCategories!=null) {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java
index ad248fc..7dec6b0 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java
@@ -59,6 +59,7 @@ import com.salesmanager.shop.utils.LocaleUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
@@ -430,6 +431,8 @@ public class InitStoreData implements InitData {
 		    availability.setRegion("*");
 		    availability.setProduct(product);// associate with product
 		    
+		    
+		    
 		    ProductPrice dprice = new ProductPrice();
 		    dprice.setDefaultPrice(true);
 		    dprice.setProductPriceAmount(new BigDecimal(39.99));
@@ -441,6 +444,9 @@ public class InitStoreData implements InitData {
 		    dpd.setLanguage(en);
 
 		    dprice.getDescriptions().add(dpd);
+		    
+		    availability.getPrices().add(dprice);
+		    product.getAvailabilities().add(availability);
 
 		    // Product description
 		    ProductDescription description = new ProductDescription();
@@ -458,7 +464,10 @@ public class InitStoreData implements InitData {
 		    productService.create(product);
 		    
 		    try {
-		    	InputStream inStream = this.getClass().getClassLoader().getResourceAsStream("/demo/spring.png");
+		    	//InputStream inStream = this.getClass().getClassLoader().getResourceAsStream("/demo/spring.png");
+		    	//TODO TO BE TESTED
+		    	ClassPathResource classPathResource = new ClassPathResource("/demo/spring.png");
+		    	InputStream inStream = classPathResource.getInputStream();
 		    	this.saveFile(inStream, "spring.png", product);
 		    } catch(Exception e) {
 		    	LOGGER.error("Error while reading demo file spring.png",e);
@@ -508,6 +517,9 @@ public class InitStoreData implements InitData {
 
 		    dprice2.getDescriptions().add(dpd);
 		    
+		    availability2.getPrices().add(dprice2);
+		    product2.getAvailabilities().add(availability2);
+		    
 		    productService.create(product2);
 		    
 		    try {
@@ -561,6 +573,9 @@ public class InitStoreData implements InitData {
 
 		    dprice3.getDescriptions().add(dpd);
 		    
+		    availability3.getPrices().add(dprice3);
+		    product3.getAvailabilities().add(availability3);
+		    
 		    
 		    productService.create(product3);
 
@@ -613,6 +628,9 @@ public class InitStoreData implements InitData {
 		    dpd.setLanguage(en);
 
 		    dprice4.getDescriptions().add(dpd);
+		    
+		    availability4.getPrices().add(dprice4);
+		    product4.getAvailabilities().add(availability4);
  
 		    productService.create(product4);
 
@@ -669,7 +687,8 @@ public class InitStoreData implements InitData {
 
 		    dprice5.getDescriptions().add(dpd);
 
-		    //productPriceService.create(dprice5);
+		    availability5.getPrices().add(dprice5);
+		    product5.getAvailabilities().add(availability5);
 
 		    productService.create(product5);
 
@@ -726,7 +745,8 @@ public class InitStoreData implements InitData {
 
 		    dprice6.getDescriptions().add(dpd);
 
-		    //productPriceService.create(dprice6);
+		    availability6.getPrices().add(dprice6);
+		    product6.getAvailabilities().add(availability6);
 		    
 		    productService.create(product6);
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.java
index f409950..4296375 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.java
@@ -31,7 +31,7 @@ public class CategoryFacadeImpl implements CategoryFacade {
 	public List<ReadableCategory> getCategoryHierarchy(MerchantStore store,
 			int depth, Language language) throws Exception {
 		
-		List<Category> categories = categoryService.listByDepth(store, 2, language);
+		List<Category> categories = categoryService.listByDepth(store, depth, language);
 		List<ReadableCategory> returnValues = new ArrayList<ReadableCategory>();
 		
 		Map<Long, ReadableCategory> categoryMap = new ConcurrentHashMap<Long, ReadableCategory>();

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
index d6ccfbe..75d735e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
@@ -1,6 +1,8 @@
 package com.salesmanager.shop.store.controller.error;
 
 import org.jopendocument.util.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -11,11 +13,17 @@ import org.springframework.web.servlet.ModelAndView;
 @ControllerAdvice
 public class ErrorController {
 	
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ErrorController.class);
+	
+	
     
 	@ExceptionHandler(Exception.class)
 	@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
 	public ModelAndView handleException(Exception ex) {
 		
+		LOGGER.error("Error page controller",ex);
+
 		ModelAndView model = null;
 		if(ex instanceof AccessDeniedException) {
 			
@@ -39,6 +47,8 @@ public class ErrorController {
 	@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
 	public ModelAndView handleRuntimeException(Exception ex) {
 		
+		LOGGER.error("Error page controller",ex);
+		
 		ModelAndView model = null;
 
 			

diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index af93470..7c415f5 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Nov 08 12:57:45 EST 2016
+#Wed Nov 09 12:49:51 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop