Merge pull request #768 from shopizer-ecommerce/3.2.0-alpha

3.2.0 alpha

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.0.2)
+[![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)
 [![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)

RELEASE-NOTES.md

@@ -1,5 +1,17 @@
-Tag changes in version 2.16.0
+Version 3.2.0
 
-Spring boot 2.3.6
+
+Changes
+
+Spring boot 2.5.12
+
+Functionality
+
+Product variants addition to productOptions
+
+Fixes
+
+CVE-2022-23063
+Fix #727
 
 

pom.xml

@@ -7,7 +7,7 @@
 	<groupId>com.shopizer</groupId>
 	<artifactId>shopizer</artifactId>
 	<packaging>pom</packaging>
-	<version>3.0.2</version>
+	<version>3.2.0</version>
 
 	<name>shopizer</name>
 	<url>http://ww.shopizer.com</url>
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.5</version>
+		<version>2.5.12</version>
 	</parent>
 
  	<modules>
@@ -97,22 +97,22 @@
 			<dependency>
 				<groupId>com.shopizer</groupId>
 				<artifactId>sm-core</artifactId>
-				<version>3.0.2</version>
+				<version>3.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.shopizer</groupId>
 				<artifactId>sm-core-model</artifactId>
-				<version>3.0.2</version>
+				<version>3.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.shopizer</groupId>
 				<artifactId>sm-core-modules</artifactId>
-				<version>3.0.2</version>
+				<version>3.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.shopizer</groupId>
 				<artifactId>sm-shop-model</artifactId>
-				<version>3.0.2</version>
+				<version>3.2.0</version>
 			</dependency>
 
 			<!-- https://mvnrepository.com/artifact/javax.inject/javax.inject -->
@@ -181,7 +181,6 @@
 				<version>${shopizer.search.version}</version>
 			</dependency>
 
-
 			<dependency>
 				<groupId>mysql</groupId>
 				<artifactId>mysql-connector-java</artifactId>

sm-core-model/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.shopizer</groupId>
 		<artifactId>shopizer</artifactId>
-		<version>3.0.2</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<!-- https://mvnrepository.com/artifact/com.shopizer/shopizer-parent -->

sm-core-model/src/main/java/com/salesmanager/core/business/exception/ServiceException.java

@@ -9,7 +9,7 @@ public class ServiceException extends Exception {
 	private int exceptionType = 0;//regular error
 
 
-
+	public final static int EXCEPTION_ERROR = 500;
 
 	public final static int EXCEPTION_VALIDATION = 99;
 	public final static int EXCEPTION_PAYMENT_DECLINED = 100;

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

@@ -534,6 +534,22 @@ public void setOwner(Customer owner) {
 		this.owner = owner;
 	}
 
+	public Set<ProductInstance> getInstances() {
+		return instances;
+	}
+
+	public void setInstances(Set<ProductInstance> instances) {
+		this.instances = instances;
+	}
+
+	public void setAvailable(boolean available) {
+		this.available = available;
+	}
+
+	public void setProductShipeable(boolean productShipeable) {
+		this.productShipeable = productShipeable;
+	}
+
 
 
 

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

@@ -0,0 +1,11 @@
+package com.salesmanager.core.model.catalog.product.attribute;
+
+public interface Optionable {
+
+	ProductOption getProductOption();
+	void setProductOption(ProductOption option);
+
+	ProductOptionValue getProductOptionValue();
+	void setProductOptionValue(ProductOptionValue optionValue);
+
+}

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

@@ -36,7 +36,7 @@
  *
  */
 
-public class ProductAttribute extends SalesManagerEntity<Long, ProductAttribute> {
+public class ProductAttribute extends SalesManagerEntity<Long, ProductAttribute> implements Optionable {
 	private static final long serialVersionUID = 1L;
 
 	@Id

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

@@ -35,17 +35,24 @@
 @Entity
 @EntityListeners(value = AuditListener.class)
 @Table(name = "PRODUCT_INSTANCE", 
-uniqueConstraints = @UniqueConstraint(columnNames = { "PRODUCT_ID",
+uniqueConstraints = 
+        @UniqueConstraint(columnNames = { 
+        "PRODUCT_ID",
 		"SKU" }))
 public class ProductInstance extends SalesManagerEntity<Long, ProductInstance> implements Auditable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
 	@Column(name = "PRODUCT_INSTANCE_ID", unique = true, nullable = false)
-	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_SEQ_NEXT_VAL")
+	@TableGenerator(name = "TABLE_GEN", 
+	table = "SM_SEQUENCER", 
+	pkColumnName = "SEQ_NAME", 
+	valueColumnName = "SEQ_COUNT", 
+	pkColumnValue = "PRODUCT_INST_SEQ_NEXT_VAL")
 	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
 	private Long id;
 
+
 	@Embedded
 	private AuditSection auditSection = new AuditSection();
 

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

@@ -23,25 +23,25 @@
 import com.salesmanager.core.model.generic.SalesManagerEntity;
 import com.salesmanager.core.model.merchant.MerchantStore;
 
-
-@Entity
-@EntityListeners(value = AuditListener.class)
-@Table(name="PRODUCT_INSTANCE_GROUP")
 /**
  * Extra properties on a group of instances
  * @author carlsamson
  *
  */
-
-
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name="PRODUCT_INSTANCE_GROUP")
 public class ProductInstanceGroup extends SalesManagerEntity<Long, ProductInstanceGroup> {
 
 	private static final long serialVersionUID = 1L;
 
 
 	@Id
 	@Column(name = "PRODUCT_INSTANCE_GROUP_ID", unique=true, nullable=false)
-	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_INST_GROUP_SEQ_NEXT_VAL")
+	@TableGenerator(name = "TABLE_GEN", 
+	table = "SM_SEQUENCER", 
+	pkColumnName = "SEQ_NAME", 
+	valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_INST_GROUP_SEQ_NEXT_VAL")
 	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
 	private Long id;
 

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

@@ -33,7 +33,11 @@ public void setProductInstanceGroup(ProductInstanceGroup productInstanceGroup) {
 
 	@Id
 	@Column(name = "PRODUCT_INST_IMAGE_ID")
-	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRD_VAR_IMG_SEQ_NEXT_VAL")
+	@TableGenerator(name = "TABLE_GEN", 
+	table = "SM_SEQUENCER", 
+	pkColumnName = "SEQ_NAME", 
+	valueColumnName = "SEQ_COUNT", 
+	pkColumnValue = "PRD_INST_IMG_SEQ_NEXT_VAL")
 	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
 	private Long id;
 

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

@@ -15,6 +15,7 @@
 import javax.persistence.UniqueConstraint;
 import javax.validation.constraints.NotEmpty;
 
+import com.salesmanager.core.model.catalog.product.attribute.Optionable;
 import com.salesmanager.core.model.catalog.product.attribute.ProductOption;
 import com.salesmanager.core.model.catalog.product.attribute.ProductOptionValue;
 import com.salesmanager.core.model.common.audit.AuditListener;
@@ -37,7 +38,7 @@
 @EntityListeners(value = AuditListener.class)
 @Table(name = "PRODUCT_VARIATION", uniqueConstraints=
 @UniqueConstraint(columnNames = {"MERCHANT_ID", "PRODUCT_OPTION_ID", "OPTION_VALUE_ID"}))
-public class ProductVariation extends SalesManagerEntity<Long, ProductVariation> implements Auditable {
+public class ProductVariation extends SalesManagerEntity<Long, ProductVariation> implements Optionable, Auditable {
 
 	/**
 	 * 

sm-core-model/src/main/java/com/salesmanager/core/model/order/orderproduct/OrderProduct.java

@@ -17,7 +17,6 @@
 import javax.persistence.TableGenerator;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.salesmanager.core.constants.SchemaConstant;
 import com.salesmanager.core.model.generic.SalesManagerEntity;
 import com.salesmanager.core.model.order.Order;
 
@@ -32,7 +31,7 @@ public class OrderProduct extends SalesManagerEntity<Long, OrderProduct> {
 	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
 	private Long id;
 
-	@Column (name="PRODUCT_SKU") //yess !!! rename to code
+	@Column (name="PRODUCT_SKU")
 	private String sku;
 
 	@Column (name="PRODUCT_NAME" , length=64 , nullable=false)

sm-core-model/src/main/java/com/salesmanager/core/model/shoppingcart/ShoppingCartAttributeItem.java

@@ -14,7 +14,6 @@
 import javax.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.salesmanager.core.constants.SchemaConstant;
 import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
 import com.salesmanager.core.model.common.audit.AuditListener;
 import com.salesmanager.core.model.common.audit.AuditSection;

sm-core-model/src/main/java/com/salesmanager/core/model/shoppingcart/ShoppingCartItem.java

@@ -23,7 +23,6 @@
 import javax.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.salesmanager.core.constants.SchemaConstant;
 import com.salesmanager.core.model.catalog.product.Product;
 import com.salesmanager.core.model.catalog.product.price.FinalPrice;
 import com.salesmanager.core.model.common.audit.AuditListener;
@@ -52,21 +51,28 @@ public class ShoppingCartItem extends SalesManagerEntity<Long, ShoppingCartItem>
 	private ShoppingCart shoppingCart;
 
 	@Column(name="QUANTITY")
-	private Integer quantity = new Integer(1);
-
+	private Integer quantity = 1;
 
 	@Embedded
 	private AuditSection auditSection = new AuditSection();
 
-	@Column(name="PRODUCT_ID", nullable=false) //TODO CODE
-	private Long productId;
+	@Deprecated //Use sku
+	@Column(name="PRODUCT_ID", nullable=false) 
+    private Long productId;
+
+	//SKU
+	@Column(name="SKU", nullable=true) 
+	private String sku;
 
 	@JsonIgnore
 	@Transient
 	private boolean productVirtual;
 
 	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "shoppingCartItem")
 	private Set<ShoppingCartAttributeItem> attributes = new HashSet<ShoppingCartAttributeItem>();
+
+	@Column(name="PRODUCT_INSTANCE", nullable=true)
+	private Long productInstance;
 
 	@JsonIgnore
 	@Transient
@@ -130,8 +136,6 @@ public void setId(Long id) {
 
 	}
 
-
-
 	public void setAttributes(Set<ShoppingCartAttributeItem> attributes) {
 		this.attributes = attributes;
 	}
@@ -156,8 +160,6 @@ public Integer getQuantity() {
 		return quantity;
 	}
 
-
-
 	public ShoppingCart getShoppingCart() {
 		return shoppingCart;
 	}
@@ -229,4 +231,20 @@ public void setProductVirtual(boolean productVirtual) {
 		this.productVirtual = productVirtual;
 	}
 
+	public String getSku() {
+		return sku;
+	}
+
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
+
+	public Long getProductInstance() {
+		return productInstance;
+	}
+
+	public void setProductInstance(Long productInstance) {
+		this.productInstance = productInstance;
+	}
+
 }

sm-core-modules/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.shopizer</groupId>
     <artifactId>shopizer</artifactId>
-    <version>3.0.2</version>
+    <version>3.2.0</version>
   </parent>
 
 

sm-core/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.shopizer</groupId>
 		<artifactId>shopizer</artifactId>
-		<version>3.0.2</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<artifactId>sm-core</artifactId>

sm-core/src/main/java/com/salesmanager/core/business/configuration/events/AsynchronousEventsConfiguration.java

@@ -0,0 +1,26 @@
+package com.salesmanager.core.business.configuration.events;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.ApplicationEventMulticaster;
+import org.springframework.context.event.SimpleApplicationEventMulticaster;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
+
+/**
+ * Events will be asynchronous (in a different thread)
+ * @author carlsamson
+ *
+ */
+@Configuration
+public class AsynchronousEventsConfiguration {
+
+	   @Bean(name = "applicationEventMulticaster")
+	   public ApplicationEventMulticaster simpleApplicationEventMulticaster() {
+	       SimpleApplicationEventMulticaster eventMulticaster
+	         = new SimpleApplicationEventMulticaster();
+
+	       eventMulticaster.setTaskExecutor(new SimpleAsyncTaskExecutor());
+	       return eventMulticaster;
+	   }
+
+}