[Fix/104] 채팅 전송 시각을 KST String으로 리턴하도록 변경

.github/workflows/gradle.yml

@@ -84,7 +84,9 @@ jobs:
             sudo docker pull rimi3226/gamegoo:${{ github.sha }}
             sudo docker stop gamegoo_api
             sudo docker rm gamegoo_api
-            sudo docker run -it -d -p 8080:8080 --name gamegoo_api rimi3226/gamegoo:${{ github.sha }}
+            sudo docker run -it -d -p 8080:8080 --name gamegoo_api \
+              -e JAVA_OPTS="-Duser.timezone=Asia/Seoul" \
+              rimi3226/gamegoo:${{ github.sha }}
 
       # REMOVE Github IP FROM security group (12)
       - name: Remove IP FROM security group

src/main/java/com/gamegoo/converter/ChatConverter.java

@@ -3,7 +3,7 @@
 import com.gamegoo.domain.chat.Chat;
 import com.gamegoo.domain.chat.Chatroom;
 import com.gamegoo.dto.chat.ChatResponse;
-import java.time.format.DateTimeFormatter;
+import com.gamegoo.util.DatetimeUtil;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.data.domain.Slice;
@@ -21,15 +21,13 @@ public static ChatResponse.ChatroomCreateResultDTO toChatroomCreateResultDTO(Cha
     }
 
     public static ChatResponse.ChatCreateResultDTO toChatCreateResultDTO(Chat chat) {
-        // ISO 8601 형식의 문자열로 변환
-        String createdAtIoString = chat.getCreatedAt().format(DateTimeFormatter.ISO_DATE_TIME);
 
         return ChatResponse.ChatCreateResultDTO.builder()
             .senderId(chat.getFromMember().getId())
             .senderProfileImg(chat.getFromMember().getProfileImage())
             .senderName(chat.getFromMember().getGameName())
             .message(chat.getContents())
-            .createdAt(createdAtIoString)
+            .createdAt(DatetimeUtil.toKSTString(chat.getCreatedAt()))
             .timestamp(chat.getTimestamp())
             .build();
     }
@@ -48,15 +46,13 @@ public static ChatResponse.ChatMessageListDTO toChatMessageListDTO(Slice<Chat> c
     }
 
     public static ChatResponse.ChatMessageDTO toChatMessageDto(Chat chat) {
-        // ISO 8601 형식의 문자열로 변환
-        String createdAtIoString = chat.getCreatedAt().format(DateTimeFormatter.ISO_DATE_TIME);
 
         return ChatResponse.ChatMessageDTO.builder()
             .senderId(chat.getFromMember().getId())
             .senderName(chat.getFromMember().getGameName())
             .senderProfileImg(chat.getFromMember().getProfileImage())
             .message(chat.getContents())
-            .createdAt(createdAtIoString)
+            .createdAt(DatetimeUtil.toKSTString(chat.getCreatedAt()))
             .timestamp(chat.getTimestamp())
             .build();
 

src/main/java/com/gamegoo/service/chat/ChatCommandService.java

@@ -2,6 +2,7 @@
 
 import com.gamegoo.apiPayload.code.status.ErrorStatus;
 import com.gamegoo.apiPayload.exception.handler.ChatHandler;
+import com.gamegoo.converter.ChatConverter;
 import com.gamegoo.domain.Member;
 import com.gamegoo.domain.chat.Chat;
 import com.gamegoo.domain.chat.Chatroom;
@@ -15,11 +16,8 @@
 import com.gamegoo.repository.member.MemberRepository;
 import com.gamegoo.service.member.ProfileService;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Slice;
 import org.springframework.stereotype.Service;
@@ -69,31 +67,9 @@ public ChatResponse.ChatroomEnterDTO startChatroom(ChatRequest.ChatroomStartRequ
             // 해당 채팅방의 lastViewDate 업데이트
             memberChatroom.updateLastViewDate(LocalDateTime.now());
 
-            // chatMessageDtoList 생성
-            List<ChatResponse.ChatMessageDTO> chatMessageDtoList = recentChats.stream()
-                .map(chat -> {
-                    // ISO 8601 형식의 문자열로 변환
-                    String createdAtIoString = chat.getCreatedAt()
-                        .format(DateTimeFormatter.ISO_DATE_TIME);
-
-                    return ChatResponse.ChatMessageDTO.builder()
-                        .senderId(chat.getFromMember().getId())
-                        .senderName(chat.getFromMember().getGameName())
-                        .senderProfileImg(chat.getFromMember().getProfileImage())
-                        .message(chat.getContents())
-                        .createdAt(createdAtIoString)
-                        .timestamp(chat.getTimestamp())
-                        .build();
-                }).collect(Collectors.toList());
-
             // ChatMessageListDTO 생성
-            ChatResponse.ChatMessageListDTO chatMessageListDTO = ChatResponse.ChatMessageListDTO.builder()
-                .chatMessageDtoList(chatMessageDtoList)
-                .list_size(chatMessageDtoList.size())
-                .has_next(recentChats.hasNext())
-                .next_cursor(recentChats.hasNext() ? recentChats.getContent().get(0).getTimestamp()
-                    : null) // next cursor를 현재 chat list의 가장 오래된 chat의 timestamp로 주기
-                .build();
+            ChatResponse.ChatMessageListDTO chatMessageListDTO = ChatConverter.toChatMessageListDTO(
+                recentChats);
 
             return ChatroomEnterDTO.builder()
                 .uuid(chatroom.get().getUuid())
@@ -264,31 +240,9 @@ public ChatResponse.ChatroomEnterDTO enterChatroom(String chatroomUuid, Long mem
         // 해당 채팅방의 lastViewDate 업데이트
         memberChatroom.updateLastViewDate(LocalDateTime.now());
 
-        // chatMessageDtoList 생성
-        List<ChatResponse.ChatMessageDTO> chatMessageDtoList = recentChats.stream()
-            .map(chat -> {
-                // ISO 8601 형식의 문자열로 변환
-                String createdAtIoString = chat.getCreatedAt()
-                    .format(DateTimeFormatter.ISO_DATE_TIME);
-
-                return ChatResponse.ChatMessageDTO.builder()
-                    .senderId(chat.getFromMember().getId())
-                    .senderName(chat.getFromMember().getGameName())
-                    .senderProfileImg(chat.getFromMember().getProfileImage())
-                    .message(chat.getContents())
-                    .createdAt(createdAtIoString)
-                    .timestamp(chat.getTimestamp())
-                    .build();
-            }).collect(Collectors.toList());
-
         // ChatMessageListDTO 생성
-        ChatResponse.ChatMessageListDTO chatMessageListDTO = ChatResponse.ChatMessageListDTO.builder()
-            .chatMessageDtoList(chatMessageDtoList)
-            .list_size(chatMessageDtoList.size())
-            .has_next(recentChats.hasNext())
-            .next_cursor(recentChats.hasNext() ? recentChats.getContent().get(0).getTimestamp()
-                : null) // next cursor를 현재 chat list의 가장 오래된 chat의 timestamp로 주기
-            .build();
+        ChatResponse.ChatMessageListDTO chatMessageListDTO = ChatConverter.toChatMessageListDTO(
+            recentChats);
 
         return ChatroomEnterDTO.builder()
             .uuid(chatroomUuid)
@@ -319,11 +273,6 @@ public Chat addChat(ChatRequest.ChatCreateRequest request, String chatroomUuid,
                 memberId, chatroom.getId())
             .orElseThrow(() -> new ChatHandler(ErrorStatus.CHATROOM_ACCESS_DENIED));
 
-//        // 해당 회원이 이미 나간 채팅방인지 검증
-//        if (memberChatroom.getLastJoinDate() == null) {
-//            throw new ChatHandler(ErrorStatus.CHATROOM_ACCESS_DENIED);
-//        }
-
         // chat 엔티티 생성
         Chat chat = Chat.builder()
             .contents(request.getMessage())
@@ -334,7 +283,6 @@ public Chat addChat(ChatRequest.ChatCreateRequest request, String chatroomUuid,
         // MemberChatroom의 lastViewDate 업데이트
         Chat savedChat = chatRepository.save(chat);
         updateLastViewDateByAddChat(memberChatroom, savedChat.getCreatedAt());
-        //memberChatroom.updateLastViewDate(savedChat.getCreatedAt());
 
         return savedChat;
     }

src/main/java/com/gamegoo/service/chat/ChatQueryService.java

@@ -11,7 +11,7 @@
 import com.gamegoo.repository.chat.ChatroomRepository;
 import com.gamegoo.repository.chat.MemberChatroomRepository;
 import com.gamegoo.service.member.ProfileService;
-import java.time.format.DateTimeFormatter;
+import com.gamegoo.util.DatetimeUtil;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -72,23 +72,15 @@ public List<ChatResponse.ChatroomViewDTO> getChatroomList(Long memberId) {
                 Integer unReadCnt = chatRepository.countUnreadChats(
                     chatroom.getId(), memberChatroom.getId());
 
-                String lastAtIoString = null;
-                // ISO 8601 형식의 문자열로 변환
-                if (lastChat.isPresent()) {
-                    lastAtIoString = lastChat.get().getCreatedAt()
-                        .format(DateTimeFormatter.ISO_DATE_TIME);
-                } else {
-                    lastAtIoString = memberChatroom.getLastJoinDate()
-                        .format(DateTimeFormatter.ISO_DATE_TIME);
-                }
-
                 return ChatResponse.ChatroomViewDTO.builder()
                     .chatroomId(chatroom.getId())
                     .uuid(chatroom.getUuid())
                     .targetMemberImg(targetMember.getProfileImage())
                     .targetMemberName(targetMember.getGameName())
                     .lastMsg(lastChat.isPresent() ? lastChat.get().getContents() : null)
-                    .lastMsgAt(lastAtIoString)
+                    .lastMsgAt(lastChat.isPresent() ? DatetimeUtil.toKSTString(
+                        lastChat.get().getCreatedAt())
+                        : DatetimeUtil.toKSTString(memberChatroom.getLastJoinDate()))
                     .notReadMsgCnt(unReadCnt)
                     .build();
 

src/main/java/com/gamegoo/util/DatetimeUtil.java

@@ -0,0 +1,21 @@
+package com.gamegoo.util;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class DatetimeUtil {
+
+    /**
+     * KST 시간대 ISO 8601 형식의 문자열로 변환
+     *
+     * @param localDateTime
+     * @return
+     */
+    public static String toKSTString(LocalDateTime localDateTime) {
+        ZonedDateTime zonedDateTime = localDateTime.atZone(ZoneId.of("Asia/Seoul"));
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+        return zonedDateTime.format(formatter);
+    }
+}