Merge pull request StudyBadge-TenTen#138 from StudyBadge-TenTen/hotfix

[StudyBadge_FE StudyBadge-TenTen#117 ]: 결제내역, 포인트내역 디버깅
rabyeoljji · Aug 8, 2024 · 00bea73 · 00bea73
2 parents a85d999 + 77eb696
commit 00bea73
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/src/components/common/Pagination.tsx b/src/components/common/Pagination.tsx
@@ -61,8 +61,11 @@ const Pagination = ({
         }
       }
       if (type === "HISTORY" && setPage) {
-        if (!historyList || historyList.length === 0) return;
-        else setPage(() => Number(target.innerText));
+        if (!historyList || historyList.length === 0) {
+          return;
+        } else {
+          setPage(() => Number(target.innerText));
+        }
       }
       if (type === "NOTIFICATION" && setPage) {
         setPage(() => Number(target.innerText));

diff --git a/src/components/profile/HistoryList.tsx b/src/components/profile/HistoryList.tsx
@@ -16,10 +16,12 @@ const HistoryList = ({ type }: { type: "POINT" | "PAYMENT" }): JSX.Element => {
   const paymentQuery = useQuery<PaymentHistoryType[], Error>({
     queryKey: ["paymentList", type, page],
     queryFn: () => getPaymentsHistory(page, HISTORY_LENGTH_PER_PAGE),
+    enabled: type === "PAYMENT",
   });
   const pointQuery = useQuery<PointHistoryType[], Error>({
     queryKey: ["pointList", type, page],
     queryFn: () => getPointHistory(page, HISTORY_LENGTH_PER_PAGE),
+    enabled: type === "POINT",
   });
 
   useEffect(() => {
@@ -72,6 +74,7 @@ const HistoryList = ({ type }: { type: "POINT" | "PAYMENT" }): JSX.Element => {
   if (type === "PAYMENT") {
     if (paymentQuery.data && Array.isArray(paymentQuery.data)) {
       if (paymentQuery.data.length === 0) return <div>결제 내역이 존재하지 않습니다.</div>;
+
       return (
         <>
           <div className="w-full h-fit min-h-96">

diff --git a/src/services/profile-api.ts b/src/services/profile-api.ts
@@ -40,46 +40,45 @@ const getMyStudy = async () => {
 };
 
 const getPaymentsHistory = async (page: number, size: number) => {
-  const paymentsHistory = await fetchCall<PaymentHistoryType[] | AxiosError>(
-    `/api/payments/history?page=${page}&size=${size}`,
-    "get",
-  );
-  if (axios.isAxiosError(paymentsHistory)) {
-    if (paymentsHistory.response?.status === 404) {
-      return [];
-    } else {
-      const error = paymentsHistory.response?.data as CustomErrorType;
-      if (error.errorCode === "NOT_FOUND_PAYMENT") {
+  try {
+    const paymentsHistory = await fetchCall<PaymentHistoryType[]>(
+      `/api/payments/history?page=${page}&size=${size}`,
+      "get",
+    );
+    return paymentsHistory ?? [];
+  } catch (error) {
+    if (axios.isAxiosError(error)) {
+      const customError = error.response?.data as CustomErrorType;
+      if (customError.errorCode === "NOT_FOUND_PAYMENT") {
         return [];
       } else {
-        console.log(error.message);
+        alert(error.message);
         return [];
       }
+    } else {
+      console.log(error);
+      return [];
     }
-  } else {
-    return paymentsHistory ?? [];
   }
 };
 
 const getPointHistory = async (page: number, size: number) => {
-  const pointHistory = await fetchCall<PointHistoryType[] | AxiosError>(
-    `/api/points/my-point?page=${page}&size=${size}`,
-    "get",
-  );
-  if (axios.isAxiosError(pointHistory)) {
-    if (pointHistory.response?.status === 404) {
-      return [];
-    } else {
-      const error = pointHistory.response?.data as CustomErrorType;
-      if (error.errorCode === "NOT_FOUND_POINT") {
+  try {
+    const pointHistory = await fetchCall<PointHistoryType[]>(`/api/points/my-point?page=${page}&size=${size}`, "get");
+    return pointHistory ?? [];
+  } catch (error) {
+    if (axios.isAxiosError(error)) {
+      const customError = error.response?.data as CustomErrorType;
+      if (customError.errorCode === "NOT_FOUND_POINT") {
         return [];
       } else {
-        console.log(error.message);
+        alert(error.message);
         return [];
       }
+    } else {
+      console.log(error);
+      return [];
     }
-  } else {
-    return pointHistory ?? [];
   }
 };