diff --git a/src/main/java/com/assu/server/domain/chat/dto/ChatMessageDTO.java b/src/main/java/com/assu/server/domain/chat/dto/ChatMessageDTO.java index 1e0f3ac..9886cba 100644 --- a/src/main/java/com/assu/server/domain/chat/dto/ChatMessageDTO.java +++ b/src/main/java/com/assu/server/domain/chat/dto/ChatMessageDTO.java @@ -1,5 +1,6 @@ package com.assu.server.domain.chat.dto; +import com.assu.server.domain.chat.entity.enums.MessageType; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; @@ -30,4 +31,6 @@ public class ChatMessageDTO { @JsonProperty("isMyMessage") private boolean isMyMessage; + + private MessageType messageType; } diff --git a/src/main/java/com/assu/server/domain/chat/repository/MessageRepository.java b/src/main/java/com/assu/server/domain/chat/repository/MessageRepository.java index 9fe4581..53e12d3 100644 --- a/src/main/java/com/assu/server/domain/chat/repository/MessageRepository.java +++ b/src/main/java/com/assu/server/domain/chat/repository/MessageRepository.java @@ -37,7 +37,8 @@ SELECT COUNT(m) m.isRead, CASE WHEN m.sender.id = :memberId THEN true ELSE false - END + END, + m.type ) FROM Message m WHERE m.chattingRoom.id = :roomId