Merge pull request #22 from sanikani/main

[Feat] : 사용자 채팅 기능 구현

src/main/java/com/HP028/chatbot/chat/controller/ChatMessageController.java

@@ -1,5 +1,6 @@
 package com.HP028.chatbot.chat.controller;
 
+import com.HP028.chatbot.chat.dto.ChatMessageDto;
 import com.HP028.chatbot.chat.dto.SendChatMessageRequest;
 import com.HP028.chatbot.chat.dto.SendChatMessageResponse;
 import com.HP028.chatbot.chat.service.ChatMessageService;
@@ -9,6 +10,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/chat")
@@ -20,4 +23,9 @@ public class ChatMessageController {
     public ResponseEntity<ApiResponse<SendChatMessageResponse>> sendAndReceiveMessage(@RequestBody SendChatMessageRequest request) {
         return ApiResponse.success(ApiSuccessStatus.MESSAGE_SEND_AND_RECEIVE_SUCCESS,chatMessageService.sendMessage(request));
     }
+
+    @GetMapping("/{chatRoomId}")
+    public ResponseEntity<ApiResponse<List<ChatMessageDto>>> getChatMessages(@PathVariable Long chatRoomId){
+        return ApiResponse.success(ApiSuccessStatus.RETRIEVE_SUCCESS, chatMessageService.getChatMessages(chatRoomId));
+    }
 }

src/main/java/com/HP028/chatbot/chat/dto/ChatMessageDto.java

@@ -0,0 +1,20 @@
+package com.HP028.chatbot.chat.dto;
+
+import com.HP028.chatbot.chat.domain.SenderType;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChatMessageDto {
+
+    private String chatMessage;
+
+    private SenderType senderType;
+
+    private LocalDateTime timestamp;
+}

src/main/java/com/HP028/chatbot/chat/service/ChatMessageService.java

@@ -1,6 +1,7 @@
 package com.HP028.chatbot.chat.service;
 
 import com.HP028.chatbot.chat.domain.ChatMessage;
+import com.HP028.chatbot.chat.dto.ChatMessageDto;
 import com.HP028.chatbot.chat.dto.SendChatMessageRequest;
 import com.HP028.chatbot.chat.dto.LLMMessageResponse;
 import com.HP028.chatbot.chat.dto.SendChatMessageResponse;
@@ -10,10 +11,15 @@
 import com.HP028.chatbot.common.response.ApiFailStatus;
 import com.HP028.chatbot.exception.NotFoundException;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class ChatMessageService {
 
     private final ChatMessageRepository chatMessageRepository;
@@ -37,4 +43,16 @@ public SendChatMessageResponse sendMessage(SendChatMessageRequest request) {
 
         return new SendChatMessageResponse(userMessage.getMessage(), llmMessage.getMessage());
     }
+
+    public List<ChatMessageDto> getChatMessages(Long chatRoomId){
+
+        ChatRoom chatRoom = chatRoomRepository.findById(chatRoomId)
+                .orElseThrow(() -> new NotFoundException(ApiFailStatus.CHATROOM_NOT_FOUND));
+
+        List<ChatMessage> chatMessages = chatRoom.getChatMessages();
+
+        return chatMessages.stream()
+                .map(chatMessage -> new ChatMessageDto(chatMessage.getMessage(), chatMessage.getSenderType(), chatMessage.getTimestamp()))
+                .collect(Collectors.toList());
+    }
 }

src/main/java/com/HP028/chatbot/chatroom/repository/ChatRoomRepository.java

@@ -2,8 +2,12 @@
 
 import com.HP028.chatbot.chatroom.domain.ChatRoom;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import javax.swing.text.html.Option;
+import java.util.Optional;
+
 @Repository
 public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {