Skip to content

Commit ecdb8dc

Browse files
committed
refactor: delete selectedCocktailType level
1 parent f097852 commit ecdb8dc

File tree

2 files changed

+4
-51
lines changed

2 files changed

+4
-51
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,4 @@ public class ChatRequestDto {
2626
// "ALL" 처리를 위해 스텝 3개 String으로 변경
2727
private String selectedAlcoholStrength;
2828
private String selectedAlcoholBaseType;
29-
private String selectedCocktailType;
3029
}

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

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public ChatResponseDto sendMessage(ChatRequestDto requestDto) {
102102
log.info("질문형 추천 모드 진입 - userId: {}", requestDto.getUserId());
103103
return generateAIResponseWithContext(requestDto, "질문형 추천");
104104
}
105-
else if (currentStep >= 1 && currentStep <= 4) {
105+
else if (currentStep >= 1 && currentStep <= 3) {
106106
// 단계별 추천
107107
log.info("단계별 추천 모드 진입 - Step: {}, userId: {}",
108108
currentStep, requestDto.getUserId());
@@ -496,19 +496,10 @@ private ChatResponseDto handleStepRecommendation(ChatRequestDto requestDto) {
496496
break;
497497

498498
case 3:
499-
stepData = getCocktailTypeOptions(
500-
parseAlcoholStrength(requestDto.getSelectedAlcoholStrength()),
501-
parseAlcoholBaseType(requestDto.getSelectedAlcoholBaseType())
502-
);
503-
message = "완벽해요! 마지막으로 어떤 스타일로 즐기실 건가요? 🥃";
504-
type = MessageType.RADIO_OPTIONS;
505-
break;
506-
507-
case 4:
508499
stepData = getFinalRecommendations(
509500
parseAlcoholStrength(requestDto.getSelectedAlcoholStrength()),
510501
parseAlcoholBaseType(requestDto.getSelectedAlcoholBaseType()),
511-
parseCocktailType(requestDto.getSelectedCocktailType())
502+
null
512503
);
513504
message = stepData.getStepTitle();
514505
type = MessageType.CARD_LIST; // 최종 추천은 카드 리스트
@@ -541,7 +532,7 @@ private ChatResponseDto handleStepRecommendation(ChatRequestDto requestDto) {
541532
// 메타데이터 포함
542533
ChatResponseDto.MetaData metaData = ChatResponseDto.MetaData.builder()
543534
.currentStep(currentStep)
544-
.totalSteps(4)
535+
.totalSteps(3)
545536
.isTyping(true)
546537
.delay(300)
547538
.build();
@@ -585,17 +576,6 @@ private AlcoholBaseType parseAlcoholBaseType(String value) {
585576
}
586577
}
587578

588-
private CocktailType parseCocktailType(String value) {
589-
if (value == null || value.trim().isEmpty() || "ALL".equalsIgnoreCase(value)) {
590-
return null;
591-
}
592-
try {
593-
return CocktailType.valueOf(value);
594-
} catch (IllegalArgumentException e) {
595-
log.warn("Invalid CocktailType value: {}", value);
596-
return null;
597-
}
598-
}
599579

600580
private StepRecommendationResponseDto getAlcoholStrengthOptions() {
601581
List<StepRecommendationResponseDto.StepOption> options = new ArrayList<>();
@@ -651,32 +631,6 @@ private StepRecommendationResponseDto getAlcoholBaseTypeOptions(AlcoholStrength
651631
);
652632
}
653633

654-
private StepRecommendationResponseDto getCocktailTypeOptions(AlcoholStrength alcoholStrength, AlcoholBaseType alcoholBaseType) {
655-
List<StepRecommendationResponseDto.StepOption> options = new ArrayList<>();
656-
657-
// "전체" 옵션 추가
658-
options.add(new StepRecommendationResponseDto.StepOption(
659-
"ALL",
660-
"전체",
661-
null
662-
));
663-
664-
for (CocktailType cocktailType : CocktailType.values()) {
665-
options.add(new StepRecommendationResponseDto.StepOption(
666-
cocktailType.name(),
667-
cocktailType.getDescription(),
668-
null
669-
));
670-
}
671-
672-
return new StepRecommendationResponseDto(
673-
3,
674-
"어떤 종류의 잔으로 드시겠어요?",
675-
options,
676-
null,
677-
false
678-
);
679-
}
680634

681635
private StepRecommendationResponseDto getFinalRecommendations(
682636
AlcoholStrength alcoholStrength,
@@ -714,7 +668,7 @@ private StepRecommendationResponseDto getFinalRecommendations(
714668
"마음에 드는 칵테일은 '킵' 버튼을 눌러 나만의 Bar에 저장해보세요!";
715669

716670
return new StepRecommendationResponseDto(
717-
4,
671+
3,
718672
stepTitle,
719673
null,
720674
recommendations,

0 commit comments

Comments
 (0)