Merge pull request #81 from TEAM-Hearus/feat/401-page

Feat: 401 인증정보 오류 페이지
TEAM-Hearus · Oct 2, 2024 · 26e4749 · 26e4749
2 parents a9e9fd8 + e10259f
commit 26e4749
Show file tree

Hide file tree

Showing 29 changed files with 361 additions and 268 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/apis/schedule.ts b/src/apis/schedule.ts
@@ -13,26 +13,30 @@ interface IGetScheduleObject {
 
 export const getSchedule = async (
   name: string,
-): Promise<IScheduleElement[]> => {
+  retryCount: number = 0, // 무한 루프 방지
+): Promise<IGetScheduleResponse> => {
+  const MAX_RETRIES = 1;
   const token = getToken();
-  try {
-    const res = await fetch(
-      `${API_URL}/api/v1/schedule/getSchedule?name=${name}`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
+  const res = await fetch(
+    `${API_URL}/api/v1/schedule/getSchedule?name=${name}`,
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
       },
-    );
-    const data: IGetScheduleResponse = await res.json();
-    if (data.msg === 'Schedule not found with name') {
-      await createNewScheduleName(name);
-      return getSchedule(name);
+    },
+  );
+  const data: IGetScheduleResponse = await res.json();
+  // userName으로 된 시간표가 없을 경우 만들고 재귀 호출
+  if (data.msg === 'Schedule not found with name') {
+    if (retryCount >= MAX_RETRIES) {
+      throw new Error(
+        'Maximum retry limit reached. Unable to create schedule.',
+      );
     }
-    return data.object['scheduleElements'];
-  } catch (error) {
-    throw error;
+    await createNewScheduleName(name);
+    return getSchedule(name, retryCount + 1);
   }
+  return data;
 };
 
 interface IGetLectureByScheduleElementResponse
@@ -50,20 +54,16 @@ interface ILectureItem {
 
 export const getLectureByScheduleElement = async (id: number) => {
   const token = getToken();
-  try {
-    const res = await fetch(
-      `${API_URL}/api/v1/lecture/getLectureByScheduleElement?scheduleElementId=${id}`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
+  const res = await fetch(
+    `${API_URL}/api/v1/lecture/getLectureByScheduleElement?scheduleElementId=${id}`,
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
       },
-    );
-    const data: IGetLectureByScheduleElementResponse = await res.json();
-    return data.object;
-  } catch (error) {
-    throw error;
-  }
+    },
+  );
+  const data: IGetLectureByScheduleElementResponse = await res.json();
+  return data;
 };
 
 interface IPOSTScheduleElementResponse extends IApiResponse<null> {}
@@ -73,55 +73,48 @@ export const addScheduleElement = async (
   name: string,
 ) => {
   const token = getToken();
-  try {
-    const res = await fetch(`${API_URL}/api/v1/schedule/addElement`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${token}`,
+  const res = await fetch(`${API_URL}/api/v1/schedule/addElement`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`,
+    },
+    body: JSON.stringify({
+      scheduleDTO: {
+        name,
       },
-      body: JSON.stringify({
-        scheduleDTO: {
-          name,
-        },
-        scheduleElementDTO: inputData,
-      }),
-    });
-    const data: IPOSTScheduleElementResponse = await res.json();
-    return data.success;
-  } catch (error) {
-    throw error;
-  }
+      scheduleElementDTO: inputData,
+    }),
+  });
+  const data: IPOSTScheduleElementResponse = await res.json();
+  return data;
 };
 
 export const deleteScheduleElement = async (
   scheduleElementId: number,
   name: string,
 ) => {
   const token = getToken();
-  try {
-    const res = await fetch(`${API_URL}/api/v1/schedule/deleteElement`, {
-      method: 'DELETE',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${token}`,
+  const res = await fetch(`${API_URL}/api/v1/schedule/deleteElement`, {
+    method: 'DELETE',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`,
+    },
+    body: JSON.stringify({
+      scheduleDTO: {
+        name,
       },
-      body: JSON.stringify({
-        scheduleDTO: {
-          name,
-        },
-        scheduleElementDTO: {
-          id: scheduleElementId,
-        },
-      }),
-    });
-    const data: IPOSTScheduleElementResponse = await res.json();
-    return data.success;
-  } catch (error) {
-    throw error;
-  }
+      scheduleElementDTO: {
+        id: scheduleElementId,
+      },
+    }),
+  });
+  const data: IPOSTScheduleElementResponse = await res.json();
+  return data;
 };
 
+/** 현재는 시간표 조회할때 userName으로 된 시간표 없을 때만 쓰임. */
 const createNewScheduleName = async (name: string) => {
   const token = getToken();
   try {

diff --git a/src/apis/script.ts b/src/apis/script.ts
@@ -20,35 +20,27 @@ interface IScriptDetail {
   processedScript: string[];
 }
 
-export const getAllScripts = async (): Promise<IScriptInList[]> => {
+export const getAllScripts = async (): Promise<IGetAllScriptResponse> => {
   const token = getToken();
-  try {
-    const res = await fetch(`${API_URL}/api/v1/lecture/getAllLecture`, {
-      headers: {
-        Authorization: `Bearer ${token}`,
-      },
-    });
-    const data: IGetAllScriptResponse = await res.json();
-    return data.object;
-  } catch (error) {
-    throw error;
-  }
+  const res = await fetch(`${API_URL}/api/v1/lecture/getAllLecture`, {
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+  });
+  const data: IGetAllScriptResponse = await res.json();
+  return data;
 };
 
 export const getScriptDetail = async (id: string) => {
   const token = getToken();
-  try {
-    const res = await fetch(
-      `${API_URL}/api/v1/lecture/getLecture?lectureId=${id}`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
+  const res = await fetch(
+    `${API_URL}/api/v1/lecture/getLecture?lectureId=${id}`,
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
       },
-    );
-    const data: IGetScriptDetailResponse = await res.json();
-    return data.object;
-  } catch (error) {
-    throw error;
-  }
+    },
+  );
+  const data: IGetScriptDetailResponse = await res.json();
+  return data;
 };
diff --git a/src/apis/test.ts b/src/apis/test.ts
@@ -18,18 +18,14 @@ export interface IProblemInput {
 
 export const generateProblem = async (inputData: IProblemInput) => {
   const token = getToken();
-  try {
-    const res = await fetch(`${API_URL}/api/v1/lecture/generateProblems`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${token}`,
-      },
-      body: JSON.stringify(inputData),
-    });
-    const data: IGenerateProblemResponse = await res.json();
-    return data;
-  } catch (error) {
-    throw error;
-  }
+  const res = await fetch(`${API_URL}/api/v1/lecture/generateProblems`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`,
+    },
+    body: JSON.stringify(inputData),
+  });
+  const data: IGenerateProblemResponse = await res.json();
+  return data;
 };
diff --git a/src/apis/user.ts b/src/apis/user.ts
@@ -37,17 +37,13 @@ export interface IUserSupplementaryUpdateInfo {
 
 export const getUserInfo = async () => {
   const token = getToken();
-  try {
-    const res = await fetch(`${API_URL}/api/v1/user/present-user`, {
-      headers: {
-        Authorization: `Bearer ${token}`,
-      },
-    });
-    const data: IGetUserInfoResponse = await res.json();
-    return data.object;
-  } catch (error) {
-    throw error;
-  }
+  const res = await fetch(`${API_URL}/api/v1/user/present-user`, {
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+  });
+  const data: IGetUserInfoResponse = await res.json();
+  return data;
 };
 
 export const updateInfo = async ({
@@ -58,50 +54,42 @@ export const updateInfo = async ({
   userGrade,
 }: IUserUpdateInfo) => {
   const token = getToken();
-  try {
-    const res = await fetch(`${API_URL}/api/v1/user/updateUser`, {
-      method: 'PUT',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${token}`,
-      },
-      body: JSON.stringify({
-        userName,
-        userPassword,
-        userSchool,
-        userMajor,
-        userGrade,
-      }),
-    });
-    const data: IUpdateUserInfoResponse = await res.json();
-    return data.object;
-  } catch (error) {
-    throw error;
-  }
+  const res = await fetch(`${API_URL}/api/v1/user/updateUser`, {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`,
+    },
+    body: JSON.stringify({
+      userName,
+      userPassword,
+      userSchool,
+      userMajor,
+      userGrade,
+    }),
+  });
+  const data: IUpdateUserInfoResponse = await res.json();
+  return data;
 };
 
-export const SupplementaryUpdateInfo = async ({
+export const updateSupplementaryInfo = async ({
   userSchool,
   userMajor,
   userGrade,
 }: IUserSupplementaryUpdateInfo) => {
   const token = getToken();
-  try {
-    const res = await fetch(`${API_URL}/api/v1/user/updateUser`, {
-      method: 'PUT',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${token}`,
-      },
-      body: JSON.stringify({
-        userSchool,
-        userMajor,
-        userGrade,
-      }),
-    });
-    const data: ISupplementaryUpdateInfoResponse = await res.json();
-    return data.object;
-  } catch (error) {
-    throw error;
-  }
+  const res = await fetch(`${API_URL}/api/v1/user/updateUser`, {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`,
+    },
+    body: JSON.stringify({
+      userSchool,
+      userMajor,
+      userGrade,
+    }),
+  });
+  const data: ISupplementaryUpdateInfoResponse = await res.json();
+  return data;
 };
diff --git a/src/assets/images/401image.png b/src/assets/images/401image.png
diff --git a/src/components/atoms/HighlightedText/HighlightedText.tsx b/src/components/atoms/HighlightedText/HighlightedText.tsx
@@ -14,7 +14,11 @@ const HighlightedText = ({ text, isPreview }: IProps) => {
         if (index % 2 === 0) {
           return part;
         } else {
-          return <span className={styles.highlight}>{part}</span>;
+          return (
+            <span key={`${part}-${index}`} className={styles.highlight}>
+              {part}
+            </span>
+          );
         }
       })}
     </p>