Skip to content

[fix] 챗봇 input 데이터 작동 정상화 #240 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 4, 2025
Merged

[fix] 챗봇 input 데이터 작동 정상화 #240 #242

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6d1b16
fix: stepData modified
GerHerMo Oct 2, 2025
4d22f16
feat: add 'x' to keyword set null
GerHerMo Oct 2, 2025
3bf4f4c
Merge branch 'dev' of https://github.com/prgrms-web-devcourse-final-p…
GerHerMo Oct 2, 2025
bc640a2
refactor: step3 msg edit
GerHerMo Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/main/java/com/back/domain/chatbot/service/ChatbotService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,14 @@ private ChatResponseDto handleStepRecommendation(ChatRequestDto requestDto) {
break;

case 3:
stepData = null;
message = "좋아요! 이제 원하는 칵테일 스타일을 자유롭게 말씀해주세요 💬\n 없으면 'x', 또는 '없음' 과 같이 입력해주세요!";
stepData = new StepRecommendationResponseDto(
3,
null,
null,
null,
false
);
message = "좋아요! 이제 원하는 칵테일 스타일을 자유롭게 말씀해주세요 💬\n 없으면 'x', 또는 '없음' 을 입력해주세요!";
type = MessageType.INPUT;
break;

Expand Down Expand Up @@ -646,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,
Expand Down