#1198-update-the-order-checkout-payment-tables

order/src/main/java/com/yas/order/mapper/CheckoutMapper.java

@@ -14,17 +14,15 @@
 @Component
 public interface CheckoutMapper {
     @Mapping(target = "id", ignore = true)
-    @Mapping(target = "checkoutId", ignore = true)
+    @Mapping(target = "checkout", ignore = true)
     CheckoutItem toModel(CheckoutItemPostVm checkoutItemPostVm);
 
     @Mapping(target = "id", ignore = true)
     @Mapping(target = "checkoutState", ignore = true)
-    @Mapping(target = "checkoutItem", source = "checkoutItemPostVms")
     Checkout toModel(CheckoutPostVm checkoutPostVm);
 
-    @Mapping(target = "checkoutId", source = "checkoutId.id")
     CheckoutItemVm toVm(CheckoutItem checkoutItem);
 
-    @Mapping(target = "checkoutItemVms", source = "checkoutItem")
+    @Mapping(target = "checkoutItemVms", ignore = true)
     CheckoutVm toVm(Checkout checkout);
 }

order/src/main/java/com/yas/order/model/Checkout.java

@@ -1,20 +1,20 @@
 package com.yas.order.model;
 
 import com.yas.order.model.enumeration.CheckoutState;
-import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-import java.util.Set;
+import java.math.BigDecimal;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 @Entity
 @Table(name = "checkout")
@@ -24,15 +24,59 @@
 @AllArgsConstructor
 @Builder
 public class Checkout extends AbstractAuditEntity {
+
     @Id
     private String id;
+
     private String email;
+
     private String note;
+
+    @Column(name = "promotion_code")
     private String couponCode;
+
+    @Column(name = "status")
     @Enumerated(EnumType.STRING)
     private CheckoutState checkoutState;
 
-    @OneToMany(mappedBy = "checkoutId", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    private Set<CheckoutItem> checkoutItem;
+    @SuppressWarnings("unused")
+    private String progress;
+
+    @SuppressWarnings("unused")
+    private Long customerId;
+
+    @SuppressWarnings("unused")
+    private String shipmentMethodId;
+
+    @SuppressWarnings("unused")
+    private String paymentMethodId;
+
+    @SuppressWarnings("unused")
+    private Long shippingAddressId;
+
+    @SuppressWarnings("unused")
+    @JdbcTypeCode(SqlTypes.JSON)
+    @Column(name = "last_error", columnDefinition = "jsonb")
+    private String lastError;
+
+    @SuppressWarnings("unused")
+    @JdbcTypeCode(SqlTypes.JSON)
+    @Column(name = "attributes", columnDefinition = "jsonb")
+    private String attributes;
+
+    @SuppressWarnings("unused")
+    private BigDecimal totalAmount;
+
+    @SuppressWarnings("unused")
+    private BigDecimal totalShipmentFee;
+
+    @SuppressWarnings("unused")
+    private BigDecimal totalShipmentTax;
+
+    @SuppressWarnings("unused")
+    private BigDecimal totalTax;
+
+    @SuppressWarnings("unused")
+    private BigDecimal totalDiscountAmount;
 
 }

order/src/main/java/com/yas/order/model/CheckoutItem.java

@@ -1,5 +1,6 @@
 package com.yas.order.model;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
@@ -22,19 +23,43 @@
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class CheckoutItem {
+public class CheckoutItem extends AbstractAuditEntity {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     private Long productId;
+
+    @Column(name = "checkout_id")
+    private String checkoutId;
+
+    @Column(name = "name")
     private String productName;
+
     private int quantity;
+
+    @Column(name = "price")
     private BigDecimal productPrice;
+
+    @Column(name = "description")
     private String note;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "checkout_id", insertable = false, updatable = false)
+    private Checkout checkout;
+
     private BigDecimal discountAmount;
+
+    @Column(name = "tax")
     private BigDecimal taxAmount;
+
     private BigDecimal taxPercent;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "checkoutId", referencedColumnName = "id")
-    private Checkout checkoutId;
+
+    @SuppressWarnings("unused")
+    private BigDecimal shipmentTax;
+
+    @SuppressWarnings("unused")
+    private BigDecimal shipmentFee;
+
 }

order/src/main/java/com/yas/order/model/Order.java

@@ -6,6 +6,7 @@
 import com.yas.order.model.enumeration.OrderStatus;
 import com.yas.order.model.enumeration.PaymentStatus;
 import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -24,6 +25,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 @Entity
 @Table(name = "`order`")
@@ -33,35 +36,84 @@
 @AllArgsConstructor
 @Builder
 public class Order extends AbstractAuditEntity {
+
     @OneToMany(mappedBy = "orderId", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     Set<OrderItem> orderItems;
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     private String email;
+
     @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinColumn(name = "shipping_address_id", referencedColumnName = "id")
     private OrderAddress shippingAddressId;
+
     @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinColumn(name = "billing_address_id", referencedColumnName = "id")
     private OrderAddress billingAddressId;
+
     private String note;
+
+    @Column(name = "total_tax")
     private float tax;
+
+    @Column(name = "total_discount_amount")
     private float discount;
+
     private int numberItem;
+
+    @Column(name = "promotion_code")
     private String couponCode;
+
+    @Column(name = "total_amount")
     private BigDecimal totalPrice;
+
+    @Column(name = "total_shipment_fee")
     private BigDecimal deliveryFee;
     @Enumerated(EnumType.STRING)
+
+    @Column(name = "status")
     private OrderStatus orderStatus;
+
+    @Column(name = "shipment_method_id")
     @Enumerated(EnumType.STRING)
     private DeliveryMethod deliveryMethod;
+
+    @Column(name = "shipment_status")
     @Enumerated(EnumType.STRING)
     private DeliveryStatus deliveryStatus;
+
     @Enumerated(EnumType.STRING)
     private PaymentStatus paymentStatus;
+
     private Long paymentId;
+
     private String checkoutId;
+
     private String rejectReason;
 
+    @SuppressWarnings("unused")
+    private String paymentMethodId;
+
+    @SuppressWarnings("unused")
+    private String progress;
+
+    @SuppressWarnings("unused")
+    private Long customerId;
+
+    @SuppressWarnings("unused")
+    @JdbcTypeCode(SqlTypes.JSON)
+    @Column(name = "last_error", columnDefinition = "jsonb")
+    private String lastError;
+
+    @SuppressWarnings("unused")
+    @JdbcTypeCode(SqlTypes.JSON)
+    @Column(name = "attributes", columnDefinition = "jsonb")
+    private String attributes;
+
+    @SuppressWarnings("unused")
+    private BigDecimal totalShipmentTax;
+
 }

order/src/main/java/com/yas/order/model/OrderItem.java

@@ -1,5 +1,6 @@
 package com.yas.order.model;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
@@ -14,6 +15,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 @Entity
 @Table(name = "order_item")
@@ -22,19 +25,45 @@
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class OrderItem {
+public class OrderItem extends AbstractAuditEntity {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     private Long productId;
+
+    @Column(name = "name")
     private String productName;
+
     private int quantity;
+
+    @Column(name = "price")
     private BigDecimal productPrice;
+
+    @Column(name = "description")
     private String note;
+
     private BigDecimal discountAmount;
+
     private BigDecimal taxAmount;
+
     private BigDecimal taxPercent;
 
+    @SuppressWarnings("unused")
+    private BigDecimal shipmentFee;
+
+    @SuppressWarnings("unused")
+    private String status;
+
+    @SuppressWarnings("unused")
+    private BigDecimal shipmentTax;
+
+    @SuppressWarnings("unused")
+    @JdbcTypeCode(SqlTypes.JSON)
+    @Column(name = "processing_state", columnDefinition = "jsonb")
+    private String processingState;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "orderId", referencedColumnName = "id")
     private Order orderId;

order/src/main/java/com/yas/order/repository/CheckoutItemRepository.java

@@ -1,9 +1,12 @@
 package com.yas.order.repository;
 
 import com.yas.order.model.CheckoutItem;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface CheckoutItemRepository extends JpaRepository<CheckoutItem, Long> {
+
+    List<CheckoutItem> findAllByCheckoutId(String checkoutId);
 }