Merge pull request #404 from GTable/fix/user/order

fix: 주점 publicCode로 연결

Author: hwangdae

apps/nowait-user/src/components/common/modal/SearchModal.tsx

@@ -102,7 +102,7 @@ const SearchModal = ({ isOpen, onClose }: SearchModalProps) => {
     saveRecentSearch(store.departmentName);
 
     // 학과별 주점 목록 페이지로 이동 (storeId를 query parameter로 전달)
-    navigate(`/store/${store.storeId}`);
+    navigate(`/store/${store.publicCode}`);
     onClose();
   };
 

apps/nowait-user/src/hooks/useInfiniteStores.ts

@@ -5,6 +5,7 @@ import { useApiErrorHandler } from "./useApiErrorHandler";
 
 interface Store {
   storeId: number;
+  publicCode : string;
   bannerImages: {
     id: number;
     imageType: string;

apps/nowait-user/src/hooks/useWaitingStores.ts

@@ -8,6 +8,7 @@ interface WaitingStore {
   bannerImageUrl: string | null;
   departmentName: string;
   storeId: number;
+  publicCode:string;
   storeName: string;
   waitingCount: number;
 }

apps/nowait-user/src/pages/home/HomePage.tsx

@@ -60,8 +60,8 @@ const HomePage = () => {
   }, []);
 
   const handleNavigateToStore = useCallback(
-    (storeId: number) => {
-      navigate(`/store/${storeId}`);
+    (publicCode: string) => {
+      navigate(`/store/${publicCode}`);
     },
     [navigate]
   );

apps/nowait-user/src/pages/home/components/InfiniteStoreList.tsx

@@ -105,6 +105,7 @@ const InfiniteStoreList = memo(() => {
               key={store.storeId}
               type="store"
               storeId={store.storeId}
+              publicCode={store.publicCode}
               name={store.name}
               departmentName={store.departmentName}
               profileImageUrl={store.profileImage?.imageUrl || ""}

apps/nowait-user/src/pages/home/components/MainCard.tsx

@@ -16,6 +16,7 @@ interface WaitingCardProps {
 interface StoreCardProps {
   type: "store";
   storeId: number;
+  publicCode : string;
   name: string;
   departmentName: string;
   profileImageUrl: string;
@@ -276,7 +277,7 @@ const WaitingCard = ({ item }: { item: WaitingItem }) => {
 
 // 스토어 카드 컴포넌트
 const StoreCardComponent = ({
-  storeId,
+  publicCode,
   name,
   departmentName,
   profileImageUrl,
@@ -295,7 +296,7 @@ const StoreCardComponent = ({
 
   // 스토어 클릭 핸들러
   const handleStoreClick = () => {
-    navigate(`/store/${storeId}`);
+    navigate(`/store/${publicCode}`);
   };
 
   return (
@@ -413,6 +414,7 @@ const MainCard = memo(
       return (
         <StoreCardComponent
           storeId={props.storeId}
+          publicCode={props.publicCode}
           name={props.name}
           departmentName={props.departmentName}
           profileImageUrl={props.profileImageUrl}

apps/nowait-user/src/pages/home/components/SortWaitingCard.tsx

@@ -8,7 +8,7 @@ import { useInView } from "framer-motion";
 interface SortWaitingCardProps {
   order: "asc" | "desc";
   onModalOpen: () => void;
-  onNavigateToStore: (storeId: number) => void;
+  onNavigateToStore: (publicCode: string) => void;
 }
 
 // 바로 입장 가능한 주점 섹션 컴포넌트
@@ -119,7 +119,7 @@ const SortWaitingCard = memo(
                 storeName={store.storeName}
                 departmentName={store.departmentName}
                 waitingCount={store.waitingCount}
-                onClick={() => onNavigateToStore(Number(store.storeId))}
+                onClick={() => {onNavigateToStore(store.publicCode)}}
               />
             </div>
           ))}

apps/nowait-user/src/pages/waiting/WaitingSummary/WaitingSummaryPage.tsx

@@ -28,7 +28,7 @@ const WaitingSummaryPage = () => {
       const payload = {
         partySize,
       };
-      const res = await createReservation(parseInt(storeId!), payload);
+      const res = await createReservation(Number(store?.storeId!), payload);
       console.log(res, "예약 응답");
       navigate(`/store/${storeId}/waiting/success`, { replace: true });
     } catch (error) {

apps/nowait-user/src/pages/waiting/bookmark/components/BookmarkListItem.tsx

@@ -13,6 +13,7 @@ interface PropsType {
   name: string;
   departmentName: string;
   storeId: number;
+  publicCode:string;
 }
 
 const BookmarkListItem = ({
@@ -22,6 +23,7 @@ const BookmarkListItem = ({
   name,
   departmentName,
   storeId,
+  publicCode
 }: PropsType) => {
   const { createBookmarkMutate, deleteBookmarkMutate } = useBookmarkMutation(
     {
@@ -49,7 +51,7 @@ const BookmarkListItem = ({
   return (
     <li className="mb-6">
       <div className="relative top-0 right-0">
-        <Link to={`/store/${storeId}`}>
+        <Link to={`/store/${publicCode}`}>
           <img
             className="w-full h-[195px] rounded-[14px] overflow-hidden object-cover"
             src={bannerImages || defaultMenuImageLg}
@@ -64,7 +66,7 @@ const BookmarkListItem = ({
       </div>
       <div className="flex items-start justify-between py-3">
         <div>
-          <Link to={`/store/${storeId}`} className="flex items-center gap-2.5">
+          <Link to={`/store/${publicCode}`} className="flex items-center gap-2.5">
             <DepartmentImage width="40px" height="40px" src={profileImage} />
             <div className="flex flex-col justify-between">
               <h1 className="text-title-16-bold text-black-90">{name}</h1>

apps/nowait-user/src/pages/waiting/boothMap/components/BoothDetail.tsx

@@ -13,7 +13,7 @@ interface PropsType {
 const BoothDetail = ({ booth }: PropsType) => {
   const navigate = useNavigate();
 
-  const { storeId, name, departmentName, waitingCount } = booth;
+  const { storeId, publicCode, name, departmentName, waitingCount } = booth;
 
   const { createBookmarkMutate, deleteBookmarkMutate } = useBookmarkMutation(
     {
@@ -61,7 +61,7 @@ const BoothDetail = ({ booth }: PropsType) => {
           </span>
           {waitingCount === 0 ? "대기없음" : `대기 ${waitingCount}명`}
         </p>
-        <Button onClick={() => navigate(`/store/${storeId}`)}>상세 보기</Button>
+        <Button onClick={() => navigate(`/store/${publicCode}`)}>상세 보기</Button>
       </div>
     </motion.div>
   );