Manage catalog entry

Author: shopizer-ecommerce

sm-core/files/store/StoreRepository.dat

@@ -10,8 +10,8 @@
 public interface PageableCatalogRepository extends PagingAndSortingRepository<Catalog, Long> {
 
 
-	  @Query(value = "select distinct c from Catalog c join fetch c.merchantStore cm where c.id=?1 and (?2 is null or c.code like %?2%)",
-		      countQuery = "select count(c) from Catalog c join c.merchantStore cm where c.id=?1 and (?2 is null or c.code like %?2%)")
+	  @Query(value = "select distinct c from Catalog c join fetch c.merchantStore cm where cm.id=?1 and (?2 is null or c.code like %?2%)",
+		      countQuery = "select count(c) from Catalog c join c.merchantStore cm where cm.id=?1 and (?2 is null or c.code like %?2%)")
 		  Page<Catalog> listByStore(Integer storeId, String code, Pageable pageable);
 
 

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

@@ -30,7 +30,7 @@ public interface CatalogFacade {
 
 	ReadableCatalogList listCatalogs(Optional<String> code, MerchantStore store, Language language, int page, int count);
 
-	ReadableCatalogEntryList listCatalogEntry(Optional<String> product, MerchantStore store, Language language, int page, int count);
+	ReadableCatalogEntryList listCatalogEntry(Optional<String> product, Long catalogId, MerchantStore store, Language language, int page, int count);
 
 	ReadableCatalogEntry getCatalogEntry(Long id, MerchantStore store, Language language);
 

sm-shop-model/src/main/java/com/salesmanager/shop/store/controller/catalog/facade/CatalogFacade.java

@@ -7,12 +7,15 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import javax.inject.Inject;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import com.salesmanager.core.business.constants.Constants;
 import com.salesmanager.core.business.exception.ConversionException;
 import com.salesmanager.core.business.services.catalog.category.CategoryService;
@@ -26,8 +29,6 @@
 import com.salesmanager.core.model.catalog.category.Category;
 import com.salesmanager.core.model.catalog.product.Product;
 import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
-import com.salesmanager.core.model.catalog.product.attribute.ProductOption;
-import com.salesmanager.core.model.catalog.product.attribute.ProductOptionValue;
 import com.salesmanager.core.model.catalog.product.availability.ProductAvailability;
 import com.salesmanager.core.model.catalog.product.description.ProductDescription;
 import com.salesmanager.core.model.catalog.product.image.ProductImage;
@@ -131,7 +132,7 @@ public Product populate(PersistableProduct source,
 
 					productDescription.setProduct(target);
 					productDescription.setDescription(description.getDescription());
-
+					productDescription.setProductHighlight(description.getHighlights());
 					productDescription.setName(description.getName());
 					productDescription.setSeUrl(description.getFriendlyUrl());
 					productDescription.setMetatagKeywords(description.getKeyWords());

sm-shop/SALESMANAGER-TEST.h2.db

@@ -431,15 +431,20 @@ public ReadableProduct populate(Product source,
 			target.setSku(source.getSku());
 
 			FinalPrice price = pricingService.calculateProductPrice(source);
+			
+			if(price != null) {
 
-			target.setFinalPrice(pricingService.getDisplayAmount(price.getFinalPrice(), store));
-			target.setPrice(price.getFinalPrice());
-			target.setOriginalPrice(pricingService.getDisplayAmount(price.getOriginalPrice(), store));
-	
-			if(price.isDiscounted()) {
-				target.setDiscounted(true);
-			}
+				target.setFinalPrice(pricingService.getDisplayAmount(price.getFinalPrice(), store));
+				target.setPrice(price.getFinalPrice());
+				target.setOriginalPrice(pricingService.getDisplayAmount(price.getOriginalPrice(), store));
+				
+				if(price.isDiscounted()) {
+					target.setDiscounted(true);
+				}
 
+			}
+	
+
 			//availability
 			for(ProductAvailability availability : source.getAvailabilities()) {
 				//if(availability.getRegion().equals(Constants.ALL_REGIONS)) {//TODO REL 2.1 accept a region
@@ -556,6 +561,7 @@ com.salesmanager.shop.model.catalog.product.ProductDescription populateDescripti
       tragetDescription.setDescription(description.getDescription());
       tragetDescription.setHighlights(description.getProductHighlight());
       tragetDescription.setLanguage(description.getLanguage().getCode());
+      tragetDescription.setKeyWords(description.getMetatagKeywords());
       if(description.getLanguage() != null) {
         tragetDescription.setLanguage(description.getLanguage().getCode());
       }

sm-shop/files/store/StoreRepository.dat

@@ -28,6 +28,7 @@
 import com.salesmanager.shop.model.catalog.catalog.PersistableCatalogEntry;
 import com.salesmanager.shop.model.catalog.catalog.ReadableCatalog;
 import com.salesmanager.shop.model.catalog.catalog.ReadableCatalogEntry;
+import com.salesmanager.shop.model.catalog.catalog.ReadableCatalogEntryList;
 import com.salesmanager.shop.model.catalog.catalog.ReadableCatalogList;
 import com.salesmanager.shop.model.entity.EntityExists;
 import com.salesmanager.shop.store.controller.catalog.facade.CatalogFacade;
@@ -186,11 +187,35 @@ public void removeCatalogEntry(
 
 
 
+  }
+  
+  @GetMapping(value = "/private/catalog/{id}/entry")
+  @ResponseStatus(HttpStatus.OK)
+  @ApiOperation(httpMethod = "GET", value = "Get catalog entry by catalog", notes = "",
+      response = ReadableCatalogEntryList.class)
+  @ApiImplicitParams({
+      @ApiImplicitParam(name = "store", dataType = "String", defaultValue = "DEFAULT"),
+      @ApiImplicitParam(name = "lang", dataType = "String", defaultValue = "en")})
+  public ReadableCatalogEntryList getCatalogEntry(
+	  @RequestParam(name="id") Long id,
+      @ApiIgnore MerchantStore merchantStore, @ApiIgnore Language language,
+      @RequestParam(value = "page", required = false, defaultValue="0") Integer page,
+      @RequestParam(value = "count", required = false, defaultValue="10") Integer count,
+      HttpServletRequest request) {
+
+	  return catalogFacade.listCatalogEntry(catalogEntryFilter(request), id, merchantStore, language, page, count);
+
+
   }
 
   private Optional<String> catalogFilter(HttpServletRequest request) {
 
 	    return Optional.ofNullable((String)request.getAttribute("code"));
-	  }
+  }
+  
+  private Optional<String> catalogEntryFilter(HttpServletRequest request) {
+
+	    return Optional.ofNullable((String)request.getAttribute("name"));
+}
 
 }

sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.java

@@ -35,11 +35,16 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import springfox.documentation.annotations.ApiIgnore;
 
 @RestController
-@Api(value = "/api/v1/category")
 @RequestMapping(value = "/api/v1")
+@Api(tags = {"Category management resource (Category Management Api)"})
+@SwaggerDefinition(tags = {
+    @Tag(name = "Category management resource", description = "Manage category and attached products")
+})
 public class CategoryApi {
 
   private static final int DEFAULT_CATEGORY_DEPTH = 0;

sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.java

@@ -155,7 +155,6 @@ public void updateCatalog(Long catalogId, PersistableCatalog catalog, MerchantSt
 	public ReadableCatalog getCatalog(Long id, MerchantStore store, Language language) {
 		Validate.notNull(id,"Catalog id cannot be null");
 		Validate.notNull(store,"MerchantStore cannot be null");
-		Validate.notNull(language,"Language cannot be null");
 
 		Catalog c = catalogService.getById(id, store);
 
@@ -209,9 +208,41 @@ public ReadableCatalogList listCatalogs(Optional<String> code, MerchantStore sto
 	}
 
 	@Override
-	public ReadableCatalogEntryList listCatalogEntry(Optional<String> product, MerchantStore store, Language language, int page, int count) {
-		// TODO Auto-generated method stub
-		return null;
+	public ReadableCatalogEntryList listCatalogEntry(Optional<String> product, Long id, MerchantStore store, Language language, int page, int count) {
+		Validate.notNull(store,"MerchantStore cannot be null");
+		String productCode = null;
+		if(product.isPresent()) {
+			productCode = product.get();
+		}
+		
+		Catalog catalog = catalogService.getById(id, store);
+		
+		if(catalog == null) {
+			throw new ResourceNotFoundException("Catalog with id [" + id + "] not found for store ["+ store.getCode() +"]");
+		}
+		
+		ReadableCatalogEntryList catalogList = new ReadableCatalogEntryList();
+		
+		try {
+			Page<CatalogEntry> entry = catalogEntryService.list(catalog, store, language, productCode, page, count);
+		
+			if(entry.getSize() == 0) {
+				return catalogList;
+			}
+			
+			List<ReadableCatalogEntry> readableList = entry.getContent().stream()
+					.map(cat -> readableCatalogEntryMapper.convert(cat, store, language))
+					.collect(Collectors.toList());
+			
+			catalogList.setCatalogEntry(readableList);
+			catalogList.setTotalPages(entry.getTotalPages());
+			catalogList.setRecordsTotal(entry.getSize());
+		
+		} catch (ServiceException e) {
+			throw new ServiceRuntimeException("Cannot get catalog entry for catalog [" + id + "] andr merchant [" + store.getCode() + "]");
+		}
+
+		return catalogList;
 	}
 
 	@Override