From 16b8aa719826a75d7e7770019cb8a70f65ff033b Mon Sep 17 00:00:00 2001
From: joonghyun <joongh@ewhain.net>
Date: Tue, 14 Mar 2023 17:09:05 +0900
Subject: [PATCH 1/2] =?UTF-8?q?#160=20feat:=20[=ED=8C=90=EB=A7=A4=EC=9E=90?=
 =?UTF-8?q?]=20=EC=83=81=ED=92=88=20=EC=88=98=EC=A0=95=20API=EC=97=90=20?=
 =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=98=B5=EC=85=98=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../keki/common/BaseResponseStatus.java       |  9 +++++
 .../keki/dessert/dto/OptionDTO.java           |  3 +-
 .../keki/dessert/dto/PatchDessertReq.java     |  5 +++
 .../keki/dessert/dto/PostDessertReq.java      | 13 ++++++-
 .../keki/dessert/entity/Option.java           |  8 +++++
 .../dessert/repository/OptionRepository.java  |  2 ++
 .../keki/dessert/service/DessertService.java  | 35 ++++++++++++++++---
 7 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java b/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
index b471396..b5fcc2e 100644
--- a/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
+++ b/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
@@ -53,6 +53,10 @@ public enum BaseResponseStatus {
     INVALID_DESERT_PRICE(false, 3303, "디저트 가격은 0원 이상이어야 합니다."),
     NULL_DESSERT_DESCRIPTION(false, 3304, "디저트 설명을 입력해주세요."),
     DELETED_DESSERT(false, 3305, "이미 삭제된 디저트입니다."),
+    NULL_OPTION(false, 3306, "옵션을 입력해주세요."),
+    NULL_OPTION_IDX(false, 3307, "optionIdx를 입력해주세요."),
+    NULL_OPTION_DESCRIPTION(false, 3308, "옵션명을 입력해주세요."),
+    NULL_OPTION_PRICE(false, 3309, "옵션 가격을 입력해주세요."),
 
     // calendars(2400~2499)
     NULL_TITLE(false, 2400, "캘린더 제목을 입력해주세요."),
@@ -66,6 +70,8 @@ public enum BaseResponseStatus {
     NULL_ORDER_IDX(false, 2700, "주문 아이디를 입력해주세요."),
     NULL_ORDER_STATUS(false, 2701, "주문 상태를 선택해주세요."),
 
+    // option(2800~2899)
+
 
     /**
      *  3000: Response 오류
@@ -110,6 +116,9 @@ public enum BaseResponseStatus {
     NO_MATCH_ORDER_STATUS(false, 3702, "가능한 주문 상태가 아닙니다."),
     INVALID_ORDER_STATUS(false, 3703, "존재하지 않는 주문 상태 입니다."),
 
+    // option(3800~3899)
+    INVALID_OPTION_IDX(false, 3800, "존재하지 않는 옵션입니다."),
+
     /**
      * 4000: DB, Server 오류
      */
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java b/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java
index 78924aa..d2d9874 100644
--- a/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java
@@ -8,6 +8,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class OptionDTO {
+    private Long optionIdx;
     private String optionDescription;
     private Integer optionPrice;
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/PatchDessertReq.java b/src/main/java/com/codepatissier/keki/dessert/dto/PatchDessertReq.java
index 743355f..dc1f378 100644
--- a/src/main/java/com/codepatissier/keki/dessert/dto/PatchDessertReq.java
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/PatchDessertReq.java
@@ -1,11 +1,16 @@
 package com.codepatissier.keki.dessert.dto;
 
 import lombok.Data;
+import lombok.Getter;
+
+import java.util.List;
 
 @Data
+@Getter
 public class PatchDessertReq {
     private String dessertImg;
     private String dessertName;
     private Integer dessertPrice;
     private String dessertDescription;
+    private List<OptionDTO> options;
 }
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/PostDessertReq.java b/src/main/java/com/codepatissier/keki/dessert/dto/PostDessertReq.java
index c6eeb73..ab30e4a 100644
--- a/src/main/java/com/codepatissier/keki/dessert/dto/PostDessertReq.java
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/PostDessertReq.java
@@ -1,6 +1,9 @@
 package com.codepatissier.keki.dessert.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -18,5 +21,13 @@ public class PostDessertReq {
     private String dessertDescription;
     @NotBlank(message = "디저트 이미지는 필수 항목입니다.")
     private String dessertImg;
-    private List<OptionDTO> options;
+    private List<Option> options;
+
+    @Getter
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Option {
+        private String optionDescription;
+        private Integer optionPrice;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/dessert/entity/Option.java b/src/main/java/com/codepatissier/keki/dessert/entity/Option.java
index b910bfc..8f1ad87 100644
--- a/src/main/java/com/codepatissier/keki/dessert/entity/Option.java
+++ b/src/main/java/com/codepatissier/keki/dessert/entity/Option.java
@@ -35,4 +35,12 @@ public Option(Dessert dessert, String description, Integer price) {
         this.description = description;
         this.price = price;
     }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setPrice(Integer price) {
+        this.price = price;
+    }
 }
diff --git a/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java b/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java
index af47ef7..9008996 100644
--- a/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java
+++ b/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java
@@ -6,8 +6,10 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface OptionRepository extends JpaRepository<Option, Long> {
     List<Option> findByDessertAndStatusOrderByOptionIdx(Dessert dessert, String activeStatus);
+    Optional<Option> findByOptionIdxAndStatus(Long optionIdx, String activeStatus);
 }
diff --git a/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java b/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java
index a90bcfe..be83916 100644
--- a/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java
+++ b/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java
@@ -117,7 +117,7 @@ private String representPostImgUrl(List<PostImg> postImages){
 
     private List<OptionDTO> getOptionList(Dessert dessert) {
         return optionRepository.findByDessertAndStatusOrderByOptionIdx(dessert, ACTIVE_STATUS).stream()
-                .map(option -> new OptionDTO(option.getDescription(), option.getPrice())).collect(Collectors.toList());
+                .map(option -> new OptionDTO(option.getOptionIdx(), option.getDescription(), option.getPrice())).collect(Collectors.toList());
     }
 
     /**
@@ -141,7 +141,7 @@ public void addDessert(Long userIdx, PostDessertReq postDessertReq) throws BaseE
                     .build();
             dessertRepository.save(dessert);
 
-            for(OptionDTO option : postDessertReq.getOptions())
+            for(PostDessertReq.Option option : postDessertReq.getOptions())
                 saveOption(option, dessert);
         } catch (BaseException e) {
             throw e;
@@ -150,7 +150,7 @@ public void addDessert(Long userIdx, PostDessertReq postDessertReq) throws BaseE
         }
     }
 
-    private void saveOption(OptionDTO optionDTO, Dessert dessert) throws BaseException {
+    private void saveOption(PostDessertReq.Option optionDTO, Dessert dessert) throws BaseException {
         try {
             Option option = Option.builder()
                     .dessert(dessert)
@@ -182,10 +182,11 @@ public void deleteDessert(Long userIdx, Long dessertIdx) throws BaseException {
      * [판매자] 상품 수정
      * 상품 이미지, 이름, 가격, 소개
      */
+    @Transactional(rollbackFor = Exception.class)
     public void modifyDessert(PatchDessertReq patchDessertReq, Long dessertIdx, Long userIdx) throws BaseException {
         try {
             checkStore(userIdx);
-            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
+            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx,ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
 
             if (patchDessertReq.getDessertImg() != null) {
                 if (!patchDessertReq.getDessertImg().equals("") && !patchDessertReq.getDessertImg().equals(" "))
@@ -210,6 +211,32 @@ public void modifyDessert(PatchDessertReq patchDessertReq, Long dessertIdx, Long
                     dessert.setDessertDescription(patchDessertReq.getDessertDescription());
                 else throw new BaseException(NULL_DESSERT_DESCRIPTION);
             }
+
+            if (!patchDessertReq.getOptions().isEmpty() && !(patchDessertReq.getOptions() == null)) {
+                for (OptionDTO optionDTO : patchDessertReq.getOptions()) {
+                    if(optionDTO.getOptionIdx() == null)
+                        throw new BaseException(NULL_OPTION_IDX);
+                    if(optionDTO.getOptionDescription() == null)
+                        throw new BaseException(NULL_OPTION_DESCRIPTION);
+                    if(optionDTO.getOptionPrice() == null)
+                        throw new BaseException(NULL_OPTION_PRICE);
+                }
+
+                List<Long> optionIdxList = new ArrayList<>();
+                for (OptionDTO optionDTO : patchDessertReq.getOptions()) {
+                    optionIdxList.add(optionDTO.getOptionIdx());
+                }
+
+                for (Long optionIdx : optionIdxList) {
+                    Option option = optionRepository.findByOptionIdxAndStatus(optionIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_OPTION_IDX));
+
+                    for(OptionDTO modifiedOption : patchDessertReq.getOptions()) {
+                        option.setDescription(modifiedOption.getOptionDescription());
+                        option.setPrice(modifiedOption.getOptionPrice());
+                    }
+                    optionRepository.save(option);
+                }
+            }
             dessertRepository.save(dessert);
         } catch (BaseException e) {
             throw e;

From 7e46c3f67334a248ed0c27e5f0dd861f51a271d3 Mon Sep 17 00:00:00 2001
From: joonghyun <joongh@ewhain.net>
Date: Tue, 14 Mar 2023 18:37:28 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20BaseResponseStatus=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20option=20=EA=B4=80=EB=A0=A8=20dessert=EB=A1=9C=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/codepatissier/keki/common/BaseResponseStatus.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java b/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
index b5fcc2e..f61b040 100644
--- a/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
+++ b/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
@@ -70,8 +70,6 @@ public enum BaseResponseStatus {
     NULL_ORDER_IDX(false, 2700, "주문 아이디를 입력해주세요."),
     NULL_ORDER_STATUS(false, 2701, "주문 상태를 선택해주세요."),
 
-    // option(2800~2899)
-
 
     /**
      *  3000: Response 오류
@@ -93,6 +91,7 @@ public enum BaseResponseStatus {
 
     // desserts(3300~3399)
     INVALID_DESSERT_IDX(false, 3300, "존재하지 않는 디저트입니다."),
+    INVALID_OPTION_IDX(false, 3301, "존재하지 않는 옵션입니다."),
 
     // calendars(3400~3499)
     INVALID_CALENDAR_TAG(false, 3400, "캘린더 TAG를 찾을 수 없습니다."),
@@ -116,9 +115,6 @@ public enum BaseResponseStatus {
     NO_MATCH_ORDER_STATUS(false, 3702, "가능한 주문 상태가 아닙니다."),
     INVALID_ORDER_STATUS(false, 3703, "존재하지 않는 주문 상태 입니다."),
 
-    // option(3800~3899)
-    INVALID_OPTION_IDX(false, 3800, "존재하지 않는 옵션입니다."),
-
     /**
      * 4000: DB, Server 오류
      */