Revert "Revert "상품주문로직 추가""

This reverts commit aec250b.

Author: jinmyeong-heo

sample/build.gradle

@@ -26,6 +26,7 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.apache.commons:commons-collections4:4.4'
 	implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
 	implementation group: 'commons-io', name: 'commons-io', version: '2.18.0'
 	implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1'

sample/src/main/java/com/temp/sample/consts/LegacyEnum.java renamed to sample/src/main/java/com/temp/sample/consts/CommEnum.java

@@ -2,11 +2,11 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-public interface LegacyEnum {
+public interface CommEnum {
 
     String getCode();
 
-    static <E extends Enum<E> & LegacyEnum> E of(E[] values, String code) {
+    static <E extends Enum<E> & CommEnum> E of(E[] values, String code) {
         for (E e : values) {
             if (StringUtils.equals(code,e.getCode())) {
                 return e;

sample/src/main/java/com/temp/sample/consts/OrderStatus.java

@@ -5,7 +5,7 @@
 
 @Getter
 @RequiredArgsConstructor
-public enum OrderStatus implements LegacyEnum{
+public enum OrderStatus implements CommEnum {
 
     APPLY("0", "주문접수"),
     APPROVAL("1", "주문승인"),
@@ -20,7 +20,7 @@ public enum OrderStatus implements LegacyEnum{
     private final String desc;
 
     public static OrderStatus of(String code) {
-        return LegacyEnum.of(values(), code);
+        return CommEnum.of(values(), code);
     }
 
 

sample/src/main/java/com/temp/sample/consts/ShipmentStatus.java

@@ -0,0 +1,8 @@
+package com.temp.sample.dao;
+
+import com.temp.sample.entity.Merchant;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MerchantRepository extends JpaRepository<Merchant, Long> {
+
+}

sample/src/main/java/com/temp/sample/dao/InventoryRepository.java

@@ -1,8 +1,17 @@
 package com.temp.sample.dao;
 
 import com.temp.sample.entity.Product;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface ProductRepository extends JpaRepository<Product, Long> {
 
+  @Query("SELECT p FROM Product p WHERE p.stock > 0 AND p.id IN :productIds")
+  List<Product> findInStocks(@Param("productIds") List<Long> productIds);
+
+  List<Product> findByIdIn(List<Long> productIds);
 }

sample/src/main/java/com/temp/sample/dao/MerchantRepository.java

@@ -24,4 +24,11 @@ public static Merchant createMerchant(String name) {
         merchant.name = name;
         return merchant;
     }
+
+    public static Merchant createMockMerchant(Long id, String name) {
+        Merchant merchant = new Merchant();
+        merchant.merchantId = id;
+        merchant.name = name;
+        return merchant;
+    }
 }

sample/src/main/java/com/temp/sample/dao/ProductRepository.java

@@ -1,6 +1,8 @@
 package com.temp.sample.entity;
 
+import com.temp.sample.consts.OrderStatus;
 import com.temp.sample.entity.com.TimestampEntity;
+import com.temp.sample.entity.com.converter.OrderStatusConverter;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -17,36 +19,38 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class OrderInfo {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
 
-    private String orderNumber;
+  @OneToMany(mappedBy = "order")
+  private List<OrderItem> orderItems;
 
-    @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<OrderItem> orderItems;
+  @ManyToOne
+  @JoinColumn(name = "merchant_id")
+  private Merchant merchant;
 
-    @ManyToOne
-    private Merchant merchant;
+  @ManyToOne
+  private User user;
 
-    @ManyToOne
-    private User user;
+  private BigDecimal amount = BigDecimal.ZERO;
 
-    private BigDecimal amount = BigDecimal.ZERO;
+  private OrderStatus status;
 
-    @Embedded
-    private TimestampEntity timestamp;
+  @Embedded
+  private TimestampEntity timestamp;
 
-    public static OrderInfo createOrder(String orderNumber, Merchant merchant, User user, BigDecimal amount) {
+  public static OrderInfo createOrder(List<OrderItem> orderItems, Merchant merchant, User user,
+      BigDecimal amount) {
 
-        OrderInfo orderInfo = new OrderInfo();
+    OrderInfo orderInfo = new OrderInfo();
 
-        orderInfo.orderNumber = orderNumber;
-        orderInfo.merchant = merchant;
-        orderInfo.user = user;
-        orderInfo.amount = amount;
-        return orderInfo;
+    orderInfo.orderItems = orderItems;
+    orderInfo.merchant = merchant;
+    orderInfo.user = user;
+    orderInfo.amount = amount;
+    return orderInfo;
 
-    }
+  }
 
 }

sample/src/main/java/com/temp/sample/entity/Financial.java

@@ -1,6 +1,7 @@
 package com.temp.sample.entity;
 
 import jakarta.persistence.*;
+import java.math.BigDecimal;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -14,21 +15,30 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class OrderItem {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
 
-    @ManyToOne
-    @JoinColumn(name = "order_id", nullable = false)
-    private OrderInfo orderInfo;
+  @ManyToOne
+  @JoinColumn(name = "order_id")
+  private OrderInfo order;
 
-    @ManyToOne
-    @JoinColumn(name = "product_id", nullable = false)
-    private Product product;
+  @ManyToOne
+  @JoinColumn(name = "product_id")
+  private Product product;
 
-    private int quantity;
+  private Integer quantity;
 
-    private int totalPrice;
+  private BigDecimal totalPrice;
 
 
+  public static OrderItem createOrderItem( Product product, int quantity,
+      BigDecimal totalPrice) {
+    OrderItem orderItem = new OrderItem();
+    orderItem.product = product;
+    orderItem.quantity = quantity;
+    orderItem.totalPrice = totalPrice;
+
+    return orderItem;
+  }
 }

sample/src/main/java/com/temp/sample/entity/Inventory.java

@@ -1,16 +1,19 @@
 package com.temp.sample.entity;
 
-import jakarta.persistence.*;
-import jdk.jfr.Enabled;
+import com.temp.sample.entity.com.TimestampEntity;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
 @Table(name = "product")
 @Getter
 @Entity
@@ -24,7 +27,40 @@ public class Product {
 
     private String name;
 
-    private int price;
+    private BigDecimal price;
+
+    private BigDecimal discountPrice;
+
+    private Integer stock;
+
+    private LocalDateTime timeDealStartTime;
+
+    private LocalDateTime timeDealEndTime;
+
+    @Embedded
+    private TimestampEntity timestamp;
+
+    public static Product createProduct(String name, BigDecimal price, Integer stock) {
+        Product product = new Product();
+        product.name = name;
+        product.price = price;
+        product.stock = stock;
+        return product;
+    }
+
+    public static Product createMockProduct(Long id, String name, BigDecimal price, Integer stock) {
+        Product product = new Product();
+        product.id = id;
+        product.name = name;
+        product.price = price;
+        product.stock = stock;
+        return product;
+    }
 
-    private LocalDateTime createdAt;
+    public void decreaseStock(int quantity) {
+        if (this.stock < quantity) {
+            throw new RuntimeException("재고 부족");
+        }
+        this.stock -= quantity;
+    }
 }

sample/src/main/java/com/temp/sample/entity/Merchant.java

@@ -20,7 +20,4 @@ public class Shipment {
 
     private String trackingNumber;
 
-    @Enumerated(EnumType.STRING)
-    @Column(nullable = false)
-    private ShipmentStatus status;
 }

sample/src/main/java/com/temp/sample/entity/OrderInfo.java

@@ -3,15 +3,11 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import jdk.jfr.Enabled;
+import java.time.LocalDateTime;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.springframework.jdbc.support.CustomSQLErrorCodesTranslation;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 @Table(name = "user")
 @Getter
@@ -35,4 +31,13 @@ public static User createUser(String email, String password, String phoneNumber)
         user.phoneNumber = phoneNumber;
         return user;
     }
+
+    public static User createMockUser(Long id,String email, String password, String phoneNumber) {
+        User user = new User();
+        user.id = id;
+        user.email = email;
+        user.password = password;
+        user.phoneNumber = phoneNumber;
+        return user;
+    }
 }

sample/src/main/java/com/temp/sample/entity/OrderItem.java

@@ -0,0 +1,22 @@
+package com.temp.sample.entity.com.converter;
+
+import com.temp.sample.consts.OrderStatus;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class OrderStatusConverter implements AttributeConverter<OrderStatus, String> {
+
+  @Override
+  public String convertToDatabaseColumn(OrderStatus orderStatus) {
+    if (orderStatus == null) {
+      return null;
+    }
+    return orderStatus.getCode();
+  }
+
+  @Override
+  public OrderStatus convertToEntityAttribute(String code) {
+    return OrderStatus.of(code);
+  }
+}