[Fix]::Reservation 예외처리 완료 close #63

KnS-hacks · Jan 2, 2022 · 149f998 · 149f998
1 parent cafb3cf
commit 149f998
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/src/Components/MyReservation/Contents.jsx b/src/Components/MyReservation/Contents.jsx
@@ -65,6 +65,16 @@ const CancelBtn = styled.button`
   }
 `;
 
+const NoneDiv = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  height: 70vh;
+  font-size: 1.8rem;
+  font-weight: 700;
+`;
+
 const Contents = ({ remainTime, order, resName, peopleNum }) => {
   const history = useNavigate();
   // 줄서기 취소이벤트
@@ -74,6 +84,16 @@ const Contents = ({ remainTime, order, resName, peopleNum }) => {
       history.push('/district1');
     }
   };
+
+  if (!resName) {
+    return (
+      <Wrapper>
+        <NoneDiv>
+          <p>예약 정보가 없습니다.</p>
+        </NoneDiv>
+      </Wrapper>
+    );
+  }
   return (
     <Wrapper>
       <Container>

diff --git a/src/Layouts/MyReservation/MyReservation.jsx b/src/Layouts/MyReservation/MyReservation.jsx
@@ -15,25 +15,29 @@ const MyReservation = () => {
     try {
       // user의 waiting pk 로 waiting 정보 조회 및 저장
       const waitingInfo = (await userWaiting(user.username)).data;
-      setWaitingInfo(waitingInfo);
-      setWaitingNum(waitingInfo.members.length);
+      console.log(waitingInfo);
+      if (waitingInfo.data.success) {
+        setWaitingInfo(waitingInfo);
+        setWaitingNum(waitingInfo.members.length);
+      } else {
+        setWaitingInfo({});
+      }
     } catch (error) {
       return error;
     }
   };
+
   useEffect(() => {
     fetch();
   }, []);
 
   return (
-    <>
-      <Contents
-        remainTime={WaitingInfo.left_time}
-        order={WaitingInfo.order}
-        resName={WaitingInfo.restaurant}
-        peopleNum={WaitingNum}
-      />
-    </>
+    <Contents
+      remainTime={WaitingInfo.left_time}
+      order={WaitingInfo.order}
+      resName={WaitingInfo.restaurant}
+      peopleNum={WaitingNum}
+    />
   );
 };