refactor: edit Dto & Service

Author: GerHerMo

src/main/java/com/back/domain/chatbot/dto/ChatResponseDto.java

@@ -1,5 +1,6 @@
 package com.back.domain.chatbot.dto;
 
+import com.back.domain.chatbot.enums.MessageSender;
 import com.back.domain.chatbot.enums.MessageType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,9 +17,12 @@
 @Builder
 public class ChatResponseDto {
 
+    private Long id;                           // 메시지 ID (DB 저장 후 생성)
+    private Long userId;                       // 사용자 ID
     private String message;                    // 텍스트 메시지
+    private MessageSender sender;              // 메시지 발신자 (USER / CHATBOT)
     private MessageType type;                  // 메시지 표시 타입
-    private LocalDateTime timestamp;
+    private LocalDateTime createdAt;           // 생성 시간 (timestamp → createdAt으로 변경)
 
     // 단계별 추천 관련 데이터 (type이 RADIO_OPTIONS 또는 CARD_LIST일 때 사용)
     private StepRecommendationResponseDto stepData;
@@ -30,12 +34,14 @@ public class ChatResponseDto {
     public ChatResponseDto(String message) {
         this.message = message;
         this.type = MessageType.TEXT;
-        this.timestamp = LocalDateTime.now();
+        this.sender = MessageSender.CHATBOT;
+        this.createdAt = LocalDateTime.now();
     }
 
     public ChatResponseDto(String message, StepRecommendationResponseDto stepData) {
         this.message = message;
-        this.timestamp = LocalDateTime.now();
+        this.sender = MessageSender.CHATBOT;
+        this.createdAt = LocalDateTime.now();
         this.stepData = stepData;
 
         // stepData 내용에 따라 type 자동 설정

src/main/java/com/back/domain/chatbot/service/ChatbotService.java

@@ -129,9 +129,11 @@ else if (currentStep >= 1 && currentStep <= 4) {
             String response = generateAIResponse(requestDto);
 
             return ChatResponseDto.builder()
+                    .userId(requestDto.getUserId())
                     .message(response)
+                    .sender(MessageSender.CHATBOT)
                     .type(MessageType.TEXT)
-                    .timestamp(LocalDateTime.now())
+                    .createdAt(LocalDateTime.now())
                     .build();
 
         } catch (Exception e) {
@@ -254,6 +256,7 @@ public ChatResponseDto createGreetingMessage(Long userId) {
         // 중복 확인: 동일한 인사말이 이미 존재하는지 확인
         boolean greetingExists = chatConversationRepository.existsByUserIdAndMessage(userId, greetingMessage);
 
+        ChatConversation savedGreeting = null;
         // 중복되지 않을 경우에만 DB에 저장
         if (!greetingExists) {
             ChatConversation greeting = ChatConversation.builder()
@@ -262,18 +265,21 @@ public ChatResponseDto createGreetingMessage(Long userId) {
                     .sender(MessageSender.CHATBOT)
                     .createdAt(LocalDateTime.now())
                     .build();
-            chatConversationRepository.save(greeting);
+            savedGreeting = chatConversationRepository.save(greeting);
             log.info("인사말 저장 완료 - userId: {}", userId);
         } else {
             log.info("이미 인사말이 존재하여 저장 생략 - userId: {}", userId);
         }
 
-        // ChatResponseDto 반환
+        // ChatResponseDto 반환 (요청된 형식에 맞춰 id, userId, sender, type, createdAt 포함)
         return ChatResponseDto.builder()
+                .id(savedGreeting != null ? savedGreeting.getId() : null)
+                .userId(userId)
                 .message(greetingMessage)
+                .sender(MessageSender.CHATBOT)
                 .type(MessageType.RADIO_OPTIONS)
                 .stepData(stepData)
-                .timestamp(LocalDateTime.now())
+                .createdAt(LocalDateTime.now())
                 .build();
     }
 
@@ -390,8 +396,9 @@ private String generateAIResponse(ChatRequestDto requestDto) {
     public ChatResponseDto createLoadingMessage() {
         return ChatResponseDto.builder()
                 .message("응답을 생성하는 중...")
+                .sender(MessageSender.CHATBOT)
                 .type(MessageType.LOADING)
-                .timestamp(LocalDateTime.now())
+                .createdAt(LocalDateTime.now())
                 .metaData(ChatResponseDto.MetaData.builder()
                         .isTyping(true)
                         .build())
@@ -438,9 +445,11 @@ private ChatResponseDto generateAIResponseWithContext(ChatRequestDto requestDto,
         String response = generateAIResponse(requestDto);
 
         return ChatResponseDto.builder()
+                .userId(requestDto.getUserId())
                 .message(response)
+                .sender(MessageSender.CHATBOT)
                 .type(MessageType.TEXT)
-                .timestamp(LocalDateTime.now())
+                .createdAt(LocalDateTime.now())
                 .metaData(ChatResponseDto.MetaData.builder()
                         .actionType(mode)
                         .currentStep(0)
@@ -455,8 +464,9 @@ private ChatResponseDto generateAIResponseWithContext(ChatRequestDto requestDto,
     private ChatResponseDto createErrorResponse(String errorMessage) {
         return ChatResponseDto.builder()
                 .message(errorMessage)
+                .sender(MessageSender.CHATBOT)
                 .type(MessageType.ERROR)
-                .timestamp(LocalDateTime.now())
+                .createdAt(LocalDateTime.now())
                 .build();
     }
 
@@ -517,11 +527,13 @@ private ChatResponseDto handleStepRecommendation(ChatRequestDto requestDto) {
                 .build();
 
         return ChatResponseDto.builder()
+                .userId(requestDto.getUserId())
                 .message(message)
+                .sender(MessageSender.CHATBOT)
                 .type(type)
                 .stepData(stepData)
                 .metaData(metaData)
-                .timestamp(LocalDateTime.now())
+                .createdAt(LocalDateTime.now())
                 .build();
     }