Merge pull request #158 from Dugout-Developers/fix/#157

jjeongdong · web-flow · commit f01eba83a91a · 2025-03-05T17:24:47.000+09:00
[FIX] 채팅 읽지 않은 메세지 개수 조회 기능 수정
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,6 +1,7 @@
 package com.back.catchmate.domain.chat.controller;
 
 import com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest;
+import com.back.catchmate.domain.chat.dto.ChatRequest.ReadChatMessageRequest;
 import com.back.catchmate.domain.chat.dto.ChatResponse.PagedChatMessageInfo;
 import com.back.catchmate.domain.chat.service.ChatService;
 import com.back.catchmate.global.jwt.JwtValidation;
@@ -13,10 +14,10 @@
 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.Payload;
 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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,13 +31,18 @@
 public class ChatController {
     private final ChatService chatService;
 
-    @MessageMapping("/chat.{chatRoomId}")
     @SendTo("/topic/chat.{chatRoomId}")
+    @MessageMapping("/chat.{chatRoomId}")
     public void sendMessage(@DestinationVariable Long chatRoomId,
-                            @RequestBody ChatMessageRequest request) throws IOException, FirebaseMessagingException {
+                            @Payload ChatMessageRequest request) throws IOException, FirebaseMessagingException {
         chatService.sendChatMessage(chatRoomId, request);
     }
 
+    @MessageMapping("/chat/read")
+    public void updateLastReadTime(@Payload ReadChatMessageRequest request) {
+        chatService.updateLastReadTime(request);
+    }
+
     @GetMapping("/{chatRoomId}")
     @Operation(summary = "특정 채팅방의 채팅 내역 조회 API", description = "특정 채팅방의 채팅 내역 조회 API 입니다.")
     public PagedChatMessageInfo findChatMessageList(@JwtValidation Long userId,
diff --git a/src/main/java/com/back/catchmate/domain/chat/dto/ChatRequest.java b/src/main/java/com/back/catchmate/domain/chat/dto/ChatRequest.java
@@ -5,6 +5,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 public abstract class ChatRequest {
     @Getter
     @Builder
@@ -19,4 +21,23 @@ public enum MessageType {
         private Long senderId;   // 보낸 사람
         private String content;  // 메시지 내용
     }
+
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class ReadChatMessageRequest {
+        private Long chatRoomId;   // 보낸 사람
+        private Long userId;  // 메시지 내용
+    }
+
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class LastChatMessageUpdateRequest {
+        private Long chatRoomId;   // 채팅방 ID
+        private String content;     // 마지막 메시지 내용
+        private LocalDateTime sendTime; // 메시지 전송 시간
+    }
 }
diff --git a/src/main/java/com/back/catchmate/domain/chat/service/ChatRoomServiceImpl.java b/src/main/java/com/back/catchmate/domain/chat/service/ChatRoomServiceImpl.java
@@ -63,9 +63,6 @@ public PagedChatRoomInfo getChatRoomList(Long userId, Pageable pageable) {
                 userChatRoomList.isLast());
     }
 
-
-    @Override
-    @Transactional(readOnly = true)
     public long getUnreadMessageCount(Long userId, Long chatRoomId) {
         // 사용자의 마지막 읽은 시간 조회
         UserChatRoom userChatRoom = userChatRoomRepository.findByUserIdAndChatRoomIdAndDeletedAtIsNull(userId, chatRoomId)
@@ -126,7 +123,6 @@ public StateResponse leaveChatRoom(Long userId, Long chatRoomId) {
 
             enroll.delete();
 
-
             // 퇴장 메시지 보내기
             String content = user.getNickName() + " 님이 채팅을 떠났어요";  // 퇴장 메시지 내용
             chatService.sendEnterLeaveMessage(chatRoom.getId(), content, user.getId(), MessageType.LEAVE);
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,5 +1,6 @@
 package com.back.catchmate.domain.chat.service;
 
+import com.back.catchmate.domain.chat.dto.ChatRequest;
 import com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest;
 import com.back.catchmate.domain.chat.dto.ChatResponse.PagedChatMessageInfo;
 import com.google.firebase.messaging.FirebaseMessagingException;
@@ -10,6 +11,8 @@
 public interface ChatService {
     void sendChatMessage(Long chatRoomId, ChatMessageRequest request) throws IOException, FirebaseMessagingException;
 
+    void updateLastReadTime(ChatRequest.ReadChatMessageRequest request);
+
     void sendEnterLeaveMessage(Long chatRoomId, String content, Long senderId, ChatMessageRequest.MessageType messageType);
 
     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,6 +1,7 @@
 package com.back.catchmate.domain.chat.service;
 
 import com.back.catchmate.domain.chat.converter.ChatMessageConverter;
+import com.back.catchmate.domain.chat.dto.ChatRequest;
 import com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest;
 import com.back.catchmate.domain.chat.dto.ChatResponse.PagedChatMessageInfo;
 import com.back.catchmate.domain.chat.entity.ChatMessage;
@@ -23,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -44,7 +44,7 @@ public class ChatServiceImpl implements ChatService {
     // 메시지를 특정 채팅방으로 전송
     @Override
     @Transactional
-    public void sendChatMessage(Long chatRoomId, ChatMessageRequest request) throws IOException, FirebaseMessagingException {
+    public void sendChatMessage(Long chatRoomId, ChatMessageRequest request) throws FirebaseMessagingException {
         User user = userRepository.findById(request.getSenderId())
                 .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_FOUND));
 
@@ -58,14 +58,21 @@ public void sendChatMessage(Long chatRoomId, ChatMessageRequest request) throws
                 chatMessageRepository.insert(dateMessage);
             }
 
+            // 채팅 메시지 저장 및 전송
             ChatMessage chatMessage = chatMessageConverter.toChatMessage(chatRoomId, request.getContent(), request.getSenderId(), MessageType.TALK);
             chatMessageRepository.insert(chatMessage);
+            messagingTemplate.convertAndSend(destination, chatMessage);
 
+            // 채팅방 정보 업데이트
             ChatRoom chatRoom = chatRoomRepository.findById(chatRoomId)
                     .orElseThrow(() -> new BaseException(ErrorCode.CHATROOM_NOT_FOUND));
             chatRoom.updateLastMessageContent(request.getContent());
             chatRoom.updateLastMessageTime();
 
+            // 채팅방 목록 실시간 업데이트
+            ChatRequest.LastChatMessageUpdateRequest lastMessageUpdate = new ChatRequest.LastChatMessageUpdateRequest(chatRoomId, request.getContent(), LocalDateTime.now());
+            messagingTemplate.convertAndSend("/topic/chatList", lastMessageUpdate);
+
             // 채팅방에 참여한 사용자 수 확인
             if (chatRoom.getParticipantCount() > 1) {
                 // 자신을 제외한 채팅방에 FCM 알림 전송
@@ -74,7 +81,6 @@ public void sendChatMessage(Long chatRoomId, ChatMessageRequest request) throws
         }
 
         log.info("Sending message to: {}", destination);
-        messagingTemplate.convertAndSend(destination, request);
     }
 
     private boolean isNewDateMessageNeeded(Long chatRoomId, LocalDateTime newMessageTime) {
@@ -89,6 +95,16 @@ private boolean isNewDateMessageNeeded(Long chatRoomId, LocalDateTime newMessage
         }
     }
 
+    @Override
+    @Transactional
+    public void updateLastReadTime(ChatRequest.ReadChatMessageRequest request) {
+        UserChatRoom userChatRoom = userChatRoomRepository.findByUserIdAndChatRoomIdAndDeletedAtIsNull(request.getUserId(), request.getChatRoomId())
+                .orElseThrow(() -> new BaseException(ErrorCode.USER_CHATROOM_NOT_FOUND));
+
+        userChatRoom.updateLastReadTime();
+        userChatRoomRepository.save(userChatRoom);
+    }
+
     @Override
     @Transactional
     public void sendEnterLeaveMessage(Long chatRoomId, String content, Long senderId, MessageType messageType) {
diff --git a/src/main/java/com/back/catchmate/domain/notification/service/FCMService.java b/src/main/java/com/back/catchmate/domain/notification/service/FCMService.java
@@ -154,7 +154,7 @@ public void sendMessageByToken(String targetToken, String title, String body, Lo
 
     // 특정 채팅방의 모든 사용자에게 FCM 메시지 전송
     @Async("asyncTask")
-    public void sendMessagesByTokens(Long chatRoomId, String title, String body, String senderToken) throws IOException, FirebaseMessagingException {
+    public void sendMessagesByTokens(Long chatRoomId, String title, String body, String senderToken) throws FirebaseMessagingException {
         List<String> targetTokenList = userChatRoomRepository.findByChatRoomIdAndDeletedAtIsNull(chatRoomId)
                 .stream()
                 .map(userChatRoom -> userChatRoom.getUser().getFcmToken()) // User 엔티티에서 FCM 토큰 가져오기
@@ -174,13 +174,6 @@ public void sendMessagesByTokens(Long chatRoomId, String title, String body, Str
         // FCM에 메시지 전송
         BatchResponse response = FirebaseMessaging.getInstance().sendEachForMulticast(message);
 
-        // 전송 결과 확인
-//        if (response.getFailureCount() > 0) {
-//            log.error("일부 메시지 전송에 실패했습니다. 성공한 메시지 수: {}, 실패한 메시지 수: {}",
-//                    response.getSuccessCount(), response.getFailureCount());
-//            throw new BaseException(ErrorCode.FCM_TOKEN_SEND_BAD_REQUEST);
-//        }
-
         log.info("FCM 응답: {}개의 메시지가 성공적으로 전송되었습니다.", response.getSuccessCount());
     }
 }
