From 7dd9dd3eaefa117d2ac32af0576083d111623d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=20=EC=9D=80=EC=A0=95?= Date: Thu, 16 Jan 2025 22:39:02 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=82=B0=EC=B1=85=20=ED=9B=84=EA=B8=B0?= =?UTF-8?q?=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20api?= =?UTF-8?q?=EC=97=90=20=EB=A6=AC=EB=B7=B0=EC=96=B4=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=EC=B6=94=EA=B0=80'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../walkmong_back/api/review/domain/ReviewToOwner.java | 2 ++ .../api/review/dto/common/ReviewToWalkerBasicInfo.java | 1 + .../api/review/dto/res/ReviewToOwnerResponseDto.java | 4 +++- .../walkmong_back/api/review/dto/res/ReviewToWalkerRes.java | 2 ++ .../review/repository/impl/ReviewToWalkerRepositoryImpl.java | 1 + .../api/review/service/ReviewToOwnerService.java | 4 +++- .../api/review/service/ReviewToWalkerService.java | 4 ++-- 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jullaene/walkmong_back/api/review/domain/ReviewToOwner.java b/src/main/java/org/jullaene/walkmong_back/api/review/domain/ReviewToOwner.java index ba2c727..0c2da84 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/review/domain/ReviewToOwner.java +++ b/src/main/java/org/jullaene/walkmong_back/api/review/domain/ReviewToOwner.java @@ -87,9 +87,11 @@ public Long getReviewerId() { public ReviewToOwnerResponseDto toReviewToOwnerResponseDto( LocalDateTime startTime, String reviewerNm, + String reviewerProfile, List images) { return ReviewToOwnerResponseDto.builder() .reviewer(reviewerNm) + .reviewerProfile(reviewerProfile) .walkingDay(startTime) .sociality(this.sociality) .activity(this.activity) diff --git a/src/main/java/org/jullaene/walkmong_back/api/review/dto/common/ReviewToWalkerBasicInfo.java b/src/main/java/org/jullaene/walkmong_back/api/review/dto/common/ReviewToWalkerBasicInfo.java index 903c31d..d62bf44 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/review/dto/common/ReviewToWalkerBasicInfo.java +++ b/src/main/java/org/jullaene/walkmong_back/api/review/dto/common/ReviewToWalkerBasicInfo.java @@ -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; diff --git a/src/main/java/org/jullaene/walkmong_back/api/review/dto/res/ReviewToOwnerResponseDto.java b/src/main/java/org/jullaene/walkmong_back/api/review/dto/res/ReviewToOwnerResponseDto.java index cc55187..6a06196 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/review/dto/res/ReviewToOwnerResponseDto.java +++ b/src/main/java/org/jullaene/walkmong_back/api/review/dto/res/ReviewToOwnerResponseDto.java @@ -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; @@ -21,8 +22,9 @@ public class ReviewToOwnerResponseDto { private final List images; @Builder - public ReviewToOwnerResponseDto(String reviewer, LocalDateTime walkingDay, Sociality sociality, Activity activity, Aggressiveness aggressiveness, String content, List images) { + public ReviewToOwnerResponseDto(String reviewer, String reviewerProfile, LocalDateTime walkingDay, Sociality sociality, Activity activity, Aggressiveness aggressiveness, String content, List images) { this.reviewer = reviewer; + this.reviewerProfile = reviewerProfile; this.walkingDay = walkingDay; this.sociality = sociality; this.activity = activity; diff --git a/src/main/java/org/jullaene/walkmong_back/api/review/dto/res/ReviewToWalkerRes.java b/src/main/java/org/jullaene/walkmong_back/api/review/dto/res/ReviewToWalkerRes.java index 35e1599..d63e5de 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/review/dto/res/ReviewToWalkerRes.java +++ b/src/main/java/org/jullaene/walkmong_back/api/review/dto/res/ReviewToWalkerRes.java @@ -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; @@ -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(); diff --git a/src/main/java/org/jullaene/walkmong_back/api/review/repository/impl/ReviewToWalkerRepositoryImpl.java b/src/main/java/org/jullaene/walkmong_back/api/review/repository/impl/ReviewToWalkerRepositoryImpl.java index 1625c80..ea206e3 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/review/repository/impl/ReviewToWalkerRepositoryImpl.java +++ b/src/main/java/org/jullaene/walkmong_back/api/review/repository/impl/ReviewToWalkerRepositoryImpl.java @@ -30,6 +30,7 @@ public List findAllByReviewTargetIdAndDelYn(Long review ReviewToWalkerBasicInfo.class, reviewToWalker.reviewToWalkerId, member.nickname, + member.profile, dog.name, board.startTime, reviewToWalker.photoSharing, diff --git a/src/main/java/org/jullaene/walkmong_back/api/review/service/ReviewToOwnerService.java b/src/main/java/org/jullaene/walkmong_back/api/review/service/ReviewToOwnerService.java index 25f9334..7315b3f 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/review/service/ReviewToOwnerService.java +++ b/src/main/java/org/jullaene/walkmong_back/api/review/service/ReviewToOwnerService.java @@ -86,15 +86,17 @@ public List getReviewToOwners (Long memberId, Long dog Board board = boardRepository.findByBoardIdAndDelYn(reviewToOwner.getBoardId(), "N") .orElseThrow(() -> new CustomException(HttpStatus.INTERNAL_SERVER_ERROR, ErrorType.INVALID_BOARD)); + // 리뷰어 정보 추가 Optional member = memberService.getMemberByMemberId(reviewToOwner.getReviewerId()); String reviewerNm = member.isPresent() ? member.get().getNickname() : "탈퇴한 사용자"; + String reviewerProfile = member.map(Member::getProfile).orElse(null); List reviewToOwnerImages = reviewToOwnerImageRepository.findAllByReviewToOwnerId(reviewToOwner.getReviewerId()); List images = reviewToOwnerImages.stream() .map(ReviewToOwnerImage::getImageUrl) .toList(); - return reviewToOwner.toReviewToOwnerResponseDto(board.getStartTime(), reviewerNm, images); + return reviewToOwner.toReviewToOwnerResponseDto(board.getStartTime(), reviewerNm, reviewerProfile, images); }) .toList()); diff --git a/src/main/java/org/jullaene/walkmong_back/api/review/service/ReviewToWalkerService.java b/src/main/java/org/jullaene/walkmong_back/api/review/service/ReviewToWalkerService.java index e874a96..f7afe37 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/review/service/ReviewToWalkerService.java +++ b/src/main/java/org/jullaene/walkmong_back/api/review/service/ReviewToWalkerService.java @@ -135,7 +135,7 @@ public List getReviewToWalkerList(Long memberId, String ascYn .map(ReviewToWalkerBasicInfo::getReviewToWalkerId) .toList(); - Map> profiles = reviewToWalkerImageRepository.findProfilesByReviewToWalkerIdsAndDelYn(reviewIds, "N"); + Map> images = reviewToWalkerImageRepository.findProfilesByReviewToWalkerIdsAndDelYn(reviewIds, "N"); Map> hashtags = hashtagToWalkerRepository.findHashtagsByReviewToWalkerIdsAndDelYn(reviewIds, "N"); @@ -148,7 +148,7 @@ public List 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();