diff --git a/src/main/java/com/back/catchmate/domain/chat/converter/ChatMessageConverter.java b/src/main/java/com/back/catchmate/domain/chat/converter/ChatMessageConverter.java index f53f13e..741d364 100644 --- a/src/main/java/com/back/catchmate/domain/chat/converter/ChatMessageConverter.java +++ b/src/main/java/com/back/catchmate/domain/chat/converter/ChatMessageConverter.java @@ -36,6 +36,7 @@ private ChatMessageInfo toChatMessageInfo(ChatMessage chatMessage) { .roomId(chatMessage.getChatRoomId()) .content(chatMessage.getContent()) .senderId(chatMessage.getSenderId()) + .messageType(MessageType.valueOf(chatMessage.getMessageType())) .build(); } diff --git a/src/main/java/com/back/catchmate/domain/chat/dto/ChatResponse.java b/src/main/java/com/back/catchmate/domain/chat/dto/ChatResponse.java index b40e27c..0f68b1d 100644 --- a/src/main/java/com/back/catchmate/domain/chat/dto/ChatResponse.java +++ b/src/main/java/com/back/catchmate/domain/chat/dto/ChatResponse.java @@ -1,6 +1,7 @@ package com.back.catchmate.domain.chat.dto; import com.back.catchmate.domain.board.dto.BoardResponse.BoardInfo; +import com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest.MessageType; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -20,6 +21,7 @@ public static class ChatMessageInfo { private Long roomId; private String content; private Long senderId; + private MessageType messageType; } @Getter 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 index a54cfc4..a91e449 100644 --- 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,7 +1,7 @@ package com.back.catchmate.domain.chat.service; import com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest; -import com.back.catchmate.domain.chat.dto.ChatResponse; +import com.back.catchmate.domain.chat.dto.ChatResponse.PagedChatMessageInfo; import org.springframework.data.domain.Pageable; public interface ChatService { @@ -9,5 +9,5 @@ public interface ChatService { void sendEnterLeaveMessage(Long chatRoomId, String content, Long senderId, ChatMessageRequest.MessageType messageType); - ChatResponse.PagedChatMessageInfo getChatMessageList(Long userId, Long roomId, Pageable pageable); + PagedChatMessageInfo getChatMessageList(Long userId, Long roomId, Pageable pageable); }