Merge branch 'dev' into test#179

Author: seungwookc97

build.gradle.kts

@@ -50,6 +50,7 @@ dependencies {
 
     // AWS S3
     implementation("io.awspring.cloud:spring-cloud-aws-starter-s3:3.4.0")
+    implementation("com.amazonaws:aws-java-sdk-s3:1.12.777")
 
     runtimeOnly("com.h2database:h2")
     runtimeOnly("com.mysql:mysql-connector-j")

src/main/java/com/back/domain/chatbot/controller/ChatbotController.java

@@ -2,9 +2,11 @@
 
 import com.back.domain.chatbot.dto.ChatRequestDto;
 import com.back.domain.chatbot.dto.ChatResponseDto;
+import com.back.domain.chatbot.dto.SaveBotMessageDto;
 import com.back.domain.chatbot.entity.ChatConversation;
 import com.back.domain.chatbot.service.ChatbotService;
 import com.back.global.rsData.RsData;
+import io.swagger.v3.oas.annotations.Operation;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +24,7 @@ public class ChatbotController {
     private final ChatbotService chatbotService;
 
     @PostMapping("/chat")
+    @Operation(summary = "채팅 메시지 보내기", description = "자율형 대화 및 단계별 추천 두가지 모드 지원")
     public ResponseEntity<RsData<ChatResponseDto>> sendMessage(@Valid @RequestBody ChatRequestDto requestDto) {
         try {
             ChatResponseDto response = chatbotService.sendMessage(requestDto);
@@ -34,6 +37,7 @@ public ResponseEntity<RsData<ChatResponseDto>> sendMessage(@Valid @RequestBody C
     }
 
     @GetMapping("/history/user/{userId}")
+    @Operation(summary = "유저 대화 히스토리", description = "사용자 채팅 기록 조회")
     public ResponseEntity<RsData<List<ChatConversation>>> getUserChatHistory(@PathVariable Long userId) {
         try {
             List<ChatConversation> history = chatbotService.getUserChatHistory(userId);
@@ -44,4 +48,31 @@ public ResponseEntity<RsData<List<ChatConversation>>> getUserChatHistory(@PathVa
                     .body(RsData.failOf("서버 오류가 발생했습니다."));
         }
     }
+
+    @PostMapping("/bot-message")
+    @Operation(summary = "봇 메시지 저장", description = "FE에서 생성한 봇 메시지(인사말 등)를 DB에 저장")
+    public ResponseEntity<RsData<ChatConversation>> saveBotMessage(@Valid @RequestBody SaveBotMessageDto requestDto) {
+        try {
+            ChatConversation savedMessage = chatbotService.saveBotMessage(requestDto);
+            return ResponseEntity.ok(RsData.successOf(savedMessage));
+        } catch (Exception e) {
+            log.error("봇 메시지 저장 중 오류 발생: ", e);
+            return ResponseEntity.internalServerError()
+                    .body(RsData.failOf("서버 오류가 발생했습니다."));
+        }
+    }
+
+    @PostMapping("/greeting/{userId}")
+    @Operation(summary = "인사말 생성", description = "사용자가 채팅을 시작할 때 기본 인사말을 생성하고 저장")
+    public ResponseEntity<RsData<ChatConversation>> createGreeting(@PathVariable Long userId) {
+        try {
+            ChatConversation greeting = chatbotService.createGreetingMessage(userId);
+            return ResponseEntity.ok(RsData.successOf(greeting));
+        } catch (Exception e) {
+            log.error("인사말 생성 중 오류 발생: ", e);
+            return ResponseEntity.internalServerError()
+                    .body(RsData.failOf("서버 오류가 발생했습니다."));
+        }
+    }
+
 }

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

@@ -1,5 +1,8 @@
 package com.back.domain.chatbot.dto;
 
+import com.back.domain.cocktail.enums.AlcoholBaseType;
+import com.back.domain.cocktail.enums.AlcoholStrength;
+import com.back.domain.cocktail.enums.CocktailType;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -13,6 +16,12 @@ public class ChatRequestDto {
     @NotBlank(message = "메시지는 필수입니다.")
     private String message;
 
-
     private Long userId;
+
+    // 단계별 추천 관련 필드들
+    private boolean isStepRecommendation = false;
+    private Integer currentStep;
+    private AlcoholStrength selectedAlcoholStrength;
+    private AlcoholBaseType selectedAlcoholBaseType;
+    private CocktailType selectedCocktailType;
 }

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

@@ -16,8 +16,17 @@ public class ChatResponseDto {
     private String response;
     private LocalDateTime timestamp;
 
+    // 단계별 추천 관련 필드 (선택사항)
+    private StepRecommendationResponseDto stepRecommendation;
+
     public ChatResponseDto(String response) {
         this.response = response;
         this.timestamp = LocalDateTime.now();
     }
+
+    public ChatResponseDto(String response, StepRecommendationResponseDto stepRecommendation) {
+        this.response = response;
+        this.timestamp = LocalDateTime.now();
+        this.stepRecommendation = stepRecommendation;
+    }
 }

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

@@ -0,0 +1,25 @@
+
+package com.back.domain.chatbot.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class SaveBotMessageDto {
+    
+    @NotNull(message = "사용자 ID는 필수입니다.")
+    private Long userId;
+    
+    @NotBlank(message = "메시지 내용은 필수입니다.")
+    private String message;
+    
+    // 선택적: 메시지 타입 (GREETING, HELP, ERROR 등)
+    private String messageType;
+}

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

@@ -0,0 +1,32 @@
+package com.back.domain.chatbot.dto;
+
+import com.back.domain.cocktail.dto.CocktailSummaryResponseDto;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class StepRecommendationResponseDto {
+
+    private Integer currentStep;              // 현재 단계
+    private String stepTitle;                 // 단계 제목 (예: "원하시는 도수를 선택해주세요!")
+    private List<StepOption> options;         // 선택 옵션들
+    private List<CocktailSummaryResponseDto> recommendations; // 최종 추천 칵테일 (4단계에서만)
+    private boolean isCompleted;              // 추천이 완료되었는지 여부
+
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class StepOption {
+        private String value;      // enum 값 (예: "NON_ALCOHOLIC")
+        private String label;      // 화면에 표시될 텍스트 (예: "논알콜 (0%)")
+        private String description; // 부가 설명 (선택사항)
+    }
+}

src/main/java/com/back/domain/chatbot/entity/ChatConversation.java

@@ -1,7 +1,9 @@
 package com.back.domain.chatbot.entity;
 
+import com.back.domain.chatbot.enums.MessageSender;
 import jakarta.persistence.*;
 import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
 
 import java.time.LocalDateTime;
 
@@ -19,18 +21,17 @@ public class ChatConversation {
     @GeneratedValue(strategy = IDENTITY)
     private Long id;
 
+    @Column(nullable = false)
     private Long userId;
 
-    @Column(columnDefinition = "TEXT")
-    private String userMessage;
+    @Column(columnDefinition = "TEXT", nullable = false)
+    private String message;
 
-    @Column(columnDefinition = "TEXT")
-    private String botResponse;
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false, length = 20)
+    @Builder.Default
+    private MessageSender sender = MessageSender.USER;
 
+    @CreatedDate
     private LocalDateTime createdAt;
-
-    @PrePersist
-    protected void onCreate() {
-        createdAt = LocalDateTime.now();
-    }
 }

src/main/java/com/back/domain/chatbot/enums/MessageSender.java

@@ -0,0 +1,16 @@
+package com.back.domain.chatbot.enums;
+
+public enum MessageSender {
+    USER("사용자"),
+    CHATBOT("챗봇");
+    
+    private final String description;
+    
+    MessageSender(String description) {
+        this.description = description;
+    }
+    
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/com/back/domain/chatbot/repository/ChatConversationRepository.java

@@ -1,8 +1,6 @@
 package com.back.domain.chatbot.repository;
 
 import com.back.domain.chatbot.entity.ChatConversation;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -11,7 +9,7 @@
 @Repository
 public interface ChatConversationRepository extends JpaRepository<ChatConversation, Long> {
 
-    Page<ChatConversation> findByUserIdOrderByCreatedAtDesc(Long userId, Pageable pageable);
+    List<ChatConversation> findByUserIdOrderByCreatedAtDesc(Long userId);
 
-    List<ChatConversation> findTop5ByUserIdOrderByCreatedAtDesc(Long userId);
+    List<ChatConversation> findTop20ByUserIdOrderByCreatedAtDesc(Long userId);
 }