Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

리뷰 이미지 조회 버그 수정 #185

Merged
merged 1 commit into from
Nov 10, 2023
Merged

리뷰 이미지 조회 버그 수정 #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions sunsu-wedding/src/main/java/com/kakao/sunsuwedding/review/ReviewDTOConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
package com.kakao.sunsuwedding.review;

import com.kakao.sunsuwedding.review.image.ReviewImageItem;
import org.springframework.stereotype.Component;

import java.util.List;

@Component
public class ReviewDTOConverter {
public ReviewResponse.FindAllByPlannerDTO getFindAllByPlannerDTO(List<Review> reviews, List<String> images) {
public ReviewResponse.FindAllByPlannerDTO getFindAllByPlannerDTO(List<Review> reviews, List<ReviewImageItem> reviewImageItems) {
List<ReviewResponse.FindByUserDTO> reviewDTOS = reviews.stream()
.map(review -> new ReviewResponse.FindByUserDTO(
review.id,
(review.getMatch().getCouple() != null) ? review.getMatch().getCouple().getUsername() : "탈퇴한 사용자" ,
review.stars,
review.content,
images
reviewImageItems.stream()
.filter(reviewImageItem -> reviewImageItem.getReview().getId().equals(review.id))
.map(ReviewImageItem::getImage)
.toList()
))
.toList();

return new ReviewResponse.FindAllByPlannerDTO(reviewDTOS);
}

public ReviewResponse.FindAllByCoupleDTO getFindAllByCoupleDTO(List<Review> reviews, List<String> images) {
public ReviewResponse.FindAllByCoupleDTO getFindAllByCoupleDTO(List<Review> reviews, List<ReviewImageItem> reviewImageItems) {
List<ReviewResponse.FindByUserDTO> reviewDTOS = reviews.stream()
.map(review -> new ReviewResponse.FindByUserDTO(
review.id,
(review.getMatch().getPlanner() != null) ? review.getMatch().getPlanner().getUsername() : "탈퇴한 사용자" ,
review.stars,
review.content,
images
reviewImageItems.stream()
.filter(reviewImageItem -> reviewImageItem.getReview().getId().equals(review.id))
.map(ReviewImageItem::getImage)
.toList()
))
.toList();

Expand Down
9 changes: 5 additions & 4 deletions sunsu-wedding/src/main/java/com/kakao/sunsuwedding/review/ReviewServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.kakao.sunsuwedding.portfolio.Portfolio;
import com.kakao.sunsuwedding.portfolio.PortfolioJPARepository;
import com.kakao.sunsuwedding.portfolio.PortfolioServiceImpl;
import com.kakao.sunsuwedding.review.image.ReviewImageItem;
import com.kakao.sunsuwedding.review.image.ReviewImageItemJPARepository;
import com.kakao.sunsuwedding.review.image.ReviewImageItemService;
import com.kakao.sunsuwedding.user.base_user.User;
Expand Down Expand Up @@ -72,17 +73,17 @@ public ReviewResponse.FindAllByPlannerDTO findReviewsByPlanner(int page, Long pl
Pageable pageable = PageRequest.of(page, PAGE_SIZE);
Page<Review> pageContent = reviewJPARepository.findAllByMatchPlannerId(plannerId, pageable);
List<Review> reviews = pageContent.getContent();
List<String> images = reviewImageItemJPARepository.findByPlannerId(plannerId);
List<ReviewImageItem> reviewImageItems = reviewImageItemJPARepository.findByReviewMatchPlannerId(plannerId);

return reviewDTOConverter.getFindAllByPlannerDTO(reviews, images);
return reviewDTOConverter.getFindAllByPlannerDTO(reviews, reviewImageItems);
}

public ReviewResponse.FindAllByCoupleDTO findReviewsByCouple(User user) {

List<Review> reviews = reviewJPARepository.findAllByMatchCoupleId(user.getId());
List<String> images = reviewImageItemJPARepository.findByCoupleId(user.getId());
List<ReviewImageItem> reviewImageItems = reviewImageItemJPARepository.findByReviewMatchCoupleId(user.getId());

return reviewDTOConverter.getFindAllByCoupleDTO(reviews, images);
return reviewDTOConverter.getFindAllByCoupleDTO(reviews, reviewImageItems);
}

public ReviewResponse.ReviewDTO findReviewById(User user, Long reviewId) {
Expand Down
7 changes: 2 additions & 5 deletions ...dding/src/main/java/com/kakao/sunsuwedding/review/image/ReviewImageItemJPARepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ public interface ReviewImageItemJPARepository extends JpaRepository<ReviewImageI
@Query("delete from ReviewImageItem r where r.review.id = :reviewId")
void deleteAllByReviewId(@Param("reviewId") Long reviewId);

@Query("select r.image from ReviewImageItem r where r.review.match.planner.id = :plannerId")
List<String> findByPlannerId(@Param("plannerId") Long plannerId);

@Query("select r.image from ReviewImageItem r where r.review.match.couple.id = :coupleId")
List<String> findByCoupleId(@Param("coupleId") Long coupleId);
List<ReviewImageItem> findByReviewMatchPlannerId(@Param("plannerId") Long plannerId);
List<ReviewImageItem> findByReviewMatchCoupleId(@Param("coupleId") Long coupleId);

@Query("select r.image from ReviewImageItem r where r.review.id = :reviewId")
List<String> findByReviewId(@Param("reviewId") Long reviewId);
Expand Down
Loading