Merge pull request #42 from MARKETFUBY/revert-39-feat/product-detail

Revert "[차소연] 상품 상세 조회 찜 여부 오류 수정"
MARKETFUBY · Nov 26, 2023 · 16691c1 · 16691c1
2 parents 7cc0d7b + 8af74c8
commit 16691c1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/main/java/MARKETFUBY/Product/dto/ProductDetailDto.java b/src/main/java/MARKETFUBY/Product/dto/ProductDetailDto.java
@@ -33,7 +33,7 @@ public class ProductDetailDto {
     private List<ProductInquiryDto> inquiries;
 
     @Builder
-    public ProductDetailDto(Product product, Boolean isLiked, List<String> reviewImages, Integer reviewCount, List<ProductReviewDto> reviews, List<ProductInquiryDto> inquiries){
+    public ProductDetailDto(Product product, List<String> reviewImages, Integer reviewCount, List<ProductReviewDto> reviews, List<ProductInquiryDto> inquiries){
         this.image = product.getImage();
         this.title = product.getTitle();
         this.subtitle = product.getSubtitle();
@@ -48,7 +48,6 @@ public ProductDetailDto(Product product, Boolean isLiked, List<String> reviewIma
         this.info = product.getInfo();
         this.delivery = product.getDelivery();
         this.seller = product.getSeller();
-        this.isLiked = isLiked;
         this.detailInfoImg = product.getDetailInfoImg();
         this.productInfoImg = product.getProductInfoImg();
         this.reviewImages = reviewImages;

diff --git a/src/main/java/MARKETFUBY/Product/service/ProductService.java b/src/main/java/MARKETFUBY/Product/service/ProductService.java
@@ -2,25 +2,22 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import MARKETFUBY.Inquiry.domain.Inquiry;
 import MARKETFUBY.Inquiry.repository.InquiryRepository;
+import MARKETFUBY.Like.domain.Like;
 import MARKETFUBY.Like.repository.LikeRepository;
 import MARKETFUBY.Member.domain.Member;
 import MARKETFUBY.Member.repository.MemberRepository;
 import MARKETFUBY.Product.dto.*;
 import MARKETFUBY.Review.domain.Review;
-import MARKETFUBY.Review.dto.ReviewResponseDto;
 import MARKETFUBY.ReviewHelp.repository.ReviewHelpRepository;
 import MARKETFUBY.ReviewImage.domain.ReviewImage;
 import MARKETFUBY.ReviewImage.repository.ReviewImageRepository;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.persistence.EntityNotFoundException;
-import javax.swing.text.html.Option;
 
 import MARKETFUBY.BigCategory.domain.BigCategory;
 import MARKETFUBY.BigCategory.dto.CategoryDto;
@@ -217,13 +214,11 @@ public SearchDto getSearchList(String sword, Integer sort, Long filters){
 	}
 
 	public ProductDetailDto getProductDetailDto(Product product, Long memberId){
-		Member member = memberRepository.findByMemberId(memberId);
-		Boolean isLiked = likeRepository.existsByMemberAndProduct(member, product);
 		List<String> reviewImages = findReviewImagesByProduct(product);
 		List<ProductReviewDto> reviews = findReviewsByProduct(product, memberId);
 		Integer reviewCount = reviews.size();
 		List<ProductInquiryDto> inquiries = findInquiriesByProduct(product);
-		ProductDetailDto productDetailDto = new ProductDetailDto(product, isLiked, reviewImages, reviewCount, reviews, inquiries);
+		ProductDetailDto productDetailDto = new ProductDetailDto(product, reviewImages, reviewCount, reviews, inquiries);
 		return productDetailDto;
 	}
 
@@ -273,6 +268,27 @@ public List<ProductInquiryDto> findInquiriesByProduct(Product product){
 		});
 		return productInquiryDtos;
 	}
+
+	public LikeProductListResponseDto getLikeProductListDto(Member member){
+		List<LikeProductDto> likeProductDtos = findLikeProductsByMember(member);
+		Integer productNum = likeProductDtos.size();
+		return new LikeProductListResponseDto(productNum, likeProductDtos);
+	}
+
+	public List<LikeProductDto> findLikeProductsByMember(Member member){
+		List<Like> likeList = likeRepository.findAllByMember(member);
+		List<Product> likeProducts = new ArrayList<>();
+		List<LikeProductDto> likeProductDtos = new ArrayList<>();
+		likeList.forEach(like -> {
+			Product product = like.getProduct();
+			likeProducts.add(product);
+		});
+		likeProducts.forEach(product -> {
+			LikeProductDto likeProductDto = LikeProductDto.from(product);
+			likeProductDtos.add(likeProductDto);
+		});
+		return likeProductDtos;
+	}
 
     // 찜하기에서 사용
     @Transactional(readOnly = true)