✨ Feat: 멤버와 해당 멤버와의 친구 상태를 조회하는 메서드 구현

<footer> - 관련: #428
Namo-log · Jan 12, 2025 · 9a66e47 · 9a66e47
1 parent 1eaf4d8
commit 9a66e47
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/...va/com/namo/spring/db/mysql/domains/user/model/query/MemberWithFriendshipStatusQuery.java b/...va/com/namo/spring/db/mysql/domains/user/model/query/MemberWithFriendshipStatusQuery.java
@@ -0,0 +1,10 @@
+package com.namo.spring.db.mysql.domains.user.model.query;
+
+import com.namo.spring.db.mysql.domains.user.entity.Member;
+import com.namo.spring.db.mysql.domains.user.type.FriendshipStatus;
+
+public record MemberWithFriendshipStatusQuery(
+        Member member,
+        FriendshipStatus friendshipStatus
+) {
+}
diff --git a/.../src/main/java/com/namo/spring/db/mysql/domains/user/repository/FriendshipRepository.java b/.../src/main/java/com/namo/spring/db/mysql/domains/user/repository/FriendshipRepository.java
@@ -32,7 +32,7 @@ public interface FriendshipRepository extends JpaRepository<Friendship, Long> {
      * @param endDate
      * @return 친구 memberId, nickname, birthday
      */
-    @Query("SELECT new com.namo.spring.db.mysql.domains.user.model.query.FriendBirthdayQuery(fr.id, fr.nickname, fr.birthday) " +
+    @Query("SELECT new com.namo.spring.db.mysql.domains.user.model.query.FriendshipWithBirthdayQuery(fr.id, fr.nickname, fr.birthday) " +
             "FROM Friendship f JOIN f.friend fr " +
             "WHERE f.member.id = :memberId " +
             "AND fr.birthdayVisible = true " +
@@ -56,7 +56,7 @@ List<FriendshipWithBirthdayQuery> findBirthdayVisibleFriendIdsByPeriod(
      * @param memberId
      * @return 친구 memberId, nickname, birthday
      */
-    @Query("SELECT new com.namo.spring.db.mysql.domains.user.model.query.FriendBirthdayQuery(fr.id, fr.nickname, fr.birthday) " +
+    @Query("SELECT new com.namo.spring.db.mysql.domains.user.model.query.FriendshipWithBirthdayQuery(fr.id, fr.nickname, fr.birthday) " +
             "FROM Friendship f JOIN f.friend fr " +
             "WHERE f.member.id = :memberId " +
             "AND fr.birthdayVisible = true " +

diff --git a/...l-v2/src/main/java/com/namo/spring/db/mysql/domains/user/repository/MemberRepository.java b/...l-v2/src/main/java/com/namo/spring/db/mysql/domains/user/repository/MemberRepository.java
@@ -4,12 +4,14 @@
 import java.util.List;
 import java.util.Optional;
 
+import com.namo.spring.db.mysql.domains.user.model.query.MemberWithFriendshipStatusQuery;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
 import com.namo.spring.db.mysql.domains.user.entity.Member;
 import com.namo.spring.db.mysql.domains.user.type.MemberStatus;
 import com.namo.spring.db.mysql.domains.user.type.SocialType;
+import org.springframework.data.repository.query.Param;
 
 public interface MemberRepository extends JpaRepository<Member, Long> {
 
@@ -33,4 +35,12 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
     Optional<Member> findByIdAndStatus(Long memberId, MemberStatus status);
 
     Optional<Member> findByNicknameAndTagAndStatus(String nickname, String tag, MemberStatus status);
+
+    @Query("SELECT new com.namo.spring.db.mysql.domains.user.model.query.MemberWithFriendshipStatusQuery(" +
+            "m, CASE WHEN f IS NOT NULL THEN f.status ELSE null END) " +
+            "FROM Member m " +
+            "LEFT JOIN Friendship f ON f.member.id = :memberId AND f.friend.id = :targetId " +
+            "WHERE m.id = :targetId")
+    MemberWithFriendshipStatusQuery findByMemberIdWithFriendStatus(@Param("memberId") Long memberId, @Param("targetId") Long targetId);
+
 }
diff --git a/...b-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/service/MemberService.java b/...b-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/service/MemberService.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import com.namo.spring.db.mysql.domains.user.model.query.MemberWithFriendshipStatusQuery;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.namo.spring.core.common.annotation.DomainService;
@@ -39,4 +40,8 @@ public Optional<Member> readMemberByStatus(Long memberId, MemberStatus status){
     public Optional<Member> readMemberByStatus(String nickname, String tag, MemberStatus status){
         return memberRepository.findByNicknameAndTagAndStatus(nickname, tag, status);
     }
+
+    public MemberWithFriendshipStatusQuery findMemberWithFriendshipStatus(Long memberId, Long targetId) {
+        return memberRepository.findByMemberIdWithFriendStatus(memberId, targetId);
+    }
 }