fix : 홈 피드 API teamId null 시 발생하는 오류 수정 (#106)

depromeet · Aug 3, 2024 · c33f364 · c33f364
1 parent 04c8863
commit c33f364
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/usecase/src/main/java/org/depromeet/spot/usecase/port/in/member/MemberUsecase.java b/usecase/src/main/java/org/depromeet/spot/usecase/port/in/member/MemberUsecase.java
@@ -37,14 +37,17 @@ class MemberInfo {
         private final String teamName;
         private final Long reviewCntToLevelUp;
 
-        public static MemberInfo from(Member member) {
+        public static MemberInfo of(Member member, Long reviewCntToLevelUp) {
             return MemberInfo.builder()
                     .nickname(member.getNickname())
                     .profileImageUrl(member.getProfileImage())
                     .level(member.getLevel().getValue())
                     .levelTitle(member.getLevel().getTitle())
+                    .mascotImageUrl(member.getLevel().getMascotImageUrl())
                     .teamImageUrl(null)
                     .teamId(null)
+                    .teamName(null)
+                    .reviewCntToLevelUp(reviewCntToLevelUp)
                     .build();
         }
 

diff --git a/usecase/src/main/java/org/depromeet/spot/usecase/service/member/MemberService.java b/usecase/src/main/java/org/depromeet/spot/usecase/service/member/MemberService.java
@@ -81,14 +81,14 @@ public boolean deleteMember(String accessToken) {
     @Override
     public MemberInfo findMemberInfo(Long memberId) {
         Member member = readMemberUsecase.findById(memberId);
+        long reviewCount = readReviewUsecase.countByIdByMemberId(memberId);
+        long reviewCntToLevelUp = Level.calculateReviewCntToLevelUp(reviewCount);
+
         if (member.getTeamId() == null) {
-            return MemberInfo.from(member);
+            return MemberInfo.of(member, reviewCntToLevelUp);
         }
         BaseballTeam baseballTeam = readBaseballTeamUsecase.findById(member.getTeamId());
 
-        long reviewCount = readReviewUsecase.countByIdByMemberId(memberId);
-        long reviewCntToLevelUp = Level.calculateReviewCntToLevelUp(reviewCount);
-
         return MemberInfo.of(member, baseballTeam, reviewCntToLevelUp);
     }