nashtech-garage#981 update promotion database and entities (nashtech-…

…garage#983)
samhohoho · Sep 5, 2024 · a4fc129 · a4fc129
1 parent 49ab7b8
commit a4fc129
Show file tree

Hide file tree

Showing 12 changed files with 188 additions and 9 deletions.
diff --git a/promotion/src/main/java/com/yas/promotion/model/Promotion.java b/promotion/src/main/java/com/yas/promotion/model/Promotion.java
@@ -1,19 +1,25 @@
 package com.yas.promotion.model;
 
+import com.yas.promotion.model.enumeration.ApplyTo;
+import com.yas.promotion.model.enumeration.DiscountType;
+import com.yas.promotion.model.enumeration.UsageType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import java.time.ZonedDateTime;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.time.ZonedDateTime;
+
 @Entity
 @Table(name = "promotion")
 @Getter
@@ -35,10 +41,25 @@ public class Promotion extends AbstractAuditEntity {
 
     private String couponCode;
 
+    @Enumerated(EnumType.STRING)
+    private DiscountType discountType;
+
+    @Enumerated(EnumType.STRING)
+    private UsageType usageType;
+
+    @Enumerated(EnumType.STRING)
+    private ApplyTo applyTo;
+
+    private int usageLimit;
+
+    private int usageCount;
+
     private Long discountPercentage;
 
     private Long discountAmount;
 
+    private Long minimumOrderPurchaseAmount;
+
     private Boolean isActive;
 
     private ZonedDateTime startDate;

diff --git a/promotion/src/main/java/com/yas/promotion/model/PromotionApply.java b/promotion/src/main/java/com/yas/promotion/model/PromotionApply.java
@@ -0,0 +1,38 @@
+package com.yas.promotion.model;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "promotion_apply")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PACKAGE)
+@Builder
+public class PromotionApply extends AbstractAuditEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "promotion_id")
+    private Promotion promotion;
+
+    private Long productId;
+
+    private Long categoryId;
+
+    private Long brandId;
+}
diff --git a/promotion/src/main/java/com/yas/promotion/model/PromotionUsage.java b/promotion/src/main/java/com/yas/promotion/model/PromotionUsage.java
@@ -0,0 +1,38 @@
+package com.yas.promotion.model;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "promotion_usage")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PACKAGE)
+@Builder
+public class PromotionUsage {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "promotion_id")
+    private Promotion promotion;
+
+    private Long productId;
+
+    private String userId;
+
+    private Long orderId;
+}
diff --git a/promotion/src/main/java/com/yas/promotion/model/enumeration/ApplyTo.java b/promotion/src/main/java/com/yas/promotion/model/enumeration/ApplyTo.java
@@ -0,0 +1,5 @@
+package com.yas.promotion.model.enumeration;
+
+public enum ApplyTo {
+    PRODUCT, CATEGORY, BRAND
+}
diff --git a/promotion/src/main/java/com/yas/promotion/model/enumeration/DiscountType.java b/promotion/src/main/java/com/yas/promotion/model/enumeration/DiscountType.java
@@ -0,0 +1,5 @@
+package com.yas.promotion.model.enumeration;
+
+public enum DiscountType {
+    PERCENTAGE, FIXED;
+}
diff --git a/promotion/src/main/java/com/yas/promotion/model/enumeration/UsageType.java b/promotion/src/main/java/com/yas/promotion/model/enumeration/UsageType.java
@@ -0,0 +1,5 @@
+package com.yas.promotion.model.enumeration;
+
+public enum UsageType {
+    LIMITED, UNLIMITED
+}
diff --git a/promotion/src/main/java/com/yas/promotion/service/PromotionService.java b/promotion/src/main/java/com/yas/promotion/service/PromotionService.java
@@ -8,16 +8,17 @@
 import com.yas.promotion.viewmodel.PromotionDetailVm;
 import com.yas.promotion.viewmodel.PromotionListVm;
 import com.yas.promotion.viewmodel.PromotionPostVm;
-import java.time.ZonedDateTime;
-import java.util.List;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -33,9 +34,13 @@ public PromotionDetailVm createPromotion(PromotionPostVm promotionPostVm) {
                 .slug(promotionPostVm.slug())
                 .description(promotionPostVm.description())
                 .couponCode(promotionPostVm.couponCode())
+                .applyTo(promotionPostVm.applyTo())
+                .usageType(promotionPostVm.usageType())
+                .usageLimit(promotionPostVm.usageLimit())
+                .discountType(promotionPostVm.discountType())
                 .discountPercentage(promotionPostVm.discountPercentage())
                 .discountAmount(promotionPostVm.discountAmount())
-                .isActive(true)
+                .isActive(promotionPostVm.isActive())
                 .startDate(promotionPostVm.startDate())
                 .endDate(promotionPostVm.endDate())
                 .build();

diff --git a/promotion/src/main/java/com/yas/promotion/viewmodel/PromotionDetailVm.java b/promotion/src/main/java/com/yas/promotion/viewmodel/PromotionDetailVm.java
@@ -1,15 +1,24 @@
 package com.yas.promotion.viewmodel;
 
 import com.yas.promotion.model.Promotion;
-import java.time.ZonedDateTime;
+import com.yas.promotion.model.enumeration.ApplyTo;
+import com.yas.promotion.model.enumeration.DiscountType;
+import com.yas.promotion.model.enumeration.UsageType;
 import lombok.Builder;
 
+import java.time.ZonedDateTime;
+
 @Builder
 public record PromotionDetailVm(Long id,
                                 String name,
                                 String slug,
                                 String description,
                                 String couponCode,
+                                int usageLimit,
+                                int usageCount,
+                                DiscountType discountType,
+                                ApplyTo applyTo,
+                                UsageType usageType,
                                 Long discountPercentage,
                                 Long discountAmount,
                                 Boolean isActive,
@@ -21,6 +30,12 @@ public static PromotionDetailVm fromModel(Promotion promotion) {
                 .id(promotion.getId())
                 .name(promotion.getName())
                 .slug(promotion.getSlug())
+                .couponCode(promotion.getCouponCode())
+                .usageLimit(promotion.getUsageLimit())
+                .usageCount(promotion.getUsageCount())
+                .discountType(promotion.getDiscountType())
+                .applyTo(promotion.getApplyTo())
+                .usageType(promotion.getUsageType())
                 .description(promotion.getDescription())
                 .discountPercentage(promotion.getDiscountPercentage())
                 .discountAmount(promotion.getDiscountAmount())

diff --git a/promotion/src/main/java/com/yas/promotion/viewmodel/PromotionListVm.java b/promotion/src/main/java/com/yas/promotion/viewmodel/PromotionListVm.java
@@ -1,8 +1,9 @@
 package com.yas.promotion.viewmodel;
 
-import java.util.List;
 import lombok.Builder;
 
+import java.util.List;
+
 @Builder
 public record PromotionListVm(
         List<PromotionDetailVm> promotionDetailVmList,

diff --git a/promotion/src/main/java/com/yas/promotion/viewmodel/PromotionPostVm.java b/promotion/src/main/java/com/yas/promotion/viewmodel/PromotionPostVm.java
@@ -1,17 +1,25 @@
 package com.yas.promotion.viewmodel;
 
+import com.yas.promotion.model.enumeration.ApplyTo;
+import com.yas.promotion.model.enumeration.DiscountType;
+import com.yas.promotion.model.enumeration.UsageType;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
-import java.time.ZonedDateTime;
 import lombok.Builder;
 
+import java.time.ZonedDateTime;
+
 @Builder
 public record PromotionPostVm(@Size(min = 1, max = 450) String name,
                               @NotBlank String slug,
                               String description,
                               String couponCode,
+                              int usageLimit,
+                              DiscountType discountType,
+                              ApplyTo applyTo,
+                              UsageType usageType,
                               @Min(0) @Max(100) Long discountPercentage,
                               @Min(0) Long discountAmount,
                               Boolean isActive,

diff --git a/promotion/src/main/java/com/yas/promotion/viewmodel/PromotionVm.java b/promotion/src/main/java/com/yas/promotion/viewmodel/PromotionVm.java
@@ -1,9 +1,10 @@
 package com.yas.promotion.viewmodel;
 
 import com.yas.promotion.model.Promotion;
-import java.time.ZonedDateTime;
 import lombok.Builder;
 
+import java.time.ZonedDateTime;
+
 @Builder
 public record PromotionVm(Long id,
                           String name,

diff --git a/promotion/src/main/resources/db/changelog/ddl/changelog-0002.sql b/promotion/src/main/resources/db/changelog/ddl/changelog-0002.sql
@@ -0,0 +1,37 @@
+--liquibase formatted sql
+
+--changeset nguyenvanhadncntt:issue-981-1
+ALTER TABLE promotion ADD COLUMN discount_type VARCHAR(25) NOT NULL;
+ALTER TABLE promotion ADD COLUMN usage_limit INT;
+ALTER TABLE promotion ADD COLUMN usage_count INT DEFAULT 0 NOT NULL;
+ALTER TABLE promotion ADD COLUMN usage_type VARCHAR(25) DEFAULT 'UNLIMITED' NOT NULL ;
+ALTER TABLE promotion ADD COLUMN apply_to VARCHAR(25) NOT NULL;
+ALTER TABLE promotion ADD COLUMN minimum_order_purchase_amount bigint;
+
+--changeset nguyenvanhadncntt:issue-981-2
+CREATE TABLE promotion_usage (
+    id SERIAL PRIMARY KEY,
+    promotion_id bigint NOT NULL,
+    user_id varchar(255) NOT NULL,
+    order_id bigint NOT NULL ,
+    product_id bigint NOT NULL,
+    created_by varchar(255),
+    created_on timestamp with time zone,
+    last_modified_by varchar(255),
+    last_modified_on timestamp with time zone,
+    foreign key (promotion_id) references promotion(id)
+);
+
+--changeset nguyenvanhadncntt:issue-981-3
+CREATE TABLE promotion_apply (
+    id SERIAL PRIMARY KEY,
+    promotion_id bigint NOT NULL,
+    brand_id bigint,
+    category_id bigint,
+    product_id bigint,
+    created_by varchar(255),
+    created_on timestamp with time zone,
+    last_modified_by varchar(255),
+    last_modified_on timestamp with time zone,
+    foreign key (promotion_id) references promotion(id)
+);