diff --git a/apps/nowait-user/src/api/reservation.ts b/apps/nowait-user/src/api/reservation.ts index 030cabd6..d8b575b5 100644 --- a/apps/nowait-user/src/api/reservation.ts +++ b/apps/nowait-user/src/api/reservation.ts @@ -37,9 +37,9 @@ export const getInfiniteAllStores = async ( }; // 주점 상세 정보 가져오기 -export const getStore = async (storeId: number) => { +export const getStore = async (publicCode: string) => { try { - const res = await UserApi.get(`/v1/stores/${storeId}`); + const res = await UserApi.get(`/v1/stores/${publicCode}`); return res.data; } catch (error) { console.log(error); diff --git a/apps/nowait-user/src/pages/order/home/StorePage.tsx b/apps/nowait-user/src/pages/order/home/StorePage.tsx index e5eb0232..08dfcb17 100644 --- a/apps/nowait-user/src/pages/order/home/StorePage.tsx +++ b/apps/nowait-user/src/pages/order/home/StorePage.tsx @@ -10,7 +10,6 @@ import MenuList from "../../../components/common/MenuList"; import SectionDivider from "../../../components/SectionDivider"; import { useQuery } from "@tanstack/react-query"; import { getStoreMenus } from "../../../api/menu"; -import { getStore } from "../../../api/reservation"; const StorePage = () => { const navigate = useNavigate(); @@ -28,35 +27,20 @@ const StorePage = () => { navigate(location.pathname, { replace: true }); }, [added]); - // 매장 정보 조회 - const { data: store, isLoading: storeLoading } = useQuery({ - queryKey: ["store", storeId], - queryFn: () => getStore(Number(storeId)), + const { data: menus, isLoading } = useQuery({ + queryKey: ["storeMenus", storeId], + queryFn: () => getStoreMenus(storeId!), select: (data) => data?.response, }); - // 메뉴 조회 (publicCode 사용) - const { data: menus, isLoading: menusLoading } = useQuery({ - queryKey: ["storeMenus", store?.publicCode], - queryFn: () => getStoreMenus(store!.publicCode), - select: (data) => data?.response, - enabled: !!store?.publicCode, - }); - - const isLoading = storeLoading || menusLoading; - - console.log(menus, "asd"); + console.log(menus,"asd") return (
- + - +
{cart && cart.length > 0 && ( @@ -77,4 +61,4 @@ const StorePage = () => { ); }; -export default StorePage; +export default StorePage; \ No newline at end of file diff --git a/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx b/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx index 5d26b01f..d53ef57c 100644 --- a/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx +++ b/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx @@ -34,14 +34,14 @@ const StoreDetailPage = () => { isError, } = useQuery({ queryKey: ["store", storeId], - queryFn: () => getStore(Number(storeId)), + queryFn: () => getStore(storeId!), select: (data) => data?.response, }); + const { data: menus, isLoading: menusIsLoading } = useQuery({ - queryKey: ["storeMenus", store?.publicCode], - queryFn: () => getStoreMenus(store!.publicCode), + queryKey: ["storeMenus", storeId], + queryFn: () => getStoreMenus(storeId!), select: (data) => data?.response, - enabled: !!store?.publicCode, }); const handleBookmarkButton = async () => { @@ -174,4 +174,4 @@ const StoreDetailPage = () => { ); }; -export default StoreDetailPage; +export default StoreDetailPage; \ No newline at end of file diff --git a/apps/nowait-user/src/types/order/menu.ts b/apps/nowait-user/src/types/order/menu.ts index 744c67de..7336b6f5 100644 --- a/apps/nowait-user/src/types/order/menu.ts +++ b/apps/nowait-user/src/types/order/menu.ts @@ -2,6 +2,7 @@ export interface MenuType { menuId: number; storeId: number; + publicCode: string; name: string; description: string; price: number;