Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ public Long getReviewerId() {
public ReviewToOwnerResponseDto toReviewToOwnerResponseDto(
LocalDateTime startTime,
String reviewerNm,
String reviewerProfile,
List<String> images) {
return ReviewToOwnerResponseDto.builder()
.reviewer(reviewerNm)
.reviewerProfile(reviewerProfile)
.walkingDay(startTime)
.sociality(this.sociality)
.activity(this.activity)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
public class ReviewToWalkerBasicInfo {
private final Long reviewToWalkerId;
private final String ownerName;
private final String ownerProfile;
private final String dogName;
private final LocalDateTime walkingDay;
private final Float photoSharing;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@Getter
public class ReviewToOwnerResponseDto {
private final String reviewer;
private final String reviewerProfile;
private final LocalDateTime walkingDay;
private final Sociality sociality;
private final Activity activity;
Expand All @@ -21,8 +22,9 @@ public class ReviewToOwnerResponseDto {
private final List<String> images;

@Builder
public ReviewToOwnerResponseDto(String reviewer, LocalDateTime walkingDay, Sociality sociality, Activity activity, Aggressiveness aggressiveness, String content, List<String> images) {
public ReviewToOwnerResponseDto(String reviewer, String reviewerProfile, LocalDateTime walkingDay, Sociality sociality, Activity activity, Aggressiveness aggressiveness, String content, List<String> images) {
this.reviewer = reviewer;
this.reviewerProfile = reviewerProfile;
this.walkingDay = walkingDay;
this.sociality = sociality;
this.activity = activity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
public class ReviewToWalkerRes {
private final Long reviewToWalkerId;
private final String ownerName;
private final String ownerProfile;
private final String dogName;
private final LocalDateTime walkingDay;
private final Float photoSharing;
Expand All @@ -31,6 +32,7 @@ public ReviewToWalkerRes(
) {
this.reviewToWalkerId = reviewToWalkerBasicInfo.getReviewToWalkerId();
this.ownerName = reviewToWalkerBasicInfo.getOwnerName();
this.ownerProfile = reviewToWalkerBasicInfo.getOwnerProfile();
this.dogName = reviewToWalkerBasicInfo.getDogName();
this.walkingDay = reviewToWalkerBasicInfo.getWalkingDay();
this.photoSharing = reviewToWalkerBasicInfo.getPhotoSharing();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public List<ReviewToWalkerBasicInfo> findAllByReviewTargetIdAndDelYn(Long review
ReviewToWalkerBasicInfo.class,
reviewToWalker.reviewToWalkerId,
member.nickname,
member.profile,
dog.name,
board.startTime,
reviewToWalker.photoSharing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,17 @@ public List<ReviewToOwnerResponseDto> getReviewToOwners (Long memberId, Long dog
Board board = boardRepository.findByBoardIdAndDelYn(reviewToOwner.getBoardId(), "N")
.orElseThrow(() -> new CustomException(HttpStatus.INTERNAL_SERVER_ERROR, ErrorType.INVALID_BOARD));

// 리뷰어 정보 추가
Optional<Member> member = memberService.getMemberByMemberId(reviewToOwner.getReviewerId());
String reviewerNm = member.isPresent() ? member.get().getNickname() : "탈퇴한 사용자";
String reviewerProfile = member.map(Member::getProfile).orElse(null);

List<ReviewToOwnerImage> reviewToOwnerImages = reviewToOwnerImageRepository.findAllByReviewToOwnerId(reviewToOwner.getReviewerId());
List<String> images = reviewToOwnerImages.stream()
.map(ReviewToOwnerImage::getImageUrl)
.toList();

return reviewToOwner.toReviewToOwnerResponseDto(board.getStartTime(), reviewerNm, images);
return reviewToOwner.toReviewToOwnerResponseDto(board.getStartTime(), reviewerNm, reviewerProfile, images);
})
.toList());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public List<ReviewToWalkerRes> getReviewToWalkerList(Long memberId, String ascYn
.map(ReviewToWalkerBasicInfo::getReviewToWalkerId)
.toList();

Map<Long, List<String>> profiles = reviewToWalkerImageRepository.findProfilesByReviewToWalkerIdsAndDelYn(reviewIds, "N");
Map<Long, List<String>> images = reviewToWalkerImageRepository.findProfilesByReviewToWalkerIdsAndDelYn(reviewIds, "N");

Map<Long, List<HashtagWalkerNm>> hashtags = hashtagToWalkerRepository.findHashtagsByReviewToWalkerIdsAndDelYn(reviewIds, "N");

Expand All @@ -148,7 +148,7 @@ public List<ReviewToWalkerRes> getReviewToWalkerList(Long memberId, String ascYn
.map(basicInfo -> {
return ReviewToWalkerRes.builder()
.reviewToWalkerBasicInfo(basicInfo)
.profiles(profiles.get(basicInfo.getReviewToWalkerId()))
.profiles(images.get(basicInfo.getReviewToWalkerId()))
.hashtags(hashtags.get(basicInfo.getReviewToWalkerId()))
.build();
}).toList();
Expand Down
Loading