버그 수정

Author: trivialcoding6

app/(service)/(chat)/conversations/[conversationID]/page.tsx

@@ -4,7 +4,7 @@ import Image from 'next/image';
 import { ChevronDown } from 'lucide-react';
 import { useEffect, useState } from 'react';
 import { Category } from '@/types/category';
-import { getCategoryItems } from '@/apis/category';
+import { fetchAllCategories } from '@/apis/category';
 import { useRouter, useSearchParams } from 'next/navigation';
 
 type Props = {
@@ -21,13 +21,14 @@ export const ChatbotIntro = ({ showSelectBox }: Props) => {
     const fetchCategories = async () => {
       try {
         setIsLoading(true);
-        const categories = await getCategoryItems();
-        setCategories(categories);
+        const response = await fetchAllCategories();
+        const loadedCategories = response.data;
+        setCategories(loadedCategories);
 
         // 카테고리 로드 후, 파라미터가 없고 카테고리가 있으면 첫 번째 카테고리로 설정
-        if (categories.length > 0 && !searchParams.get('categoryId') && showSelectBox) {
+        if (loadedCategories.length > 0 && !searchParams.get('categoryId') && showSelectBox) {
           const params = new URLSearchParams(searchParams.toString());
-          params.set('categoryId', categories[0].id);
+          params.set('categoryId', loadedCategories[0].id);
           router.push(`${window.location.pathname}?${params.toString()}`);
         }
       } catch (error) {

components/service/chatbot/ChatbotIntro.tsx

@@ -2,12 +2,11 @@
 
 import { useEffect, useState } from 'react';
 import { FolderOpen, Pencil, Trash2, Check, X } from 'lucide-react';
-import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import { ActionButton } from '@/components/common/ActionButton';
 import { CategoryWithStorages } from '@/types/storage';
 import { getUser } from '@/actions/user';
-import { getCategoryItems } from '@/apis/category';
+import { fetchAllCategories } from '@/apis/category';
 import { getStorage } from '@/apis/storage';
 import { SidebarSkeleton } from './SidebarSkeleton';
 import { useSidebarStore } from '@/stores/sidebar';
@@ -60,7 +59,8 @@ export const SidebarItem = () => {
         const user = await getUser();
 
         // 2. 카테고리 목록 가져오기
-        const categories = await getCategoryItems();
+        const response = await fetchAllCategories();
+        const categories = response.data;
 
         // 3. 각 카테고리별 스토리지 가져오기
         const categoryStoragesPromises = categories.map(async (category) => {

components/service/chatbot/SidebarItem.tsx

@@ -16,7 +16,7 @@ import { Button } from '@/components/ui/button';
 import { PencilLine } from 'lucide-react';
 import { toast } from 'sonner';
 
-import { updateUserData, GenderEnum, ProfileRequest } from '@/apis/profile';
+import { updateUserData, ProfileRequest } from '@/apis/profile';
 
 type Props = {
   id: string;

components/service/profile/ProfileModal/ProfileModal.tsx

@@ -5,7 +5,7 @@ import { TodoAndMemoSection } from './TodoAndMemoSection';
 import { getTodAndMemoList } from '@/apis/todo';
 import { getUser } from '@/actions/user';
 import { Suspense } from 'react';
-import { getCategoryItems } from '@/apis/category';
+import { fetchAllCategories } from '@/apis/category';
 import { redirect } from 'next/navigation';
 export const Schedule = async () => {
   const user = await getUser();
@@ -19,7 +19,8 @@ export const Schedule = async () => {
     redirect('/login');
   }
 
-  const categoryItems = await getCategoryItems();
+  const response = await fetchAllCategories();
+  const categoryItems = response.data;
 
   return (
     <main className="flex flex-col gap-4 bg-beige-light">

components/service/schedule/Schedule.tsx

@@ -4,9 +4,11 @@ import Card from '@/components/common/Card';
 import ChatbotHelperBox from '@/components/shared/ToDo/ChatbotHelperBox';
 import TodoItem from '@/components/shared/ToDo/TodoItem';
 import TodoPopup from '@/components/shared/ToDo/TodoPopup';
+import { cn } from '@/lib/utils';
 import { todoListData } from '@/mocks/data';
 import { useModalStore } from '@/stores/modal';
 import { useTodoEditStore } from '@/stores/todoEditStore';
+import { useMemoStore } from '@/stores/useMemoStore';
 import { useTodoListStore } from '@/stores/useTodoListStore';
 import { Memo } from '@/types/memo';
 import { Todo } from '@/types/todo';
@@ -18,9 +20,9 @@ type Props = {
 };
 
 export const TodoAndMemoSection = ({ todos, memos }: Props) => {
-  //   const { todoList } = useTodoListStore();
   const { openModal } = useModalStore();
   const { setEditingTodo } = useTodoEditStore();
+  const { memoList } = useMemoStore();
   const handleOpenTodoModal = () => {
     setEditingTodo(null);
     openModal({
@@ -46,16 +48,25 @@ export const TodoAndMemoSection = ({ todos, memos }: Props) => {
           </ActionButton>
         </div>
       </div>
-      <div className="flex flex-col gap-4 h-[300px] overflow-y-auto scrollbar-hide">
-        {memos.map((memo) => (
-          <div
-            key={memo.id}
-            className="flex flex-col justify-center w-full h-[96px] bg-beige-light rounded-lg p-4"
-          >
-            <div className="text-xl font-bold text-secondary">{memo.title}</div>
-            <div className="text-lg text-primary">{memo.content}</div>
-          </div>
-        ))}
+      <div
+        className={cn(
+          'flex flex-col gap-4 h-[300px] overflow-y-auto scrollbar-hide',
+          memoList.length === 0 && 'h-full'
+        )}
+      >
+        {memoList.length > 0 ? (
+          memoList.map((memo) => (
+            <div
+              key={memo.id}
+              className="flex flex-col justify-center w-full h-[96px] bg-beige-light rounded-lg p-4"
+            >
+              <div className="text-xl font-bold text-secondary">{memo.title}</div>
+              <div className="text-lg text-primary">{memo.content}</div>
+            </div>
+          ))
+        ) : (
+          <p className="text-lg text-center text-secondary mb-2">메모를 추가해주세요!</p>
+        )}
       </div>
 
       {/* todo 섹션 */}

components/service/schedule/TodoAndMemoSection/index.tsx

@@ -132,13 +132,13 @@ export default function TodoPopup() {
       let updatedTodo = null;
 
       if (editingTodo) {
-        updatedTodo = await editTodo(editingTodo.id, user?.id || '', {
+        updatedTodo = await editTodo(editingTodo.id, user?.id || '', selectedCategory, {
           categoryId: selectedCategory,
           content: todoInputs[0].text,
           startDate: formatDateToYYYYMMDD(startDate),
           endDate: formatDateToYYYYMMDD(endDate),
           isRepeat,
-          weeks: selectedDays.map((d) => ({ id: d, weekName: d })),
+          weeks: selectedDays.map((d) => ({ id: d, weekName: Week[d as keyof typeof Week] })),
           isCompleted: false,
         });
         setEditingTodo(null);
@@ -187,6 +187,7 @@ export default function TodoPopup() {
                     weekName: Week[d as keyof typeof Week],
                   })),
                   isCompleted: false,
+                  category: selectedItem,
                 },
                 user?.id || '',
                 categoryId
@@ -231,7 +232,7 @@ export default function TodoPopup() {
   const handleDelete = async () => {
     try {
       if (editingTodo) {
-        await removeTodo(editingTodo.id, user?.id || '');
+        await removeTodo(editingTodo.id, user?.id || '', selectedCategory);
         toast.success('할 일이 삭제되었어요!');
       }
 

components/shared/ToDo/TodoPopup.tsx

@@ -31,7 +31,7 @@ export function useAnalyzeToday(
         return;
       }
 
-      const res = await fetchAllAnalyzeToday(userId, startDate, endDate);
+      const res = await fetchAllAnalyzeToday(userId);
 
       if (res.status_code === 200 && res.data) {
         setAnalyzeToday(res.data);

hooks/useAnalyzetoday.ts

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Todo } from '@/types/todo';
+import { Todo } from '@/types/todopopup';
 import { createTodo, updateTodo, deleteTodo } from '@/apis/todopopup';
 
 export const useTodoPopup = () => {
@@ -16,21 +16,26 @@ export const useTodoPopup = () => {
     }
   };
 
-  const editTodo = async (todoId: string, userId: string, updated: Partial<Todo>) => {
+  const editTodo = async (
+    todoId: string,
+    userId: string,
+    categoryId: string,
+    updated: Partial<Todo>
+  ) => {
     try {
       setError(null);
-      const editedTodo = await updateTodo(todoId, userId, updated);
+      const editedTodo = await updateTodo(todoId, userId, categoryId, updated);
       return editedTodo;
     } catch (err) {
       setError(err instanceof Error ? err.message : '할 일을 수정하는데 실패했습니다.');
       throw err;
     }
   };
 
-  const removeTodo = async (todoId: string, userId: string) => {
+  const removeTodo = async (todoId: string, userId: string, categoryId: string) => {
     try {
       setError(null);
-      await deleteTodo(todoId, userId);
+      await deleteTodo(todoId, userId, categoryId);
     } catch (err) {
       setError(err instanceof Error ? err.message : '할 일을 삭제하는데 실패했습니다.');
       throw err;

hooks/useTodoPopup.ts

@@ -17,7 +17,7 @@ export type Todo = {
   startDate: string;
   endDate: string;
   isCompleted: boolean;
-  isRepeat?: boolean;
+  isRepeat: boolean;
   weeks?: Week[];
   category?: Category;
   isDone?: boolean;