[Fix] 멤버 coffee chat 관련 필드 반영 (#540)

sopt-makers · Nov 9, 2024 · 37e6839 · 37e6839
1 parent 2ca4af5
commit 37e6839
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/org/sopt/makers/internal/dto/member/MemberProfileSpecificResponse.java b/src/main/java/org/sopt/makers/internal/dto/member/MemberProfileSpecificResponse.java
@@ -34,7 +34,6 @@ public record MemberProfileSpecificResponse(
         List<MemberCareerResponse> careers,
         Boolean allowOfficial,
         Boolean isCoffeeChatActivate,
-        String coffeeChatBio,
         @Schema(required = true)
         Boolean isMine
 ) {
@@ -116,7 +115,6 @@ public static MemberProfileSpecificResponse checkIsBlindPhone(MemberProfileSpeci
             response.careers(),
             response.allowOfficial(),
             response.isCoffeeChatActivate(),
-            response.coffeeChatBio(),
             isMine
         );
     }

diff --git a/src/main/java/org/sopt/makers/internal/mapper/MemberMapper.java b/src/main/java/org/sopt/makers/internal/mapper/MemberMapper.java
@@ -41,15 +41,17 @@ MemberProfileSpecificResponse toProfileSpecificResponse (
         boolean isMine,
         List<MemberProfileProjectDao> projects,
         List<MemberProfileSpecificResponse.MemberActivityResponse> activities,
-        List<MemberProfileProjectVo> soptActivities
+        List<MemberProfileProjectVo> soptActivities,
+        Boolean isCoffeeChatActivate
     );
 
     @Mapping(target = "activities", source = "activities")
     MemberProfileSpecificResponse toProfileSpecificResponse (
             Member member,
             boolean isMine,
             List<MemberProfileProjectDao> projects,
-            List<MemberProfileSpecificResponse.MemberActivityResponse> activities
+            List<MemberProfileSpecificResponse.MemberActivityResponse> activities,
+            Boolean isCoffeeChatActivate
     );
 
     @Mapping(target = "activities", source = "activities")

diff --git a/src/main/java/org/sopt/makers/internal/member/controller/MemberController.java b/src/main/java/org/sopt/makers/internal/member/controller/MemberController.java
@@ -168,9 +168,10 @@ public ResponseEntity<MemberProfileSpecificResponse> getUserProfile (
                 new MemberProfileSpecificResponse.MemberActivityResponse(entry.getKey(), entry.getValue())
                 ).collect(Collectors.toList());
         val isMine = Objects.equals(member.getId(), memberDetails.getId());
+        val isCoffeeChatActivate = coffeeChatService.getCoffeeChatActivate(member.getId());
         val response = MemberProfileSpecificResponse.checkIsBlindPhone(
             memberMapper.toProfileSpecificResponse(
-                member, true, memberProfileProjects, activityResponses, soptActivityResponse
+                member, true, memberProfileProjects, activityResponses, soptActivityResponse, isCoffeeChatActivate
             ),
             isMine);
         sortProfileCareer(response);
@@ -197,8 +198,9 @@ public ResponseEntity<MemberProfileSpecificResponse> getMyProfile (
                 memberProfileProjects
         );
         val isMine = Objects.equals(member.getId(), memberDetails.getId());
+        val isCoffeeChatActivate = coffeeChatService.getCoffeeChatActivate(member.getId());
         val response = memberMapper.toProfileSpecificResponse(
-                member, isMine, memberProfileProjects, activityResponses, soptActivityResponse
+                member, isMine, memberProfileProjects, activityResponses, soptActivityResponse, isCoffeeChatActivate
         );
         sortProfileCareer(response);
         return ResponseEntity.status(HttpStatus.OK).body(response);