Merge pull request #1664 from innovationacademy-kr/dev

DEV TO MAIN
innovationacademy-kr · Jul 17, 2024 · 413cb28 · 413cb28
2 parents 7ccd7c2 + c8c66cb
commit 413cb28
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/frontend/src/Cabinet/components/Modals/StoreModal/ExtendModal.tsx b/frontend/src/Cabinet/components/Modals/StoreModal/ExtendModal.tsx
@@ -22,6 +22,7 @@ import { IInventoryInfo } from "@/Cabinet/components/Store/Inventory/Inventory";
 import { additionalModalType, modalPropsMap } from "@/Cabinet/assets/data/maps";
 import { MyCabinetInfoResponseDto } from "@/Cabinet/types/dto/cabinet.dto";
 import { IItemDetail, IItemStore } from "@/Cabinet/types/dto/store.dto";
+import CabinetStatus from "@/Cabinet/types/enum/cabinet.status.enum";
 import IconType from "@/Cabinet/types/enum/icon.type.enum";
 import {
   axiosCabinetById,
@@ -49,6 +50,7 @@ const ExtendModal: React.FC<{
   const [itemDropdownOptions, setItemDropdownOptions] = useState<
     IDropdownOptions[]
   >([]);
+  const [url, setUrl] = useState<string | null>(null);
   const [currentCabinetId] = useRecoilState(currentCabinetIdState);
   const [myInfo, setMyInfo] = useRecoilState(userState);
   const [myLentInfo, setMyLentInfo] =
@@ -73,8 +75,10 @@ const ExtendModal: React.FC<{
   연장권 사용은 취소할 수 없습니다.`;
   const extendInfoDetail = `사물함을 대여하시면 연장권 사용이 가능합니다.
 연장권은 <strong>${extensionExpiredDate} 23:59</strong> 이후 만료됩니다.`;
-  const noExtensionMsg = `현재 연장권을 보유하고 있지 않습니다.
+  const noItemMsg = `현재 연장권을 보유하고 있지 않습니다.
 연장권은 까비 상점에서 구매하실 수 있습니다.`;
+  const overdueMsg = "연체 중에는 연장권을 사용하실 수 없습니다.";
+  const defaultFailureModalTitle = "연장권 사용실패";
 
   useEffect(() => {
     fetchData();
@@ -84,7 +88,7 @@ const ExtendModal: React.FC<{
     if (myItems?.extensionItems.length === 0) {
       setShowResponseModal(true);
       setHasErrorOnResponse(true);
-      setModalContents(noExtensionMsg);
+      setModalContents(noItemMsg);
     } else {
       setShowResponseModal(false);
       setHasErrorOnResponse(false);
@@ -187,7 +191,15 @@ const ExtendModal: React.FC<{
   const extensionItemUse = async (item: string) => {
     if (currentCabinetId === 0 || myInfo.cabinetId === null) {
       setHasErrorOnResponse(true);
-      setModalTitle("현재 대여중인 사물함이 없습니다.");
+      setModalTitle(defaultFailureModalTitle);
+      setModalContents("현재 대여중인 사물함이 없습니다.");
+      setShowResponseModal(true);
+      return;
+    }
+    if (myLentInfo.status === CabinetStatus.OVERDUE) {
+      setHasErrorOnResponse(true);
+      setModalTitle(defaultFailureModalTitle);
+      setModalContents(overdueMsg);
       setShowResponseModal(true);
       return;
     }
@@ -214,8 +226,12 @@ const ExtendModal: React.FC<{
     } catch (error: any) {
       setHasErrorOnResponse(true);
       if (error.response.status === 400) {
-        setModalTitle("연장권 사용실패");
-        setModalContents(noExtensionMsg);
+        setModalTitle(defaultFailureModalTitle);
+        setModalContents(noItemMsg);
+        setUrl("/store");
+      } else if (error.response.status === 403) {
+        setModalTitle(defaultFailureModalTitle);
+        setModalContents(overdueMsg);
       } else {
         setModalTitle(error.response?.data.message || error.data.message);
       }
@@ -259,7 +275,7 @@ const ExtendModal: React.FC<{
             modalTitle={modalTitle}
             modalContents={modalContents}
             closeModal={props.onClose}
-            url={"/store"}
+            url={url}
             urlTitle={"까비상점으로 이동"}
           />
         ) : (