Merge pull request #134 from Re-4aliens/fix/#133_chat-last-message-se…

…nd-time 채팅 요약 정보에서 마지막 메시지의 시간 추가
Re-4aliens · Jul 18, 2024 · 6f97835 · 6f97835
2 parents 5cd9231 + 109d421
commit 6f97835
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/.github/workflows/friendship-pipeline.yml b/.github/workflows/friendship-pipeline.yml
@@ -75,8 +75,21 @@ jobs:
           key: ${{ secrets.PRIVATE_KEY }} # pem 키
           # 도커 작업
           script: |
+            # 최신 friendship 이미지 pull
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ env.APP_NAME }}:latest
-            sudo docker stop $(docker ps --filter "ancestor=${{ secrets.DOCKER_USERNAME }}/${{ env.APP_NAME }}" -q)
-            sudo docker run -d --log-driver=syslog -p 443:8080 -e TZ=Asia/Seoul ${{ secrets.DOCKER_USERNAME }}/${{ env.APP_NAME }}:latest
-            sudo docker rm $(docker ps --filter "status=exited" --filter "ancestor=${{ secrets.DOCKER_USERNAME }}/${{ env.APP_NAME }}" -q)
+            
+            # 기존 friendship 컨테이너 중지 및 삭제
+            sudo docker stop friendship || true
+            sudo docker rm friendship || true
+            
+            # 새 friendship 컨테이너 실행
+            sudo docker run -d --log-driver=syslog -p 443:8080 --name friendship -e TZ=Asia/Seoul ${{ secrets.DOCKER_USERNAME }}/${{ env.APP_NAME }}:latest
+            
+            # friendship 관련 종료된 컨테이너 삭제
+            sudo docker container prune -f
+            
+            # 사용하지 않는 friendship 이미지만 삭제 (최신 버전 제외)
             sudo docker image prune -f
+            
+            # 이전 버전의 friendship 이미지 삭제
+            sudo docker images ${{ secrets.DOCKER_USERNAME }}/${{ env.APP_NAME }} -q | awk 'NR>1' | xargs -r sudo docker rmi -f
diff --git a/src/main/java/com/aliens/backend/chat/domain/repository/CustomMessageRepositoryImpl.java b/src/main/java/com/aliens/backend/chat/domain/repository/CustomMessageRepositoryImpl.java
@@ -55,6 +55,7 @@ public List<ChatMessageSummary> aggregateMessageSummaries(List<Long> chatRoomIds
         AggregationOperation match = Aggregation.match(Criteria.where("roomId").in(chatRoomIds));
         AggregationOperation group = Aggregation.group("roomId")
                 .last("content").as("lastMessageContent")
+                .last("sendTime").as("lastMessageTime")
                 .sum(ConditionalOperators.when(Criteria.where("receiverId").is(memberId).and("isRead").is(false)).then(1).otherwise(0)).as("unreadCount");
         Aggregation aggregation = Aggregation.newAggregation(match, group);
         AggregationResults<ChatMessageSummary> results = mongoTemplate.aggregate(aggregation, "message", ChatMessageSummary.class);

diff --git a/src/main/java/com/aliens/backend/chat/service/model/ChatMessageSummary.java b/src/main/java/com/aliens/backend/chat/service/model/ChatMessageSummary.java
@@ -1,4 +1,6 @@
 package com.aliens.backend.chat.service.model;
 
-public record ChatMessageSummary(Long roomId, String lastMessageContent, Long numberOfUnreadMessages) {
+import java.util.Date;
+
+public record ChatMessageSummary(Long roomId, String lastMessageContent, Date lastMessageTime, Long numberOfUnreadMessages) {
 }
diff --git a/src/test/java/com/aliens/backend/chatting/service/ChatServiceTest.java b/src/test/java/com/aliens/backend/chatting/service/ChatServiceTest.java
@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.Date;
 import java.util.List;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -36,10 +37,11 @@ void setUp() {
         receiver = dummyGenerator.generateSingleMember();;
 
         Message message = Message.of(makeMessageSendRequest());
+        Date now = new Date();
         doReturn(message).when(messageRepository).save(any());
         doNothing().when(messageRepository).markMessagesAsRead(any(),any());
 
-        ChatMessageSummary summary = new ChatMessageSummary(1L,"g",1L);
+        ChatMessageSummary summary = new ChatMessageSummary(1L,"this is the last message", now,1L);
         List<ChatMessageSummary> givenSummary = List.of(summary,summary) ;
         doReturn(givenSummary).when(messageRepository).aggregateMessageSummaries(any(),any());
 

diff --git a/src/test/java/com/aliens/backend/docs/ChatRestDocsTest.java b/src/test/java/com/aliens/backend/docs/ChatRestDocsTest.java
@@ -14,6 +14,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -77,10 +78,11 @@ void getChatSummary() throws Exception {
         when(chatRoom2.getStatus()).thenReturn(ChatRoomStatus.OPEN);
         chatRooms.add(chatRoom1);
         chatRooms.add(chatRoom2);
+        Date now = new Date();
 
         List<ChatMessageSummary> chatMessageSummaries = List.of(
-                new ChatMessageSummary(1L, "Last message in Room 1", 5L),
-                new ChatMessageSummary(2L, "Last message in Room 2", 3L)
+                new ChatMessageSummary(1L, "Last message in Room 1", now, 5L),
+                new ChatMessageSummary(2L, "Last message in Room 2", new Date(now.getTime() - 3600000), 3L)
         );
 
         ChatSummaryResponse result = new ChatSummaryResponse(chatRooms, chatMessageSummaries);
@@ -103,6 +105,7 @@ void getChatSummary() throws Exception {
                                 fieldWithPath("result.chatMessageSummaries").description("각 채팅방의 요약 정보"),
                                 fieldWithPath("result.chatMessageSummaries[].roomId").description("채팅방 ID"),
                                 fieldWithPath("result.chatMessageSummaries[].lastMessageContent").description("채팅방의 마지막 메시지 내용"),
+                                fieldWithPath("result.chatMessageSummaries[].lastMessageTime").description("채팅방의 마지막 메시지 시간"),
                                 fieldWithPath("result.chatMessageSummaries[].numberOfUnreadMessages").description("읽지 않은 메시지의 수")
                         )
                 ));