CLAP-451 Refactor: department fetch가 필요한 서비스에 대해서 쿼리 메서드 작성

#590

Author: joowojr

src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java

@@ -31,12 +31,24 @@ public Optional<Member> findById(final Long id) {
         return memberEntity.map(memberPersistenceMapper::toDomain);
     }
 
+    @Override
+    public Optional<Member> findByIdWithFetchDepartment(Long id) {
+        Optional<MemberEntity> memberEntity = memberRepository.findByIdWithFetchDepartment(id);
+        return memberEntity.map(memberPersistenceMapper::toDomain);
+    }
+
     @Override
     public Optional<Member> findActiveMemberById(final Long id) {
         Optional<MemberEntity> memberEntity = memberRepository.findByStatusAndMemberId(MemberStatus.ACTIVE, id);
         return memberEntity.map(memberPersistenceMapper::toDomain);
     }
 
+    @Override
+    public Optional<Member> findActiveMemberByIdWithFetchDepartment(Long id) {
+        Optional<MemberEntity> memberEntity = memberRepository.findActiveMemberByIdWithFetchDepartment(id);
+        return memberEntity.map(memberPersistenceMapper::toDomain);
+    }
+
     @Override
     public Optional<Member> findActiveMemberByNickname(final String nickname) {
         Optional<MemberEntity> memberEntity = memberRepository.findActiveMemberByNickname(nickname);
@@ -85,7 +97,7 @@ public List<Member> findActiveManagers() {
 
     @Override
     public Page<Member> findAllMembers(final Pageable pageable) {
-        return memberRepository.findAllMembers(pageable).map(memberPersistenceMapper::toDomain);
+        return memberRepository.findAllMembersWithFetchDepartment(pageable).map(memberPersistenceMapper::toDomain);
     }
 
     @Override

src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java

@@ -25,6 +25,7 @@ public class MemberCustomRepositoryImpl implements MemberCustomRepository {
     private Page<MemberEntity> executeQueryWithPageable(Pageable pageable, BooleanBuilder whereClause, OrderSpecifier<?> orderSpecifier) {
         List<MemberEntity> result = queryFactory
                 .selectFrom(memberEntity)
+                .leftJoin(memberEntity.department).fetchJoin()
                 .where(whereClause)
                 .orderBy(orderSpecifier)
                 .offset(pageable.getOffset())

src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java

@@ -3,6 +3,8 @@
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -13,7 +15,13 @@
 import java.util.Set;
 
 @Repository
-public interface MemberRepository extends JpaRepository<MemberEntity, Long>,  MemberCustomRepository {
+public interface MemberRepository extends JpaRepository<MemberEntity, Long>, MemberCustomRepository {
+    @Query("SELECT m FROM MemberEntity m LEFT JOIN FETCH m.department WHERE m.memberId = :id")
+    Optional<MemberEntity> findByIdWithFetchDepartment(Long id);
+
+    @Query("SELECT m FROM MemberEntity m LEFT JOIN FETCH m.department WHERE m.memberId = :id AND m.status='ACTIVE'")
+    Optional<MemberEntity> findActiveMemberByIdWithFetchDepartment(Long id);
+
     List<MemberEntity> findByRoleAndStatus(MemberRole role, MemberStatus status);
 
     Optional<MemberEntity> findByStatusAndMemberId(MemberStatus memberStatus, Long memberId);
@@ -26,7 +34,9 @@ public interface MemberRepository extends JpaRepository<MemberEntity, Long>,  Me
 
     List<MemberEntity> findByIsReviewerTrue();
 
-    List<MemberEntity> findAll(); // 전체 회원 조회
+    @Query(value = "SELECT DISTINCT m FROM MemberEntity m LEFT JOIN FETCH m.department",
+            countQuery = "SELECT COUNT(DISTINCT m) FROM MemberEntity m")
+    Page<MemberEntity> findAllMembersWithFetchDepartment(Pageable pageable);
 
     Optional<MemberEntity> findByMemberIdAndIsReviewerTrue(Long memberId);
 

src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java

@@ -15,8 +15,12 @@
 public interface LoadMemberPort {
     Optional<Member> findById(Long id);
 
+    Optional<Member> findByIdWithFetchDepartment(Long id);
+
     Optional<Member> findActiveMemberById(Long id);
 
+    Optional<Member> findActiveMemberByIdWithFetchDepartment(Long id);
+
     List<Member> findActiveManagers();
 
     Optional<Member> findReviewerById(Long id);