Merge pull request #111 from prgrms-web-devcourse-final-project/Refactor/QFEED-161-chatMessage

[QFEED-161] Refactor : chatMessage receiver이 방에 존재하면 읽음 상태로 , 없으면 알림 보내기

Author: wjdwltn

module-api/src/main/resources/static/test1.html

@@ -26,7 +26,7 @@
             // Subscribe to a topic
             stompClient.subscribe('/sub/chat/13', (message) => {
                 console.log('Received: ' + message.body);
-            }, { senderId: 'b32e9109-b912-4531-930c-a02b066671a6'});
+            }, { senderId: '29ae601c-9930-4145-8174-18a466aec50a'});
         }, (error) => {
             console.error('Error during STOMP connection:', error);
         });
@@ -37,7 +37,7 @@
             // Send a message to the destination endpoint
             const payload = JSON.stringify({
                 roomId: 13,
-                senderId: 'b32e9109-b912-4531-930c-a02b066671a6',
+                senderId: '29ae601c-9930-4145-8174-18a466aec50a',
                 receiverId:'abac57c8-4039-4c17-91fe-e9114c6c59ff',
                 message: '로컬 반대!',
                 type:'IMAGE',

module-application/src/main/java/com/wsws/moduleapplication/chat/service/ChatMessageService.java

@@ -51,30 +51,27 @@ public void sendMessage(Long chatRoomId, String senderId, String receiverId, Cha
 
         //String fileProcess = processChatImage(request.file());
 
-        //boolean receiverInChatRoom = isReceiverInChatRoom(chatRoomId, receiverId);
-
-        Boolean isin = true;
+        boolean receiverInChatRoom = isReceiverInChatRoom(chatRoomId, receiverId);
 
         // 메시지 생성
-        ChatMessage chatMessage = createChatMessage(chatRoomId, senderId, receiverId, isin ,request);
+        ChatMessage chatMessage = createChatMessage(chatRoomId, senderId, receiverId, receiverInChatRoom ,request);
 
         //db에 메세지 저장(비동기)
         chatPersistenceService.saveMessageInRedisAsync(chatRoomId,chatMessage);
 
         //구독 및 redis 발행
         chatWebSocketService.notifyWebSocketSubscribers(chatRoomId, chatMessage, user);
 
-//        if(!receiverInChatRoom) {
-//            //알림보내기
-//            log.info("상대방이 접속해있지 않습니다. 알림을 보냅니다.");
-//
-//            // 채팅 이벤트 발행
-//            eventPublisher.publishEvent(new SendMessageEvent(
-//                    senderId,
-//                    receiverId,
-//                    FcmType.CHAT
-//            ));
-//        }
+        if(!receiverInChatRoom) {
+            log.info("상대방이 접속해있지 않습니다. 알림을 보냅니다.");
+
+            // 채팅 이벤트 발행
+            eventPublisher.publishEvent(new SendMessageEvent(
+                    senderId,
+                    receiverId,
+                    FcmType.CHAT
+            ));
+        }
     }
 
     //채팅방의 메세지 조회
@@ -94,27 +91,26 @@ public void markAllMessagesAsRead(Long chatRoomId) {
         chatMessageRepository.markAllMessagesAsRead(chatRoomId);
     }
 
-//    private boolean isReceiverInChatRoom(Long chatRoomId, String receiverId) {
-//        try{
-//            String userCurrentRoom = redisService.getUserCurrentRoom(receiverId);
-//            log.info("수신자 {}가 현재 채팅방 {}에 존재합니다.",receiverId,chatRoomId);
-//
-//            boolean isInRoom = userCurrentRoom != null && userCurrentRoom.equals(chatRoomId.toString());
-//            log.info("userCurrentRoom.equals(chatRoomId.toString()): {}", isInRoom);
-//            return isInRoom;
-//        } catch (Exception e) {
-//            throw ChatReceiverNotFoundException.EXCEPTION;
-//        }
-//    }
+    private boolean isReceiverInChatRoom(Long chatRoomId, String receiverId) {
+        try{
+            String userCurrentRoom = redisService.getUserCurrentRoom(receiverId);
+
+            boolean isInRoom = userCurrentRoom != null && userCurrentRoom.equals(chatRoomId.toString());
+            log.info("수신자 {}의 채팅방 {}에 존재 여부 : {}",receiverId,chatRoomId,isInRoom);
+            return isInRoom;
+        } catch (Exception e) {
+            throw ChatReceiverNotFoundException.EXCEPTION;
+        }
+    }
 
     //메세지 생성
-    private ChatMessage createChatMessage(Long chatRoomId, String senderId, String receiverId,Boolean isin,ChatMessageRequest request) {
+    private ChatMessage createChatMessage(Long chatRoomId, String senderId, String receiverId,boolean isReceiverIn,ChatMessageRequest request) {
         return ChatMessage.create(
                 null,
                 request.content(),
                 request.type(),
                 request.file(),
-                isin,
+                isReceiverIn,
                 LocalDateTime.now(),
                 senderId,
                 receiverId,