Merge pull request #793 from shopizer-ecommerce/3.2.1

3.2.1

.circleci/config.yml

@@ -57,10 +57,10 @@ jobs:
        - run: |
            docker login -u shopizerecomm -p $DOCKERHUB_PASSWORD
        - run: |
-           (cd sm-shop && docker build . -t shopizerecomm/shopizer:latest)
+           (cd sm-shop && docker build . -t shopizerecomm/shopizer:3.2.1)
        - run:
            name: push image
-           command: docker push shopizerecomm/shopizer:latest
+           command: docker push shopizerecomm/shopizer:3.2.1
 
 # Orchestrate our job run sequence
 workflows:

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
 -------------------

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
 
 

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>
@@ -44,7 +44,8 @@
 
 		<shopizer.search.version>2.11.1</shopizer.search.version>
 		<shopizer-canadapost.version>2.15.0</shopizer-canadapost.version>
-
+
+		<!-- TODO replace with starter -->
 		<elasticsearch.version>7.5.2</elasticsearch.version>
 		<guava.version>27.1-jre</guava.version>
 		<commons-lang.version>3.5</commons-lang.version>
@@ -97,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 -->
@@ -174,13 +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>
@@ -381,13 +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>
@@ -452,12 +440,7 @@
 			</exclusions>
 		</dependency>
 
-		<!-- Elastic search -->
-		<dependency>
-			<groupId>org.elasticsearch</groupId>
-			<artifactId>elasticsearch</artifactId>
-			<version>${elasticsearch.version}</version><!--$NO-MVN-MAN-VER$ -->
-		</dependency>
+		<!-- Elastic search TODO replace with starter-->
 
 		<dependency>
 			<groupId>mysql</groupId>

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>

sm-core-model/src/main/java/com/salesmanager/core/model/catalog/category/Category.java

@@ -14,6 +14,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
@@ -30,7 +31,9 @@
 
 @Entity
 @EntityListeners(value = com.salesmanager.core.model.common.audit.AuditListener.class)
-@Table(name = "CATEGORY",uniqueConstraints=
+@Table(name = "CATEGORY",
+	indexes = @Index(columnList = "LINEAGE"),
+	uniqueConstraints=
     @UniqueConstraint(columnNames = {"MERCHANT_ID", "CODE"}) )
 
 

sm-core-model/src/main/java/com/salesmanager/core/model/catalog/product/ProductCriteria.java

@@ -21,6 +21,11 @@ public class ProductCriteria extends Criteria {
 	private List<String> availabilities;
 	private List<Long> productIds;
 	private List<Long> optionValueIds;
+	private String sku;
+
+	//V2
+	private List<String> optionValueCodes;
+	private String option;
 
 	private String status;
 
@@ -117,6 +122,30 @@ public void setOrigin(String origin) {
 		this.origin = origin;
 	}
 
+	public List<String> getOptionValueCodes() {
+		return optionValueCodes;
+	}
+
+	public void setOptionValueCodes(List<String> optionValueCodes) {
+		this.optionValueCodes = optionValueCodes;
+	}
+
+	public String getOption() {
+		return option;
+	}
+
+	public void setOption(String option) {
+		this.option = option;
+	}
+
+	public String getSku() {
+		return sku;
+	}
+
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
+
 
 
 }

sm-core-model/src/main/java/com/salesmanager/core/model/catalog/product/attribute/ProductAttribute.java

@@ -14,13 +14,14 @@
 import javax.persistence.TableGenerator;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
+import javax.persistence.Index;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.salesmanager.core.model.catalog.product.Product;
 import com.salesmanager.core.model.generic.SalesManagerEntity;
 
 @Entity
 @Table(name="PRODUCT_ATTRIBUTE",
+    indexes = @Index(columnList = "PRODUCT_ID"),
 	uniqueConstraints={
 		@UniqueConstraint(columnNames={
 				"OPTION_ID",
@@ -119,7 +120,7 @@ public void setAttributePrice(String attributePrice) {
 		this.attributePrice = attributePrice;
 	}
 
-	@JsonIgnore
+
 	@ManyToOne(targetEntity = Product.class)
 	@JoinColumn(name = "PRODUCT_ID", nullable = false)
 	private Product product;

sm-core-model/src/main/java/com/salesmanager/core/model/catalog/product/instance/ProductInstance.java

@@ -13,6 +13,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
@@ -34,7 +35,8 @@
 
 @Entity
 @EntityListeners(value = AuditListener.class)
-@Table(name = "PRODUCT_INSTANCE", 
+@Table(name = "PRODUCT_INSTANCE",
+indexes = @Index(columnList = "PRODUCT_ID"),
 uniqueConstraints = 
         @UniqueConstraint(columnNames = { 
         "PRODUCT_ID",
@@ -67,7 +69,7 @@ public class ProductInstance extends SalesManagerEntity<Long, ProductInstance> i
 	private boolean available = true;
 
 	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "PRODUCT_VARIANTION_ID", nullable = false)
+	@JoinColumn(name = "PRODUCT_VARIATION_ID", nullable = true)
 	private ProductVariation variant;
 
 	@ManyToOne(targetEntity = Product.class)
@@ -81,7 +83,7 @@ public class ProductInstance extends SalesManagerEntity<Long, ProductInstance> i
 	private Integer sortOrder = 0;
 
 	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "PRODUCT_VARIANTION_VALUE_ID", nullable = true)
+	@JoinColumn(name = "PRODUCT_VARIATION_VALUE_ID", nullable = true)
 	private ProductVariation variantValue;
 
 	@NotEmpty

sm-core-model/src/main/java/com/salesmanager/core/model/catalog/product/variation/ProductVariation.java

@@ -49,7 +49,7 @@ public class ProductVariation extends SalesManagerEntity<Long, ProductVariation>
 	private AuditSection auditSection = new AuditSection();
 
 	@Id
-	@Column(name = "PRODUCT_VARIANTION_ID", unique=true, nullable=false)
+	@Column(name = "PRODUCT_VARIATION_ID", unique=true, nullable=false)
 	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_VARIN_SEQ_NEXT_VAL")
 	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
 	private Long id;

sm-core-model/src/main/java/com/salesmanager/core/model/merchant/MerchantStore.java

@@ -14,6 +14,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
@@ -40,7 +41,8 @@
 import com.salesmanager.core.utils.CloneUtils;
 
 @Entity
-@Table(name = "MERCHANT_STORE")
+@Table(name = "MERCHANT_STORE",
+	indexes = @Index(columnList = "LINEAGE"))
 public class MerchantStore extends SalesManagerEntity<Integer, MerchantStore> implements Auditable {
 
   private static final long serialVersionUID = 1L;
@@ -92,6 +94,9 @@ public MerchantStore(Integer id, String code, String name, String storeEmailAddr
 	@Pattern(regexp = "^[a-zA-Z0-9_]*$")
 	@Column(name = "STORE_CODE", nullable = false, unique = true, length = 100)
 	private String code;
+
+    @Column(name = "LINEAGE")
+    private String lineage;
 
 	@NotEmpty
 	@Column(name = "STORE_PHONE", length = 50)