Merge pull request #35 from next-engineer/dev

채팅방 목록 보여주기

Author: cw7430

src/main/java/com/next/intune/chat/dto/response/MatchResponseDto.java

@@ -11,8 +11,8 @@
 @AllArgsConstructor
 public class MatchResponseDto {
     private Long matchId;
-    private Long requesterId;
-    private Long responderId;
+    private String name;
+    private String lastMessage;
     private boolean approved;
     private boolean valid;
     private Instant createdAt;

src/main/java/com/next/intune/chat/repository/MatchRepository.java

@@ -11,13 +11,26 @@
 public interface MatchRepository extends JpaRepository<Match,Long> {
     @Query(value = """
     SELECT m.`match_id`     AS matchId,
-           m.`requester_id` AS requesterId,
-           m.`responder_id` AS responderId,
+           CASE
+                WHEN m.`requester_id` = :userId THEN u2.`name`
+                WHEN m.`responder_id` = :userId THEN u1.`name`
+           END AS `name`,
+           (
+                SELECT ch.`chat`
+                FROM `intune-chat`.`chats_history` ch
+                WHERE ch.`match_id` = m.`match_id`
+                ORDER BY ch.`created_at` DESC
+                LIMIT 1
+           ) AS `lastMessage`,
            m.`is_approved`  AS approved,
            m.`is_valid`     AS valid,
            m.`created_at`   AS createdAt,
            m.`updated_at`   AS updatedAt
     FROM `intune-chat`.`matches` m
+    JOIN `intune-member`.`users` u1
+        ON m.`requester_id` = u1.`user_id`
+    JOIN `intune-member`.`users` u2
+        ON m.`responder_id` = u2.`user_id`
     WHERE (m.`requester_id` = :userId OR m.`responder_id` = :userId)
       AND m.`is_valid` = 1
     ORDER BY m.`updated_at` DESC

src/main/java/com/next/intune/chat/repository/mapping/MatchRow.java

@@ -4,8 +4,8 @@
 
 public interface MatchRow {
     Long getMatchId();
-    Long getRequesterId();
-    Long getResponderId();
+    String getName();
+    String getLastMessage();
     boolean isApproved();
     boolean isValid();
     Instant getCreatedAt();

src/main/java/com/next/intune/chat/service/ChatService.java

@@ -109,8 +109,8 @@ public List<MatchResponseDto> getMatches(HttpServletRequest request) {
         return matchRepository.findAllValidRowsByUser(user.getUserId()).stream()
                 .map(r -> MatchResponseDto.builder()
                         .matchId(r.getMatchId())
-                        .requesterId(r.getRequesterId())
-                        .responderId(r.getResponderId())
+                        .name(r.getName())
+                        .lastMessage(r.getLastMessage())
                         .approved(r.isApproved())
                         .valid(r.isValid())
                         .createdAt(r.getCreatedAt())