fix: 코드리뷰 반영

Author: jisooooooooooo

src/api/domain/edit/hook.ts

@@ -22,6 +22,7 @@ export const useUpperGoalIds = (mandalartId: number) => {
   return useQuery({
     queryKey: EDIT_QUERY_KEY.upperGoalIds(mandalartId),
     queryFn: () => getUpperGoalIds(mandalartId),
+    enabled: !!mandalartId,
   });
 };
 
@@ -31,10 +32,13 @@ export const useSubGoals = (
   cycle?: CycleType,
   options?: Omit<UseQueryOptions<BaseResponse<SubGoalsResponse>>, 'queryKey' | 'queryFn'>,
 ) => {
+  const enabled = !!mandalartId && (options?.enabled ?? true);
+
   return useQuery({
     queryKey: EDIT_QUERY_KEY.subGoals(mandalartId, coreGoalId, cycle),
     queryFn: () => getSubGoals(mandalartId, coreGoalId, cycle),
     ...options,
+    enabled,
   });
 };
 
@@ -61,5 +65,6 @@ export const useCoreGoals = (mandalartId: number) => {
   return useQuery({
     queryKey: EDIT_QUERY_KEY.coreGoals(mandalartId),
     queryFn: () => getCoreGoals(mandalartId),
+    enabled: !!mandalartId,
   });
 };

src/api/domain/history/hook/useGetHistory.ts

@@ -8,5 +8,6 @@ export const useGetHistory = (mandalartId: number) => {
   return useQuery<historyResponse>({
     queryKey: QUERY_KEY.HISTORY(mandalartId),
     queryFn: () => getHistory(mandalartId),
+    enabled: !!mandalartId,
   });
 };

src/api/domain/history/hook/useGetStreak.ts

@@ -8,5 +8,6 @@ export const useGetStreak = (mandalartId: number) => {
   return useQuery<StreakResponse>({
     queryKey: QUERY_KEY.STREAK(mandalartId),
     queryFn: () => getStreak(mandalartId),
+    enabled: !!mandalartId,
   });
 };

src/api/domain/lowerTodo/hook/useCoreGoals.ts

@@ -8,5 +8,6 @@ export const useCoreGoals = (mandalartId: number) => {
   return useQuery({
     queryKey: QUERY_KEY.MANDALART_CORE_GOALS(mandalartId),
     queryFn: () => getCoreGoals(mandalartId),
+    enabled: !!mandalartId,
   });
 };

src/api/domain/mandalAll/hook.ts

@@ -11,5 +11,6 @@ export const useMandalAll = (mandalartId: number) => {
   return useQuery({
     queryKey: MANDAL_ALL_KEY.detail(mandalartId),
     queryFn: () => getMandalAll(mandalartId),
+    enabled: !!mandalartId,
   });
 };

src/api/domain/myTodo/hook/useGetRecommendation.ts

@@ -7,5 +7,6 @@ export const useGetRecommendation = (mandalartId: number, date: string) => {
   return useQuery({
     queryKey: [QUERY_KEY.RECOMMENDED_TODO(mandalartId), date],
     queryFn: () => getRecommendation(mandalartId, { date }),
+    enabled: !!mandalartId,
   });
 };

src/api/domain/myTodo/hook/useMyMandal.ts

@@ -19,13 +19,15 @@ export const useGetMandalAll = (mandalartId: number) => {
   return useQuery({
     queryKey: [QUERY_KEY.ENTIRE_GOAL, mandalartId],
     queryFn: () => getMandalAll(mandalartId),
+    enabled: !!mandalartId,
   });
 };
 
 export const useGetMandalCoreGoals = (mandalartId: number) => {
   return useQuery<MandalCoreGoalsResponse>({
     queryKey: [QUERY_KEY.CORE_GOALS, mandalartId],
     queryFn: () => getMandalCoreGoals(mandalartId),
+    enabled: !!mandalartId,
   });
 };
 

src/page/todo/entireTodo/Todo.tsx

@@ -18,22 +18,25 @@ const Todo = () => {
   const isValid = trimmed.length > 0;
   const displayedText = useTypingEffect(FULL_TEXT, TYPING_DURATION);
 
-  const { mutate, isPending } = useCreateEntireTodo();
+  const { mutateAsync, isPending } = useCreateEntireTodo();
   const navigate = useNavigate();
 
-  const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     if (!isValid || isPending) {
       return;
     }
 
     const title = trimmed;
-    mutate(
-      { title },
-      {
-        onSuccess: () => navigate(PATH.TODO_UPPER),
-      },
-    );
+    try {
+      const data = await mutateAsync({ title });
+      if (typeof window !== 'undefined') {
+        localStorage.setItem('mandalartId', String(data.id));
+      }
+      navigate(PATH.TODO_UPPER);
+    } catch {
+      alert('목표 생성에 실패했습니다.');
+    }
   };
 
   if (isPending) {

src/page/todo/upperTodo/hook/useUpperTodoAI.tsx

@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { isAxiosError } from 'axios';
 
 import { extractTitles, updateSubGoalsWithAiResponse } from '../utils/goal';
 import { ALERT, GOAL_COUNT } from '../constants';
@@ -26,6 +27,22 @@ interface CoreGoalResponse {
   title: string;
 }
 
+interface ApiErrorResponse {
+  message?: string;
+}
+
+const getServerMessage = (error: unknown, fallback: string) => {
+  if (isAxiosError<ApiErrorResponse>(error)) {
+    return error.response?.data?.message ?? fallback;
+  }
+
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+
+  return fallback;
+};
+
 export const useUpperTodoAI = ({
   mandalartId,
   mainGoal,
@@ -51,8 +68,9 @@ export const useUpperTodoAI = ({
           refetchCoreGoalIds();
           refetch();
         },
-        onError: () => {
-          alert(ALERT.aiSaveFail);
+        onError: (error) => {
+          const message = getServerMessage(error, ALERT.aiSaveFail);
+          alert(message);
         },
       },
     );
@@ -91,9 +109,11 @@ export const useUpperTodoAI = ({
       );
 
       openModal(aiModalContent);
-    } catch {
+    } catch (error) {
+      const message = getServerMessage(error, ALERT.aiFetchFail);
+      alert(message);
+    } finally {
       setIsAiUsed(false);
-      alert(ALERT.aiFetchFail);
     }
   };