Merge pull request #90 from Dugout-Developers/feat/#89

jjeongdong · web-flow · commit 6246b517c9cc · 2025-02-03T21:21:52.000+09:00
[FEAT] 채팅 내역 조회 기능 구현
diff --git a/src/main/java/com/back/catchmate/domain/chat/controller/ChatController.java b/src/main/java/com/back/catchmate/domain/chat/controller/ChatController.java
@@ -1,21 +1,25 @@
 package com.back.catchmate.domain.chat.controller;
 
 import com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest;
-import com.back.catchmate.domain.chat.dto.ChatResponse.MessageInfo;
+import com.back.catchmate.domain.chat.dto.ChatResponse.PagedChatMessageInfo;
 import com.back.catchmate.domain.chat.service.ChatService;
+import com.back.catchmate.global.jwt.JwtValidation;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Mono;
 
-import java.util.List;
-
 @Tag(name = "채팅 관련 API")
 @RestController
 @RequestMapping("/chats")
@@ -29,9 +33,13 @@ public void sendMessage(@DestinationVariable Long chatRoomId, ChatMessageRequest
         chatService.sendMessage(chatRoomId, request);
     }
 
-    @Deprecated
-    @GetMapping(value = "/{roomId}")
-    public Mono<List<MessageInfo>> findChatMessageList(@PathVariable("roomId") Long roomId) {
-        return chatService.findChatMessageList(roomId).collectList();
+    @GetMapping("/{chatRoomId}")
+    @Operation(summary = "특정 채팅방의 채팅 내역 조회 API", description = "특정 채팅방의 채팅 내역 조회 API 입니다.")
+    public Mono<PagedChatMessageInfo> findChatMessageList(@JwtValidation Long userId,
+                                                          @PathVariable Long chatRoomId,
+                                                          @RequestParam(defaultValue = "0") int page,
+                                                          @RequestParam(defaultValue = "20") int size) {
+        Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Order.desc("id.timestamp")));
+        return chatService.getChatMessageList(userId, chatRoomId, pageable);
     }
 }
diff --git a/src/main/java/com/back/catchmate/domain/chat/converter/ChatMessageConverter.java b/src/main/java/com/back/catchmate/domain/chat/converter/ChatMessageConverter.java
@@ -0,0 +1,50 @@
+package com.back.catchmate.domain.chat.converter;
+
+import com.back.catchmate.domain.chat.dto.ChatResponse;
+import com.back.catchmate.domain.chat.dto.ChatResponse.ChatMessageInfo;
+import com.back.catchmate.domain.chat.entity.ChatMessage;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+public class ChatMessageConverter {
+    public Mono<ChatResponse.PagedChatMessageInfo> toPagedMessageInfo(Flux<ChatMessage> chatMessageFlux, Pageable pageable) {
+        return chatMessageFlux.collectList()
+                .flatMap(chatMessages -> {
+                    // 전체 메시지 수를 구하고 페이지 계산
+                    int totalElements = chatMessages.size();
+                    int totalPages = (int) Math.ceil((double) totalElements / pageable.getPageSize());
+                    boolean isFirst = pageable.getPageNumber() == 0;
+                    boolean isLast = pageable.getPageNumber() == totalPages - 1;
+
+                    // ChatMessageInfo 리스트로 변환
+                    List<ChatResponse.ChatMessageInfo> chatMessageInfoList = chatMessages.stream()
+                            .map(this::toChatMessageInfo)
+                            .collect(Collectors.toList());
+
+                    // PagedChatMessageInfo 반환
+                    return Mono.just(ChatResponse.PagedChatMessageInfo.builder()
+                            .chatMessageInfoList(chatMessageInfoList)
+                            .totalPages(totalPages)
+                            .totalElements((long) totalElements)
+                            .isFirst(isFirst)
+                            .isLast(isLast)
+                            .build());
+                });
+    }
+
+
+    private ChatMessageInfo toChatMessageInfo(ChatMessage chatMessage) {
+        return ChatMessageInfo.builder()
+                .id(chatMessage.getId())
+                .roomId(chatMessage.getRoomId())
+                .content(chatMessage.getContent())
+                .senderId(chatMessage.getSenderId())
+                .build();
+    }
+}
diff --git a/src/main/java/com/back/catchmate/domain/chat/dto/ChatResponse.java b/src/main/java/com/back/catchmate/domain/chat/dto/ChatResponse.java
@@ -1,6 +1,7 @@
 package com.back.catchmate.domain.chat.dto;
 
 import com.back.catchmate.domain.board.dto.BoardResponse.BoardInfo;
+import com.back.catchmate.domain.notification.dto.NotificationResponse;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -15,13 +16,25 @@ public abstract class ChatResponse {
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class MessageInfo {
+    public static class ChatMessageInfo {
         ObjectId id;
         private Long roomId;
         private String content;
         private Long senderId;
     }
 
+    @Getter
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class PagedChatMessageInfo {
+        private List<ChatMessageInfo> chatMessageInfoList;
+        private Integer totalPages;
+        private Long totalElements;
+        private Boolean isFirst;
+        private Boolean isLast;
+    }
+
     @Getter
     @Builder
     @AllArgsConstructor
diff --git a/src/main/java/com/back/catchmate/domain/chat/repository/ChatMessageRepository.java b/src/main/java/com/back/catchmate/domain/chat/repository/ChatMessageRepository.java
@@ -1,10 +1,13 @@
 package com.back.catchmate.domain.chat.repository;
 
 import com.back.catchmate.domain.chat.entity.ChatMessage;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.repository.Query;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
-import org.springframework.data.mongodb.repository.Tailable;
 import reactor.core.publisher.Flux;
 
 public interface ChatMessageRepository extends ReactiveMongoRepository<ChatMessage, String> {
-    Flux<ChatMessage> findAllByRoomId(Long roomId);
+    Flux<ChatMessage> findByRoomIdOrderByIdDesc(Long roomId, Pageable pageable);
+
 }
diff --git a/src/main/java/com/back/catchmate/domain/chat/repository/ChatRoomRepository.java b/src/main/java/com/back/catchmate/domain/chat/repository/ChatRoomRepository.java
@@ -8,5 +8,6 @@
 
 public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
     Optional<ChatRoom> findByBoardId(Long boardId);
+
     boolean existsByBoardId(Long boardId);
 }
diff --git a/src/main/java/com/back/catchmate/domain/chat/repository/UserChatRoomRepository.java b/src/main/java/com/back/catchmate/domain/chat/repository/UserChatRoomRepository.java
@@ -11,6 +11,8 @@
 public interface UserChatRoomRepository extends JpaRepository<UserChatRoom, Long> {
     Optional<UserChatRoom> findByUserIdAndChatRoomId(Long userId, Long chatRoomId);
 
+    boolean existsByUserIdAndChatRoomId(Long userId, Long chatRoomId);
+
     @Query("SELECT ucr FROM UserChatRoom ucr " +
             "JOIN FETCH ucr.chatRoom cr " +
             "WHERE ucr.user.id = :userId " +
diff --git a/src/main/java/com/back/catchmate/domain/chat/service/ChatService.java b/src/main/java/com/back/catchmate/domain/chat/service/ChatService.java
@@ -1,11 +1,12 @@
 package com.back.catchmate.domain.chat.service;
 
 import com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest;
-import com.back.catchmate.domain.chat.dto.ChatResponse.MessageInfo;
-import reactor.core.publisher.Flux;
+import com.back.catchmate.domain.chat.dto.ChatResponse;
+import org.springframework.data.domain.Pageable;
+import reactor.core.publisher.Mono;
 
 public interface ChatService {
     void sendMessage(Long chatRoomId, ChatMessageRequest request);
 
-    Flux<MessageInfo> findChatMessageList(Long roomId);
+    Mono<ChatResponse.PagedChatMessageInfo> getChatMessageList(Long userId, Long roomId, Pageable pageable);
 }
diff --git a/src/main/java/com/back/catchmate/domain/chat/service/ChatServiceImpl.java b/src/main/java/com/back/catchmate/domain/chat/service/ChatServiceImpl.java
@@ -1,16 +1,21 @@
 package com.back.catchmate.domain.chat.service;
 
+import com.back.catchmate.domain.chat.converter.ChatMessageConverter;
 import com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest;
-import com.back.catchmate.domain.chat.dto.ChatResponse;
-import com.back.catchmate.domain.chat.dto.ChatResponse.MessageInfo;
+import com.back.catchmate.domain.chat.dto.ChatResponse.PagedChatMessageInfo;
 import com.back.catchmate.domain.chat.entity.ChatMessage;
 import com.back.catchmate.domain.chat.repository.ChatMessageRepository;
+import com.back.catchmate.domain.chat.repository.UserChatRoomRepository;
+import com.back.catchmate.global.error.ErrorCode;
+import com.back.catchmate.global.error.exception.BaseException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Pageable;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import static com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest.MessageType;
 
@@ -20,6 +25,8 @@
 public class ChatServiceImpl implements ChatService {
     private final SimpMessagingTemplate messagingTemplate;
     private final ChatMessageRepository chatMessageRepository;
+    private final ChatMessageConverter chatMessageConverter;
+    private final UserChatRoomRepository userChatRoomRepository;
 
     // 메시지를 특정 채팅방으로 전송
     @Override
@@ -42,16 +49,13 @@ public void sendMessage(Long chatRoomId, ChatMessageRequest request) {
         messagingTemplate.convertAndSend(destination, request);
     }
 
-    @Override
-    @Transactional(readOnly = true)
-    public Flux<MessageInfo> findChatMessageList(Long roomId) {
-        return chatMessageRepository.findAllByRoomId(roomId)
-                .map(chatMessage -> ChatResponse.MessageInfo.builder()
-                        .id(chatMessage.getId())
-                        .roomId(chatMessage.getRoomId())
-                        .content(chatMessage.getContent())
-                        .senderId(chatMessage.getSenderId())
-                        .build()
-                );
+    public Mono<PagedChatMessageInfo> getChatMessageList(Long userId, Long chatRoomId, Pageable pageable) {
+        // 동기 방식으로 수정된 메서드 호출
+        if (!userChatRoomRepository.existsByUserIdAndChatRoomId(userId, chatRoomId)) {
+            throw new BaseException(ErrorCode.USER_CHATROOM_NOT_FOUND);
+        }
+
+        Flux<ChatMessage> chatMessageList = chatMessageRepository.findByRoomIdOrderByIdDesc(chatRoomId, pageable);
+        return chatMessageConverter.toPagedMessageInfo(chatMessageList, pageable);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`
`9`	`9`	`public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {`
`10`	`10`	`Optional<ChatRoom> findByBoardId(Long boardId);`
	`11`	`+`
`11`	`12`	`boolean existsByBoardId(Long boardId);`
`12`	`13`	`}`