Merge pull request #24 from Sysone-Mini-2nd/dev

feat/ 배포된 주소 연결

Author: DHowor1d

.github/workflows/deploy.yml

@@ -88,7 +88,7 @@ jobs:
             ${{ secrets.GCP_INSTANCE_NAME }}:~/ \
             --project=${{ secrets.GCP_PROJECT_ID }} \
             --zone=${{ secrets.GCP_ZONE }}
-
+            
       # 8. VM에서 배포 스크립트 실행
       - name: Execute Deploy Script on VM
         run: |

src/main/java/com/sys/stm/domains/messenger/controller/ChatMessageController.java

@@ -3,6 +3,7 @@
 import com.sys.stm.domains.messenger.dto.request.ChatMessageRequestDto;
 import com.sys.stm.domains.messenger.dto.request.MessageReadRequestDto;
 import com.sys.stm.domains.messenger.dto.response.ChatMessageResponseDto;
+import com.sys.stm.domains.messenger.dto.response.ChatRoomListUpdateResponseDto;
 import com.sys.stm.domains.messenger.dto.response.MessageReadResponseDto;
 import com.sys.stm.domains.messenger.dto.response.TotalUnreadCountResponseDto;
 import com.sys.stm.domains.messenger.service.ChatMessageServiceImpl;
@@ -37,22 +38,32 @@ public void sendMessage(ChatMessageRequestDto message) {
         // 메시지를 구독자들(채팅방 참여자)에게 전송
         messagingTemplate.convertAndSend("/topic/chatroom/" + message.getChatRoomId(), chatMessageResponseDto);
 
-        // 3. 채팅방 참여자들에게 최신 전체 안읽음 카운트 전송
+        // 채팅방 참여자들에게 최신 전체 안읽음 카운트 전송
         List<Long> participantIds =
                 chatRoomParticipantService.findParticipantIdsByRoomId(message.getChatRoomId());
 
+        // 채팅방의 최신 메시지 조회
+        String recentMessage = chatRoomService.getRecentMessageById(message.getChatRoomId());
+
         for (Long participantId : participantIds) {
             if (participantId.equals(message.getSenderId())) {
                 continue; // 메시지 보낸 사람은 제외
             }
 
-            // 4. 해당 참여자의 전체 안 읽은 메시지 개수를 다시 계산
+            // 채팅방 목록 구독자들에게 최신 정보 전송
+            long totalUnreadCountForRoom = chatRoomService.getUnreadCount(participantId, message.getChatRoomId());
+            messagingTemplate.convertAndSend(
+                    "/topic/chatroom-list",
+                    new ChatRoomListUpdateResponseDto(message.getChatRoomId(), totalUnreadCountForRoom, recentMessage,participantId)
+            );
+
+            // 해당 참여자의 전체 안 읽은 메시지 개수를 다시 계산
             long totalUnreadCount = chatRoomService.getTotalUnreadCount(participantId);
 
-            // 5. 개인 큐로 최신 총합 전송
+            // 개인 큐로 최신 총합 전송
             messagingTemplate.convertAndSend(
-                    "/queue/total-unread/" + participantId.toString()
-                    , new TotalUnreadCountResponseDto(totalUnreadCount)
+                    "/topic/update",
+                    new TotalUnreadCountResponseDto(totalUnreadCount, recentMessage, participantId, message.getChatRoomId())
             );
         }
 

src/main/java/com/sys/stm/domains/messenger/controller/ChatRoomController.java

@@ -145,7 +145,7 @@ public ApiResponse<TotalUnreadCountResponseDto> getTotalUnreadCount(@Authenticat
         long memberId = userDetails.getId();
 
         long totalCount = chatRoomService.getTotalUnreadCount(memberId);
-        return ApiResponse.ok(new TotalUnreadCountResponseDto(totalCount));
+        return ApiResponse.ok(new TotalUnreadCountResponseDto(totalCount, null, -1, -1));
 
     }
 

src/main/java/com/sys/stm/domains/messenger/dao/ChatRoomRepository.java

@@ -18,5 +18,9 @@ public interface ChatRoomRepository {
     int updateChatRoom(@Param("id") long id, @Param("dto") ChatRoomUpdateRequestDto dto);
 
     int updateRecentMessage (@Param("chatRoomId") long chatRoomId, @Param("msg") String message);
+
+    String getRecentMessageById(@Param("chatRoomId") long chatRoomId);
+
+    long getUnreadCount(@Param("memberId") Long participantId, @Param("chatRoomId") Long chatRoomId);
 }
 

src/main/java/com/sys/stm/domains/messenger/dto/response/ChatRoomListUpdateResponseDto.java

@@ -0,0 +1,24 @@
+package com.sys.stm.domains.messenger.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@ToString
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatRoomListUpdateResponseDto {
+
+    @JsonProperty("chatRoomId")
+    private long chatRoomId;
+    @JsonProperty("totalUnreadCount")
+    private long totalUnreadCount;
+    @JsonProperty("recentMessage")
+    private String recentMessage;
+    @JsonProperty("memberId")
+    private long memberId;
+
+}

src/main/java/com/sys/stm/domains/messenger/dto/response/TotalUnreadCountResponseDto.java

@@ -1,12 +1,20 @@
 package com.sys.stm.domains.messenger.dto.response;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @AllArgsConstructor
 @Getter
 public class TotalUnreadCountResponseDto {
+    @JsonProperty("totalUnreadCount")
     private long totalUnreadCount;
+    @JsonProperty("recentMessage")
+    private String recentMessage;
+    @JsonProperty("memberId")
+    private long memberId;
+    @JsonProperty("chatRoomId")
+    private long chatRoomId;
 }
 
 

src/main/java/com/sys/stm/domains/messenger/service/ChatRoomService.java

@@ -133,4 +133,12 @@ public long getTotalUnreadCount(long memberId) {
     public int updateRecentMessage(long chatRoomId, String message){
         return chatRoomRepository.updateRecentMessage(chatRoomId, message);
     }
+
+    public String getRecentMessageById(long chatRoomId){
+        return chatRoomRepository.getRecentMessageById(chatRoomId);
+    }
+
+    public long getUnreadCount(Long participantId, Long chatRoomId) {
+        return chatRoomRepository.getUnreadCount(participantId, chatRoomId);
+    }
 }

src/main/resources/mappers/ChatRoomMapper.xml

@@ -50,4 +50,22 @@
         WHERE "id" = #{chatRoomId}
     </update>
 
+    <select id="getRecentMessageById">
+        SELECT "recent_message"
+        FROM "chat_room"
+        WHERE "id" = #{chatRoomId}
+    </select>
+
+    <select id="getUnreadCount">
+        SELECT
+        (SELECT COUNT(*)
+        FROM "message" m
+        WHERE m."chat_room_id" = crp."chat_room_id" AND m."created_at" > crp."last_read_at") AS unreadMessageCount
+        FROM
+        "chat_room_participants" crp
+        JOIN
+        "chat_room" cr ON crp."chat_room_id" = cr."id"
+        WHERE
+        crp."member_id" = #{memberId} AND cr."id" = #{chatRoomId}
+    </select>
 </mapper>

src/main/resources/mappers/IssueMapper.xml

@@ -195,7 +195,7 @@
         SET
             "member_id" = #{memberId, jdbcType=NUMERIC},
             "title" = #{title},
-            "desc" = #{desc},
+            "desc" = #{desc, jdbcType=VARCHAR},
             "status" = #{status},
             "priority" = #{priority},
             "start_date" = #{startDate},