Feat/#90

src/main/java/kdt/web_ide/chat/dto/response/GetChatMessageResponseDto.java

@@ -11,7 +11,8 @@ public record GetChatMessageResponseDto(
     String messageText,
     String memberProfileImageUrl,
     String memberNickname,
-    String sendTime) {
+    String sendTime,
+    String type) {
   public static GetChatMessageResponseDto fromChatMessage(ChatMessage chatMessage) {
     return GetChatMessageResponseDto.builder()
         .senderId(chatMessage.getSender().getMemberId())
@@ -20,6 +21,7 @@ public static GetChatMessageResponseDto fromChatMessage(ChatMessage chatMessage)
         .memberNickname(chatMessage.getSender().getNickName())
         .sendTime(
             chatMessage.getSendTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+        .type(chatMessage.getType())
         .build();
   }
 }

src/main/java/kdt/web_ide/chat/entity/ChatMessage.java

@@ -24,6 +24,8 @@ public class ChatMessage {
   @Column(columnDefinition = "LONGTEXT")
   private String messageText;
 
+  private String type;
+
   @CreatedDate
   @Column(updatable = false)
   private LocalDateTime sendTime;

src/main/java/kdt/web_ide/chat/service/ChatService.java

@@ -53,7 +53,7 @@ public void sendMessage(Long chatRoomId, ChatMessageRequestDto requestDto) {
             .findById(requestDto.senderId())
             .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
 
-    ChatMessage message = saveMessage(chatRoom, sender, requestDto.content());
+    ChatMessage message = saveMessage(chatRoom, sender, requestDto.content(), "text");
 
     CompletableFuture.runAsync(
         () -> {
@@ -83,14 +83,16 @@ public List<GetChatMessageResponseDto> getChatMessage(Long roomId, Long memberId
     return responseDtoList;
   }
 
-  private ChatMessage saveMessage(ChatRoom chatRoom, Member sender, String messageText) {
+  private ChatMessage saveMessage(
+      ChatRoom chatRoom, Member sender, String messageText, String type) {
 
     ChatMessage message =
         ChatMessage.builder()
             .chatRoom(chatRoom)
             .sender(sender)
             .messageText(messageText)
             .sendTime(LocalDateTime.now())
+            .type(type)
             .build();
 
     return chatMessageRepository.save(message);
@@ -118,21 +120,33 @@ private void notifyUnreadMessageCount(Long roomId, Long senderId) {
   @Transactional
   public void sendImage(Long senderId, Long chatRoomId, List<MultipartFile> multipartFileList) {
 
-    chatRoomRepository
-        .findById(chatRoomId)
-        .orElseThrow(() -> new CustomException(ErrorCode.CHATROOM_NOT_FOUND));
+    ChatRoom chatRoom =
+        chatRoomRepository
+            .findById(chatRoomId)
+            .orElseThrow(() -> new CustomException(ErrorCode.CHATROOM_NOT_FOUND));
 
-    memberRepository
-        .findById(senderId)
-        .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+    Member sender =
+        memberRepository
+            .findById(senderId)
+            .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
 
     List<String> imageUrlList = s3Service.uploadImages(multipartFileList);
 
     for (String imageUrl : imageUrlList) {
 
       ChatMessageRequestDto requestDto = new ChatMessageRequestDto(senderId, imageUrl);
 
-      sendMessage(chatRoomId, requestDto);
+      ChatMessage message = saveMessage(chatRoom, sender, requestDto.content(), "image");
+
+      CompletableFuture.runAsync(
+          () -> {
+            simpMessagingTemplate.convertAndSend(
+                "/room/" + chatRoomId, GetChatMessageResponseDto.fromChatMessage(message));
+          });
+
+      chatRoomMemberRepository.incrementNotReadCount(chatRoomId, sender.getMemberId());
+
+      notifyUnreadMessageCount(chatRoomId, sender.getMemberId());
     }
   }
 }