Skip to content

Donggyu bugfix #127

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
donggyu412 merged 6 commits into from
Dec 14, 2025
Merged

Donggyu bugfix #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74bf1e7
버그 픽스
donggyu412 Dec 13, 2025
23efb0b
병합
donggyu412 Dec 13, 2025
26c3b98
7일 운동 추천
donggyu412 Dec 14, 2025
0b20e27
Merge branch 'main' of https://github.com/intel-fit/front-end into do…
donggyu412 Dec 14, 2025
585332f
운동 추천 저장api 요약api
donggyu412 Dec 14, 2025
1b62d53
Merge branch 'main' of https://github.com/intel-fit/front-end into do…
donggyu412 Dec 14, 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
488 changes: 488 additions & 0 deletions src/components/modals/DislikedFoodsModal.tsx
View file
Open in desktop

Large diffs are not rendered by default.

434 changes: 0 additions & 434 deletions src/components/modals/MealRecommendModal.tsx
View file
Open in desktop

This file was deleted.

882 changes: 441 additions & 441 deletions src/components/modals/PaymentMethodModal.tsx
View file
Open in desktop

Large diffs are not rendered by default.

509 changes: 0 additions & 509 deletions src/components/modals/RoutineRecommendModal.tsx
View file
Open in desktop

This file was deleted.

520 changes: 260 additions & 260 deletions src/navigation/AppNavigator.tsx
View file
Open in desktop

Large diffs are not rendered by default.

662 changes: 380 additions & 282 deletions src/screens/auth/KakaoOnboardingScreen.tsx
View file
Open in desktop

Large diffs are not rendered by default.

478 changes: 266 additions & 212 deletions src/screens/auth/LoginScreen.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2,214 changes: 1,125 additions & 1,089 deletions src/screens/diet/MealRecommendHistoryScreen.tsx
View file
Open in desktop

Large diffs are not rendered by default.

243 changes: 9 additions & 234 deletions src/screens/diet/MealRecommendScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import AsyncStorage from "@react-native-async-storage/async-storage";
import { useNavigation } from "@react-navigation/native";
import { recommendedMealAPI, userPreferencesAPI } from "../../services";
import { LinearGradient } from "expo-linear-gradient";
import DislikedFoodsModal from "../../components/modals/DislikedFoodsModal";

const { width } = Dimensions.get("window");

const LOADING_MESSAGES = [
Expand Down Expand Up @@ -590,9 +592,8 @@ const transformTempMealToUI = (tempDay: any, dayIndex: number) => {

const MealRecommendScreen = () => {
const navigation = useNavigation();
const [screen, setScreen] = useState<
"welcome" | "excludedIngredients" | "meals"
>("welcome");
const [screen, setScreen] = useState<"welcome" | "meals">("welcome");
const [showDislikedModal, setShowDislikedModal] = useState(false);

const [weeklyMeals, setWeeklyMeals] = useState<any[]>([]);
const [currentDay, setCurrentDay] = useState(0);
Expand Down Expand Up @@ -821,116 +822,20 @@ const MealRecommendScreen = () => {
Alert.alert("성공", "오늘의 맞춤 식단이 생성되었습니다! 🎉");
} catch (error: any) {
console.error("❌ 1일 식단 추천 실패:", error);

// 500 에러인 경우 더 친절한 메시지
let errorMessage = error.message || "식단을 불러오는데 실패했습니다.";
if (error.status === 500) {
errorMessage = "서버에 일시적인 문제가 발생했습니다.\n잠시 후 다시 시도해주세요.";
errorMessage =
"서버에 일시적인 문제가 발생했습니다.\n잠시 후 다시 시도해주세요.";
}

Alert.alert("오류", errorMessage);
} finally {
setLoading(false);
}
};

const handleAddExcludedIngredient = async () => {
const trimmed = newIngredient.trim();

if (!trimmed) {
return;
}

if (excludedIngredients.includes(trimmed)) {
Alert.alert("알림", "이미 추가된 식재료입니다.");
return;
}

try {
setLoading(true);

try {
const result = await userPreferencesAPI.addDislikedFoods(
excludedIngredients,
[trimmed]
);

setExcludedIngredients(result.updatedList);
await AsyncStorage.setItem(
"excludedIngredients",
JSON.stringify(result.updatedList)
);

setNewIngredient("");
console.log("✅ 비선호 음식 추가 완료 (서버):", result.updatedList);
return;
} catch (serverError: any) {
console.warn("⚠️ 서버 저장 실패, 로컬만 저장:", serverError.message);

if (
serverError.message?.includes("서버 내부 오류") ||
serverError.status === 500
) {
const updatedList = [...excludedIngredients, trimmed];
setExcludedIngredients(updatedList);
await AsyncStorage.setItem(
"excludedIngredients",
JSON.stringify(updatedList)
);

setNewIngredient("");
Alert.alert(
"일부 성공",
"식재료가 기기에 저장되었습니다.\n(서버 동기화는 백엔드 수정 후 가능합니다)"
);
console.log("✅ 비선호 음식 추가 완료 (로컬만):", updatedList);
return;
}

throw serverError;
}
} catch (error: any) {
console.error("비선호 음식 추가 실패:", error);
Alert.alert("오류", error.message || "식재료 추가에 실패했습니다.");
Alert.alert("오류", errorMessage);
} finally {
setLoading(false);
}
};

const handleRemoveExcludedIngredient = async (ingredient: string) => {
Alert.alert("삭제", `"${ingredient}"를 삭제하시겠습니까?`, [
{ text: "취소", style: "cancel" },
{
text: "삭제",
style: "destructive",
onPress: async () => {
try {
setLoading(true);

const result = await userPreferencesAPI.removeDislikedFood(
excludedIngredients,
ingredient
);

setExcludedIngredients(result.updatedList);

await AsyncStorage.setItem(
"excludedIngredients",
JSON.stringify(result.updatedList)
);

console.log("✅ 비선호 음식 삭제 완료:", result.updatedList);
} catch (error: any) {
console.error("비선호 음식 삭제 실패:", error);
Alert.alert("오류", error.message || "식재료 삭제에 실패했습니다.");
} finally {
setLoading(false);
}
},
},
]);
};

// ✅ 좋아요 토글 함수
const handleToggleLike = (mealType: string, mealIndex: number) => {
setWeeklyMeals((prev) => {
Expand Down Expand Up @@ -1293,7 +1198,7 @@ const MealRecommendScreen = () => {
{/* 3. 금지 식재료 관리 */}
<TouchableOpacity
style={styles.secondaryButton}
onPress={() => setScreen("excludedIngredients")}
onPress={() => setShowDislikedModal(true)} // 변경
activeOpacity={0.8}
>
<LinearGradient
Expand Down Expand Up @@ -1465,136 +1370,6 @@ const MealRecommendScreen = () => {
);
}

if (screen === "excludedIngredients") {
return (
<View style={styles.container}>
<LinearGradient
colors={["#0a0a0a", "#1a1a2e", "#16213e"]}
style={StyleSheet.absoluteFill}
/>

<SafeAreaView style={styles.safeArea} edges={["top"]}>
<View style={styles.header}>
<TouchableOpacity
onPress={() => setScreen("welcome")}
style={styles.backButton}
>
<View style={styles.iconButton}>
<Icon name="chevron-back" size={24} color="#ffffff" />
</View>
</TouchableOpacity>
<Text style={styles.headerTitle}>금지 식재료</Text>
<View style={{ width: 40 }} />
</View>

<ScrollView
style={styles.excludedForm}
contentContainerStyle={styles.excludedFormContent}
showsVerticalScrollIndicator={false}
>
<View style={styles.inputGroup}>
<View style={styles.inputWrapper}>
<LinearGradient
colors={["rgba(255,255,255,0.1)", "rgba(255,255,255,0.05)"]}
style={styles.inputGradient}
>
<Icon
name="search"
size={20}
color="#6b7280"
style={styles.inputIcon}
/>
<TextInput
style={styles.textInput}
value={newIngredient}
onChangeText={setNewIngredient}
onSubmitEditing={handleAddExcludedIngredient}
placeholder="알러지 식재료를 입력하세요"
placeholderTextColor="#6b7280"
/>
</LinearGradient>
</View>
<TouchableOpacity
style={styles.addButton}
onPress={handleAddExcludedIngredient}
activeOpacity={0.8}
>
<LinearGradient
colors={["#e3ff7c", "#a8e063"]}
style={styles.addButtonGradient}
>
<Icon name="add" size={28} color="#111827" />
</LinearGradient>
</TouchableOpacity>
</View>

<View style={styles.excludedList}>
{excludedIngredients.map((ingredient, index) => (
<Animated.View
key={index}
style={[styles.excludedItem, { opacity: fadeAnim }]}
>
<LinearGradient
colors={[
"rgba(255,255,255,0.08)",
"rgba(255,255,255,0.04)",
]}
style={styles.excludedItemGradient}
>
<View style={styles.excludedItemLeft}>
<View style={styles.excludedItemIcon}>
<Icon name="ban" size={18} color="#ef4444" />
</View>
<Text style={styles.excludedItemText}>{ingredient}</Text>
</View>
<TouchableOpacity
style={styles.removeButton}
onPress={() => handleRemoveExcludedIngredient(ingredient)}
activeOpacity={0.7}
>
<Icon name="close-circle" size={24} color="#ef4444" />
</TouchableOpacity>
</LinearGradient>
</Animated.View>
))}

{excludedIngredients.length === 0 && (
<View style={styles.emptyState}>
<Icon name="restaurant-outline" size={64} color="#374151" />
<Text style={styles.emptyMessage}>
등록된 금지 식재료가 없습니다
</Text>
<Text style={styles.emptySubtext}>
알러지나 선호하지 않는 식재료를 추가하세요
</Text>
</View>
)}
</View>

<TouchableOpacity
style={styles.completeButton}
onPress={() => setScreen("welcome")}
activeOpacity={0.9}
>
<LinearGradient
colors={["#e3ff7c", "#a8e063"]}
style={styles.completeButtonGradient}
>
<Icon
name="checkmark-circle"
size={22}
color="#111827"
style={{ marginRight: 8 }}
/>
<Text style={styles.completeButtonText}>완료</Text>
</LinearGradient>
</TouchableOpacity>
</ScrollView>
</SafeAreaView>
</View>
);
}

return (
<View style={styles.container}>
<LinearGradient
Copy link

@github-actions github-actions bot Dec 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

잠재적 버그 및 리스크

  1. 상태 관리 누락: excludedIngredients 상태가 초기화되거나 관리되지 않는 것으로 보입니다. 이로 인해 화면 전환 시 사용자가 식재료를 추가하거나 제거할 수 없게 될 수 있습니다.

  2. 모달 표시 기능: showDislikedModal 상태는 정의되었지만, 모달을 표시하는 코드가 현재 포함되어 있지 않아 사용자에게 비선호 식재료를 추가하는 UI를 제공할 수 없습니다.

  3. 에러 처리 개선: 현재 에러 처리 방식에서는, 서버에서 발생하는 모든 에러에 대해 단순히 메시지를 표시하는 것으로 끝납니다. 좀 더 신뢰할 수 있는 방식으로 서버의 응답코드에 대한 명시적인 처리가 필요합니다. 이로 인해 사용자가 잘못된 상태를 인지할 수 있도록 해줍니다.

개선 사항 제안

  • excludedIngredients의 상태를 추가하여 비선호 식재료 목록을 관리하세요. 예를 들어, useState를 사용해서 비선호 식재료를 초기화하고 변경사항을 추적할 수 있도록 하세요.

  • 모달 컴포넌트를 모달을 렌더링하는 부분에 포함시켜 showDislikedModal이 true일 때 모달이 화면에 나타나도록 구현하세요.

  • 에러 메시지를 더 풍부하게 만들어 사용자에게 정확한 피드백을 제공하고, 서버 에러일 경우 사용자가 다음에 무엇을 해야 할지 안내하는 내용을 추가하는 것이 유용합니다.

Expand Down
Loading