From d6d1b165188e46f48e615972d6431fe3a99f5604 Mon Sep 17 00:00:00 2001
From: GerHerMo <drugbeggar@gmail.com>
Date: Thu, 2 Oct 2025 19:55:18 +0900
Subject: [PATCH 1/3] fix: stepData modified

---
 .../com/back/domain/chatbot/service/ChatbotService.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/back/domain/chatbot/service/ChatbotService.java b/src/main/java/com/back/domain/chatbot/service/ChatbotService.java
index 8da9230..bcffad7 100644
--- a/src/main/java/com/back/domain/chatbot/service/ChatbotService.java
+++ b/src/main/java/com/back/domain/chatbot/service/ChatbotService.java
@@ -495,7 +495,13 @@ private ChatResponseDto handleStepRecommendation(ChatRequestDto requestDto) {
                 break;
 
             case 3:
-                stepData = null;
+                stepData = new StepRecommendationResponseDto(
+                    3,
+                    null,
+                    null,
+                    null,
+                    false
+                );
                 message = "좋아요! 이제 원하는 칵테일 스타일을 자유롭게 말씀해주세요 💬\n 없으면 'x', 또는 '없음' 과 같이 입력해주세요!";
                 type = MessageType.INPUT;
                 break;

From 4d22f16b0ff8ebad3e86b1849c8d0620ea73f31a Mon Sep 17 00:00:00 2001
From: GerHerMo <drugbeggar@gmail.com>
Date: Thu, 2 Oct 2025 20:07:58 +0900
Subject: [PATCH 2/3] feat: add 'x' to keyword set null

---
 .../back/domain/chatbot/service/ChatbotService.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/back/domain/chatbot/service/ChatbotService.java b/src/main/java/com/back/domain/chatbot/service/ChatbotService.java
index bcffad7..b6a44c5 100644
--- a/src/main/java/com/back/domain/chatbot/service/ChatbotService.java
+++ b/src/main/java/com/back/domain/chatbot/service/ChatbotService.java
@@ -652,9 +652,18 @@ private StepRecommendationResponseDto getFinalRecommendationsWithMessage(
         List<AlcoholStrength> strengths = (alcoholStrength == null) ? null : List.of(alcoholStrength);
         List<AlcoholBaseType> baseTypes = (alcoholBaseType == null) ? null : List.of(alcoholBaseType);
 
+        // 'x', '없음' 입력 시 키워드 조건 무시
+        String keyword = null;
+        if (userMessage != null && !userMessage.trim().isEmpty()) {
+            String trimmed = userMessage.trim().toLowerCase();
+            if (!trimmed.equals("x") && !trimmed.equals("없음")) {
+                keyword = userMessage;
+            }
+        }
+
         // userMessage를 키워드로 사용하여 검색
         Page<Cocktail> cocktailPage = cocktailRepository.searchWithFilters(
-                userMessage, // 사용자 입력 메시지를 키워드로 사용
+                keyword, // 'x', '없음'이면 null, 아니면 사용자 입력 메시지
                 strengths,
                 null, // cocktailType 사용 안 함
                 baseTypes,

From bc640a26783df01a05b28ecb3b28ce5d8d890c3c Mon Sep 17 00:00:00 2001
From: GerHerMo <drugbeggar@gmail.com>
Date: Thu, 2 Oct 2025 20:12:40 +0900
Subject: [PATCH 3/3] refactor: step3 msg edit

---
 .../java/com/back/domain/chatbot/service/ChatbotService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/back/domain/chatbot/service/ChatbotService.java b/src/main/java/com/back/domain/chatbot/service/ChatbotService.java
index b6a44c5..e364df3 100644
--- a/src/main/java/com/back/domain/chatbot/service/ChatbotService.java
+++ b/src/main/java/com/back/domain/chatbot/service/ChatbotService.java
@@ -502,7 +502,7 @@ private ChatResponseDto handleStepRecommendation(ChatRequestDto requestDto) {
                     null,
                     false
                 );
-                message = "좋아요! 이제 원하는 칵테일 스타일을 자유롭게 말씀해주세요 💬\n 없으면 'x', 또는 '없음' 과 같이 입력해주세요!";
+                message = "좋아요! 이제 원하는 칵테일 스타일을 자유롭게 말씀해주세요 💬\n 없으면 'x', 또는 '없음' 을 입력해주세요!";
                 type = MessageType.INPUT;
                 break;