fix: 매칭 쿼리 left join으로 변경

JNU-econovation · Jul 25, 2024 · 4f75192 · 4f75192
1 parent 7443988
commit 4f75192
Showing 1 changed file with 35 additions and 47 deletions.
diff --git a/src/main/java/econo/buddybridge/matching/repository/MatchingRepositoryCustomImpl.java b/src/main/java/econo/buddybridge/matching/repository/MatchingRepositoryCustomImpl.java
@@ -1,78 +1,66 @@
 package econo.buddybridge.matching.repository;
 
+import static econo.buddybridge.chat.chatmessage.entity.QChatMessage.chatMessage;
+import static econo.buddybridge.matching.entity.QMatching.matching;
+import static econo.buddybridge.member.entity.QMember.member;
+
 import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import econo.buddybridge.chat.chatmessage.entity.ChatMessage;
 import econo.buddybridge.matching.dto.MatchingCustomPage;
 import econo.buddybridge.matching.dto.MatchingResDto;
-import econo.buddybridge.matching.dto.ReceiverDto;
-import econo.buddybridge.matching.entity.Matching;
+import econo.buddybridge.matching.dto.QMatchingResDto;
+import econo.buddybridge.matching.dto.QReceiverDto;
 import econo.buddybridge.matching.entity.MatchingStatus;
-import econo.buddybridge.member.entity.Member;
-import java.util.stream.Collectors;
+import java.time.LocalDateTime;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static econo.buddybridge.chat.chatmessage.entity.QChatMessage.chatMessage;
-import static econo.buddybridge.matching.entity.QMatching.matching;
-import static econo.buddybridge.member.entity.QMember.member;
-
 @Repository
 @RequiredArgsConstructor
 public class MatchingRepositoryCustomImpl implements MatchingRepositoryCustom {
 
     private final JPAQueryFactory queryFactory;
 
-    // TODO : 전체 매칭 리스트를 가져와
-    // 가져오는데 커서기반 페이지네이션을 적용
-    // cursor가 있는지 없는지에 따라
-    // matchingStatus가 있는지 없는지 따라
-    // 채팅의 마지막 생성 시간을 가져와서 정렬
     @Override
     public MatchingCustomPage findMatchings(Long memberId, Integer size, LocalDateTime cursor, MatchingStatus matchingStatus, Pageable page) {
         int pageSize = page.getPageSize();
 
-        List<Matching> matchings = queryFactory
-                .selectFrom(matching)
+        List<MatchingResDto> matchingResDtos = queryFactory
+                .select(new QMatchingResDto(
+                        matching.id,
+                        matching.post.postType,
+                        matching.post.id,
+                        chatMessage.content,
+                        chatMessage.createdAt,
+                        chatMessage.messageType,
+                        matching.matchingStatus,
+                        new QReceiverDto(
+                                member.id,
+                                member.nickname,
+                                member.profileImageUrl
+                        )
+                ))
+                .from(matching)
+                .leftJoin(chatMessage).on(chatMessage.matching.id.eq(matching.id))
+                .leftJoin(member).on(
+                        member.id.eq(
+                                new CaseBuilder()
+                                        .when(matching.taker.id.eq(memberId)).then(matching.giver.id)
+                                        .otherwise(matching.taker.id)
+                        )
+                )
                 .where(
                         matching.taker.id.eq(memberId).or(matching.giver.id.eq(memberId)),
                         buildCursorExpression(cursor),
                         buildMatchingStatusExpression(matchingStatus)
                 )
+                .orderBy(chatMessage.createdAt.desc())
                 .limit(size + 1)
                 .fetch();
 
-        List<MatchingResDto> matchingResDtos = matchings.stream()
-                .map(matching -> {
-                    ChatMessage lastMessage = queryFactory
-                            .selectFrom(chatMessage)
-                            .where(chatMessage.matching.id.eq(matching.getId()))
-                            .orderBy(chatMessage.createdAt.desc())
-                            .limit(1)
-                            .fetchOne();
-
-                    Long receiverId = memberId.equals(matching.getTaker().getId()) ? matching.getGiver().getId() : matching.getTaker().getId();
-                    Member receiver = queryFactory
-                            .selectFrom(member)
-                            .where(member.id.eq(receiverId))
-                            .fetchOne();
-
-                    return new MatchingResDto(
-                            matching.getId(),
-                            matching.getPost().getPostType(),
-                            matching.getPost().getId(),
-                            lastMessage.getContent(),
-                            lastMessage.getCreatedAt(),
-                            lastMessage.getMessageType(),
-                            matching.getMatchingStatus(),
-                            new ReceiverDto(receiver)
-                    );
-                }).collect(Collectors.toList());
-
         boolean nextPage = false;
         if (matchingResDtos.size() > pageSize) {
             matchingResDtos.removeLast();
@@ -91,4 +79,4 @@ private BooleanExpression buildCursorExpression(LocalDateTime cursor) {
     private BooleanExpression buildMatchingStatusExpression(MatchingStatus matchingStatus) {
         return matchingStatus == null ? null : matching.matchingStatus.eq(matchingStatus);
     }
-}
+}