Merge branch 'main' into feat/#21

Author: frombunny

src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java

@@ -30,6 +30,7 @@ public class Menu extends BaseEntity {
     @Column(name = "sale_price", nullable = false)
     private int salePrice;
 
+    @Setter
     @Column(nullable = false)
     private int quantity;
 

src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java

@@ -7,7 +7,9 @@
 @Getter
 @AllArgsConstructor
 public enum MenuErrorCode implements BaseResponseCode {
-    MENU_NOT_FOUND("MENU_NOT_FOUND_404_1",404,"존재하지 않는 메뉴 입니다.");
+    MENU_EXPIRED("MENU_400_1", 400, "판매 마감된 메뉴입니다."),
+    MENU_OUT_OF_STOCK("MENU_400_2", 400, "재고가 부족합니다."),
+    MENU_NOT_FOUND("MENU_404_1",404,"존재하지 않는 메뉴 입니다.");
 
     private final String code;
     private final int httpStatus;

src/main/java/com/example/Centralthon/domain/menu/exception/MenuExpiredException.java

@@ -0,0 +1,7 @@
+package com.example.Centralthon.domain.menu.exception;
+
+import com.example.Centralthon.global.exception.BaseException;
+
+public class MenuExpiredException extends BaseException {
+    public MenuExpiredException() {super(MenuErrorCode.MENU_EXPIRED);}
+}

src/main/java/com/example/Centralthon/domain/menu/exception/MenuOutOfStockException.java

@@ -0,0 +1,7 @@
+package com.example.Centralthon.domain.menu.exception;
+
+import com.example.Centralthon.global.exception.BaseException;
+
+public class MenuOutOfStockException extends BaseException {
+    public MenuOutOfStockException() {super(MenuErrorCode.MENU_OUT_OF_STOCK);}
+}

src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java

@@ -6,6 +6,7 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collection;
 import java.util.List;
 import java.time.LocalDateTime;
 @Repository
@@ -38,4 +39,10 @@ List<Menu> findByStoreId(
             @Param("storeId") Long storeId,
             @Param("now") LocalDateTime now);
 
+    /**
+     * ids에 포함된 Menu와 연관된 Store를 한번에 가져옴
+     */
+    @Query(value = "SELECT m from Menu m join fetch m.store where m.id in :ids")
+    List<Menu> findAllByIdWithStore(@Param("ids") Collection<Long> ids);
+
 }

src/main/java/com/example/Centralthon/domain/order/entity/Order.java

@@ -33,4 +33,8 @@ public static Order toEntity(String pickUpCode, int price){
                 .pickedUp(false)
                 .build();
     }
+
+    public void completeOrder(){
+        this.pickedUp = true;
+    }
 }

src/main/java/com/example/Centralthon/domain/order/exception/CodeNotCreatedException.java

@@ -0,0 +1,9 @@
+package com.example.Centralthon.domain.order.exception;
+
+import com.example.Centralthon.global.exception.BaseException;
+
+public class OrderCodeNotCreatedException extends BaseException {
+    public OrderCodeNotCreatedException() {
+        super(OrderErrorCode.ORDER_CODE_NOT_CREATED);
+    }
+}

src/main/java/com/example/Centralthon/domain/order/exception/OrderCodeNotCreatedException.java

@@ -7,7 +7,9 @@
 @Getter
 @AllArgsConstructor
 public enum OrderErrorCode implements BaseResponseCode {
-    CODE_NOT_CREATED("ORDER_500_1",500,"서버에서 유일한 픽업 코드를 생성하지 못했습니다.");
+    ORDER_EXPIRED("ORDER_400_1", 400, "만료된 주문입니다."),
+    ORDER_NOT_FOUND("ORDER_404_1", 404, "존재하지 않는 주문입니다."),
+    ORDER_CODE_NOT_CREATED("ORDER_500_1",500,"서버에서 유일한 픽업 코드를 생성하지 못했습니다.");
 
     private final String code;
     private final int httpStatus;

src/main/java/com/example/Centralthon/domain/order/exception/OrderErrorCode.java

@@ -0,0 +1,9 @@
+package com.example.Centralthon.domain.order.exception;
+
+import com.example.Centralthon.global.exception.BaseException;
+
+public class OrderExpiredException extends BaseException {
+    public OrderExpiredException() {
+        super(OrderErrorCode.ORDER_EXPIRED);
+    }
+}