[BSVR-184] 내 리뷰 조회 API res 수정 : 팀이름, 팀 id 포함 (#99)

depromeet · Aug 2, 2024 · c865069 · c865069
1 parent 8108efb
commit c865069
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/application/src/main/java/org/depromeet/spot/application/review/ReadReviewController.java b/application/src/main/java/org/depromeet/spot/application/review/ReadReviewController.java
@@ -16,6 +16,9 @@
 import org.depromeet.spot.application.review.dto.response.ReviewMonthsResponse;
 import org.depromeet.spot.domain.review.ReviewYearMonth;
 import org.depromeet.spot.usecase.port.in.review.ReadReviewUsecase;
+import org.depromeet.spot.usecase.port.in.review.ReadReviewUsecase.BlockReviewListResult;
+import org.depromeet.spot.usecase.port.in.review.ReadReviewUsecase.MyRecentReviewResult;
+import org.depromeet.spot.usecase.port.in.review.ReadReviewUsecase.MyReviewListResult;
 import org.depromeet.spot.usecase.port.in.review.ReadReviewUsecase.ReadReviewResult;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.data.domain.Pageable;
@@ -58,7 +61,7 @@ public BlockReviewListResponse findReviewsByBlockId(
                             direction = Sort.Direction.DESC)
                     Pageable pageable) {
 
-        ReadReviewUsecase.BlockReviewListResult result =
+        BlockReviewListResult result =
                 readReviewUsecase.findReviewsByStadiumIdAndBlockCode(
                         stadiumId,
                         blockCode,
@@ -98,7 +101,7 @@ public MyReviewListResponse findMyReviews(
                             direction = Sort.Direction.DESC)
                     Pageable pageable) {
 
-        ReadReviewUsecase.MyReviewListResult result =
+        MyReviewListResult result =
                 readReviewUsecase.findMyReviewsByUserId(
                         memberId, request.year(), request.month(), pageable);
         return MyReviewListResponse.from(result, request.year(), request.month());
@@ -107,11 +110,10 @@ public MyReviewListResponse findMyReviews(
     @CurrentMember
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("/reviews/recentReview")
-    @Operation(summary = "자신이 작성한 최근 리뷰를 조회한다.")
+    @Operation(summary = "자신이 작성한 가장 최근 리뷰 1개를 조회한다.")
     public MyRecentReviewResponse findMyRecentReview(@Parameter(hidden = true) Long memberId) {
 
-        ReadReviewUsecase.MyRecentReviewResult result =
-                readReviewUsecase.findLastReviewByMemberId(memberId);
+        MyRecentReviewResult result = readReviewUsecase.findLastReviewByMemberId(memberId);
         return MyRecentReviewResponse.from(result);
     }
 

diff --git a/usecase/src/main/java/org/depromeet/spot/usecase/port/in/review/ReadReviewUsecase.java b/usecase/src/main/java/org/depromeet/spot/usecase/port/in/review/ReadReviewUsecase.java
@@ -62,7 +62,9 @@ record MemberInfoOnMyReviewResult(
             Integer level,
             String levelTitle,
             String nickname,
-            Long reviewCount) {}
+            Long reviewCount,
+            Long teamId,
+            String teamName) {}
 
     @Builder
     record MyRecentReviewResult(Review review, Long reviewCount) {}

diff --git a/usecase/src/main/java/org/depromeet/spot/usecase/service/review/ReadReviewService.java b/usecase/src/main/java/org/depromeet/spot/usecase/service/review/ReadReviewService.java
@@ -11,12 +11,14 @@
 import org.depromeet.spot.domain.review.image.TopReviewImage;
 import org.depromeet.spot.domain.review.keyword.Keyword;
 import org.depromeet.spot.domain.review.keyword.ReviewKeyword;
+import org.depromeet.spot.domain.team.BaseballTeam;
 import org.depromeet.spot.usecase.port.in.review.ReadReviewUsecase;
 import org.depromeet.spot.usecase.port.out.member.MemberRepository;
 import org.depromeet.spot.usecase.port.out.review.BlockTopKeywordRepository;
 import org.depromeet.spot.usecase.port.out.review.KeywordRepository;
 import org.depromeet.spot.usecase.port.out.review.ReviewImageRepository;
 import org.depromeet.spot.usecase.port.out.review.ReviewRepository;
+import org.depromeet.spot.usecase.port.out.team.BaseballTeamRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -33,6 +35,7 @@ public class ReadReviewService implements ReadReviewUsecase {
     private final BlockTopKeywordRepository blockTopKeywordRepository;
     private final KeywordRepository keywordRepository;
     private final MemberRepository memberRepository;
+    private final BaseballTeamRepository baseballTeamRepository;
 
     private static final int TOP_KEYWORDS_LIMIT = 5;
     private static final int TOP_IMAGES_LIMIT = 5;
@@ -90,8 +93,11 @@ public MyReviewListResult findMyReviewsByUserId(
 
         Member member = memberRepository.findById(userId);
 
+        BaseballTeam baseballTeam = baseballTeamRepository.findById(member.getTeamId());
+
         MemberInfoOnMyReviewResult memberInfo =
-                createMemberInfoFromMember(member, reviewPage.getTotalElements());
+                createMemberInfoFromMember(
+                        member, reviewPage.getTotalElements(), baseballTeam.getName());
 
         return MyReviewListResult.builder()
                 .memberInfoOnMyReviewResult(memberInfo)
@@ -137,14 +143,16 @@ public MyRecentReviewResult findLastReviewByMemberId(Long memberId) {
     }
 
     private MemberInfoOnMyReviewResult createMemberInfoFromMember(
-            Member member, long totalReviewCount) {
+            Member member, long totalReviewCount, String teamName) {
         return MemberInfoOnMyReviewResult.builder()
                 .userId(member.getId())
                 .profileImageUrl(member.getProfileImage())
                 .level(member.getLevel().getValue())
                 .levelTitle(member.getLevel().getTitle())
                 .nickname(member.getNickname())
                 .reviewCount(totalReviewCount)
+                .teamId(member.getTeamId())
+                .teamName(teamName)
                 .build();
     }