🎨 내집다방 화면 조회 - 나를 팔로우하는지 여부 추가

zipdabang · Oct 10, 2023 · 5b912ba · 5b912ba
1 parent 279ce9c
commit 5b912ba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/zipdabang/server/converter/MemberConverter.java b/src/main/java/zipdabang/server/converter/MemberConverter.java
@@ -405,13 +405,14 @@ public static MemberResponseDto.FollowerListDto toFollowerListDto(Page<Follow> f
                 .build();
     }
 
-    public static MemberResponseDto.MyZipdabangDto toMyZipdabangDto(Member member, boolean checkSelf, boolean isFollowing,MemberResponseDto.MemberPreferCategoryDto memberPreferCategoryDto) {
+    public static MemberResponseDto.MyZipdabangDto toMyZipdabangDto(Member member, boolean checkSelf, boolean isFollowing, boolean isFollower, MemberResponseDto.MemberPreferCategoryDto memberPreferCategoryDto) {
 
         return MemberResponseDto.MyZipdabangDto.builder()
                 .memberId(member.getMemberId())
                 .imageUrl(member.getProfileUrl())
                 .checkSelf(checkSelf)
                 .checkFollowing(isFollowing)
+                .checkFollower(isFollower)
                 .nickname(member.getNickname())
                 .caption(member.getCaption())
                 .memberPreferCategoryDto(memberPreferCategoryDto)

diff --git a/src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java b/src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java
@@ -470,22 +470,19 @@ public Boolean checkFollowing(Member loginMember, Member targetMember) {
     public MemberResponseDto.MyZipdabangDto getMyZipdabang(Member member, Long targetId) {
         Member target = memberRepository.findById(targetId).orElseThrow(() -> new MemberException(CommonStatus.MEMBER_NOT_FOUND));
         boolean checkSelf = false;
-        boolean isFollowing = false;
         if (member.getMemberId() == target.getMemberId()) {
             checkSelf=true;
         }
         else if(blockedMemberRepository.existsByOwnerAndBlocked(member,target)){
             throw new MemberException(CommonStatus.BLOCKED_MEMBER);
         }
-
-        if (followRepository.existsByFollowerAndFollowee(member, target)) {
-            isFollowing=true;
-        }
+        boolean isFollowing = followRepository.existsByFollowerAndFollowee(member, target);
+        boolean isFollower = followRepository.existsByFollowerAndFollowee(target, member);
 
         List<Category> categories = findMemberPreferCategories(member);
         MemberResponseDto.MemberPreferCategoryDto memberPreferCategoryDto = MemberConverter.toMemberPreferCategoryDto(categories);
 
-        return MemberConverter.toMyZipdabangDto(target, checkSelf, isFollowing, memberPreferCategoryDto);
+        return MemberConverter.toMyZipdabangDto(target, checkSelf, isFollowing, isFollower, memberPreferCategoryDto);
 
     }
 }

diff --git a/src/main/java/zipdabang/server/web/dto/responseDto/MemberResponseDto.java b/src/main/java/zipdabang/server/web/dto/responseDto/MemberResponseDto.java
@@ -278,6 +278,7 @@ public static class MyZipdabangDto{
         String imageUrl;
         boolean checkSelf;
         boolean checkFollowing;
+        boolean checkFollower;
         String nickname;
         String caption;
         MemberPreferCategoryDto memberPreferCategoryDto;