3.2.2

shopizer-ecommerce · Sep 6, 2022 · d4cd0f8 · d4cd0f8
1 parent 0bdf8ab
commit d4cd0f8
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 ### Shopizer 2.X (for java 1.8 +) is still available
 
 
-[![last_version](https://img.shields.io/badge/last_version-v3.0.0-blue.svg?style=flat)](https://github.com/shopizer-ecommerce/shopizer/tree/3.2.0)
+[![last_version](https://img.shields.io/badge/last_version-v3.2.2-blue.svg?style=flat)](https://github.com/shopizer-ecommerce/shopizer/tree/3.2.0)
 [![Official site](https://img.shields.io/website-up-down-green-red/https/shields.io.svg?label=official%20site)](http://www.shopizer.com/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/shopizerecomm/shopizer.svg)](https://hub.docker.com/r/shopizerecomm/shopizer)
 [![stackoverflow](https://img.shields.io/badge/shopizer-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/shopizer)
@@ -151,7 +151,7 @@ Synchronize lastest version with the upstream
 -------------------
 
        $ git remote add upstream https://github.com/yourusername/shopizer.git
-	   $ git pull upstream 3.0.0
+	  $ git pull upstream 3.2.2
 
 Create new branch in your repository
 -------------------

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,19 +1,11 @@
-Changes in version 3.2.0
+Changes in version 3.2.2
 
 
 Functionality
 
-Product variants in complement or replacement of product options
+Api refactoring for products as documented https://shopizer-ecommerce.github.io/documentation/api/products/index.html
+Open Search in replacement of elastic search. This is a starter that can be added to sm-core/pom.xml
 
 
-Upgrade
-
-Spring boot 2.5.5
-
-
-Fixes
-
-CVE-2022-23063
-#727
 
 
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 	<groupId>com.shopizer</groupId>
 	<artifactId>shopizer</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0</version>
+	<version>3.2.2</version>
 
 	<name>shopizer</name>
 	<url>http://ww.shopizer.com</url>
@@ -98,22 +98,22 @@
 			<dependency>
 				<groupId>com.shopizer</groupId>
 				<artifactId>sm-core</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>com.shopizer</groupId>
 				<artifactId>sm-core-model</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>com.shopizer</groupId>
 				<artifactId>sm-core-modules</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>com.shopizer</groupId>
 				<artifactId>sm-shop-model</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.2</version>
 			</dependency>
 
 			<!-- https://mvnrepository.com/artifact/javax.inject/javax.inject -->
@@ -175,15 +175,6 @@
 				<version>${simple-json-version}</version>
 			</dependency>
 
-			<!-- sm-search -->
-			<!--
-			<dependency>
-				<groupId>com.shopizer</groupId>
-				<artifactId>sm-search</artifactId>
-				<version>${shopizer.search.version}</version>
-			</dependency>
-			-->
-
 			<dependency>
 				<groupId>mysql</groupId>
 				<artifactId>mysql-connector-java</artifactId>
@@ -384,15 +375,7 @@
 
 	<!--general dependencies -->
 	<dependencies>
-
-		<!-- sm-search -->
-		<!--
-		<dependency>
-			<groupId>com.shopizer</groupId>
-			<artifactId>sm-search</artifactId>
-		</dependency>
-		-->
-
+
 		<dependency>
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>

diff --git a/sm-core-model/pom.xml b/sm-core-model/pom.xml
@@ -5,20 +5,8 @@
 	<parent>
 		<groupId>com.shopizer</groupId>
 		<artifactId>shopizer</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.2</version>
 	</parent>
-
-	<!-- https://mvnrepository.com/artifact/com.shopizer/shopizer-parent -->
-	<!--
-	<parent>
-	    <groupId>com.shopizer</groupId>
-	    <artifactId>shopizer-parent</artifactId>
-	    <version>3.0.3</version>
-	    <relativePath />
-	</parent>
-	<version>3.0.3</version>
-	-->
-
 
 
 	<artifactId>sm-core-model</artifactId>

diff --git a/sm-core-modules/pom.xml b/sm-core-modules/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.shopizer</groupId>
     <artifactId>shopizer</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.2</version>
   </parent>
 
 

diff --git a/sm-core/pom.xml b/sm-core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.shopizer</groupId>
 		<artifactId>shopizer</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.2</version>
 	</parent>
 
 	<artifactId>sm-core</artifactId>
@@ -60,13 +60,13 @@
 		</dependency>
 
 		<!-- open search client -->
+		<!--
 		<dependency>
 			<groupId>com.shopizer</groupId>
 			<artifactId>shopizer-search-opensearch-spring-boot-starter</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.0-ALPHA</version>
 		</dependency>
-
-
+		-->
 
 		<!--
 		Want to use Square Payment Module ?

diff --git a/sm-shop-model/pom.xml b/sm-shop-model/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.shopizer</groupId>
     <artifactId>shopizer</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.2</version>
   </parent>
 
   <artifactId>sm-shop-model</artifactId>

diff --git a/...ava/com/salesmanager/shop/model/catalog/product/product/definition/ProductDefinition.java b/...ava/com/salesmanager/shop/model/catalog/product/product/definition/ProductDefinition.java
@@ -20,6 +20,7 @@ public class ProductDefinition extends Entity {
 	private boolean canBePurchased = true;
 	private String dateAvailable;
 	private String identifier;
+	private String sku; //to match v1 api
 	private ProductSpecification productSpecifications;
 	private int sortOrder;
 	private int quantity;
@@ -78,6 +79,12 @@ public boolean isCanBePurchased() {
 	public void setCanBePurchased(boolean canBePurchased) {
 		this.canBePurchased = canBePurchased;
 	}
+	public String getSku() {
+		return sku;
+	}
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
 
 
 }
diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.shopizer</groupId>
 		<artifactId>shopizer</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.2</version>
 	</parent>
 
 	<artifactId>sm-shop</artifactId>
@@ -38,7 +38,6 @@
 			<artifactId>sm-shop-model</artifactId>
 		</dependency>
 
-
 		<!-- Spring boot starters -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/...java/com/salesmanager/shop/mapper/catalog/product/PersistableProductDefinitionMapper.java b/...java/com/salesmanager/shop/mapper/catalog/product/PersistableProductDefinitionMapper.java
@@ -70,7 +70,12 @@ public Product merge(PersistableProductDefinition source, Product destination, M
 		try {
 
 			//core properties
-			destination.setSku(source.getIdentifier());
+
+			if(StringUtils.isBlank(source.getIdentifier())) {
+				destination.setSku(source.getSku());
+			} else {
+				destination.setSku(source.getIdentifier());
+			}
 			destination.setAvailable(source.isVisible());
 			destination.setDateAvailable(new Date());
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/api/v2/product/ProductApiV2.java b/sm-shop/src/main/java/com/salesmanager/shop/store/api/v2/product/ProductApiV2.java
@@ -6,6 +6,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -255,6 +256,14 @@ public ReadableProductList list(
 
 		**/
 
+		if (!StringUtils.isBlank(searchCriterias.getSku())) {
+			searchCriterias.setCode(searchCriterias.getSku());
+		}
+
+		if (!StringUtils.isBlank(searchCriterias.getName())) {
+			searchCriterias.setProductName(searchCriterias.getName());
+		}
+
 		searchCriterias.setMaxCount(count);
 		searchCriterias.setLanguage(language.getCode());