Merge pull request #165 from Kek-i/feature/7-desserts-getDessert

Kek-i · Mar 6, 2023 · d2c2dad · d2c2dad
2 parents f451835 + d4d6e9d
commit d2c2dad
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java b/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java
@@ -16,6 +16,7 @@ public class GetDessertRes {
     private Integer dessertPrice;
     private String dessertDescription;
     private List<Image> images;
+    private List<Option> options;
 
     @Getter
     @AllArgsConstructor
@@ -24,4 +25,12 @@ public static class Image {
         private Long imgIdx;
         private String imgUrl;
     }
+
+    @Getter
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Option {
+        private String optionDescription;
+        private Integer optionPrice;
+    }
 }
diff --git a/src/main/java/com/codepatissier/keki/dessert/entity/Option.java b/src/main/java/com/codepatissier/keki/dessert/entity/Option.java
@@ -1,5 +1,6 @@
 package com.codepatissier.keki.dessert.entity;
 
+import com.codepatissier.keki.common.BaseEntity;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
@@ -11,7 +12,7 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
-public class Option {
+public class Option extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long optionIdx;
@@ -24,5 +25,5 @@ public class Option {
     private String description;
 
     @Column(nullable = false)
-    private int price;
+    private Integer 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
@@ -0,0 +1,13 @@
+package com.codepatissier.keki.dessert.repository;
+
+import com.codepatissier.keki.dessert.entity.Dessert;
+import com.codepatissier.keki.dessert.entity.Option;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface OptionRepository extends JpaRepository<Option, Long> {
+    List<Option> findByDessertAndStatusOrderByOptionIdx(Dessert dessert, 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
@@ -5,6 +5,7 @@
 import com.codepatissier.keki.dessert.dto.*;
 import com.codepatissier.keki.dessert.entity.Dessert;
 import com.codepatissier.keki.dessert.repository.DessertRepository;
+import com.codepatissier.keki.dessert.repository.OptionRepository;
 import com.codepatissier.keki.post.entity.PostImg;
 import com.codepatissier.keki.post.repository.PostRepository;
 import com.codepatissier.keki.store.entity.Store;
@@ -29,6 +30,7 @@ public class DessertService {
     private final StoreRepository storeRepository;
     private final PostRepository postRepository;
     private final UserRepository userRepository;
+    private final OptionRepository optionRepository;
 
     /**
      * 상품 전체 조회
@@ -85,8 +87,10 @@ public GetDessertRes getDessert(Long dessertIdx) throws BaseException {
             ArrayList<GetDessertRes.Image> postImgList = getPostImgList(dessert);
             imgList.addAll(postImgList);
 
-            // nickname, dessertName, dessertPrice, dessertDescription, imgList(상품 상세 이미지 1장, 피드 이미지 4장)
-            return new GetDessertRes(dessert.getStore().getUser().getNickname(), dessert.getDessertName(), dessert.getDessertPrice(), dessert.getDessertDescription(), imgList);
+            List<GetDessertRes.Option> optionList = getOptionList(dessert);
+
+            // nickname, dessertName, dessertPrice, dessertDescription, imgList(상품 상세 이미지 1장, 피드 이미지 4장), description, price
+            return new GetDessertRes(dessert.getStore().getUser().getNickname(), dessert.getDessertName(), dessert.getDessertPrice(), dessert.getDessertDescription(), imgList, optionList);
         } catch (BaseException e) {
             throw e;
         } catch (Exception e) {
@@ -109,6 +113,11 @@ private String representPostImgUrl(List<PostImg> postImages){
         return postImages.isEmpty() ? null : postImages.get(0).getImgUrl();
     }
 
+    private List<GetDessertRes.Option> getOptionList(Dessert dessert) {
+        return optionRepository.findByDessertAndStatusOrderByOptionIdx(dessert, ACTIVE_STATUS).stream()
+                .map(option -> new GetDessertRes.Option(option.getDescription(), option.getPrice())).collect(Collectors.toList());
+    }
+
     /**
      * [판매자] 상품 등록
      * 상품 이름, 가격, 소개, 이미지(1장)