Merge pull request #55 from UMC-neoul/develop

상품찜 관련 코드 수정
UMC-neoul · Aug 21, 2023 · 2a27990 · 2a27990
2 parents ada0ac1 + 2c180b9
commit 2a27990
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/main/java/com/example/neoul/controller/MyController.java b/src/main/java/com/example/neoul/controller/MyController.java
@@ -52,15 +52,15 @@ public ApiResponse<BrandRes.getLikedBrandRes> getUserLikedBrand(){
     @PatchMapping("/product/like/{productId}")
     public ApiResponse<String> likeProduct(@PathVariable("productId") Long productId){
         productService.likeProduct(productId);
-        return new ApiResponse("브랜드를 찜했습니다");
+        return new ApiResponse("상품을 찜했습니다");
     }
 
 
     @ApiOperation(value = "상품 찜 취소하기", notes = "상품 찜 취소하기")
     @PatchMapping("/product/dislike/{productId}")
     public ApiResponse<String> deleteLikedProduct(@PathVariable("productId") Long productId){
         productService.deleteLikedProduct(productId);
-        return new ApiResponse("브랜드 찜이 취소가 되었습니다");
+        return new ApiResponse("상품 찜이 취소가 되었습니다");
     }
 
 

diff --git a/src/main/java/com/example/neoul/service/ProductService.java b/src/main/java/com/example/neoul/service/ProductService.java
@@ -118,9 +118,22 @@ public ProductRes.getLikedProductRes getUserLikedProduct() {
         List<ProductRes.LikedProductList> list = new ArrayList<>();
 
         for(UserLikedProduct userLikedProduct : userLikedProductList){
+            List<ProductImage> images = productImageRepository.findAllByProduct(userLikedProduct.getProduct());
+            List<String> productImgList = new ArrayList<>();
+
+            for(ProductImage productImage : images){
+                productImgList.add(productImage.getUrl());
+            }
+
             ProductRes.LikedProductList e = ProductRes.LikedProductList.builder()
                     .productId(userLikedProduct.getProduct().getId())
                     .productName(userLikedProduct.getProduct().getName())
+                    .productImgList(productImgList)
+                    .brandId(userLikedProduct.getProduct().getBrand().getId())
+                    .brandName(userLikedProduct.getProduct().getBrand().getName())
+                    .price(userLikedProduct.getProduct().getPrice())
+                    .discountedRatio(userLikedProduct.getProduct().getDiscountedRatio())
+                    .discountedSalePrice(userLikedProduct.getProduct().getDiscountedSalePrice())
                     .build();
             list.add(e);
         }