Merge pull request #56 from TEAM-Hearus/develop

Feat: 회의 전 배포
TEAM-Hearus · Aug 20, 2024 · 02ee89c · 02ee89c
2 parents f20e26d + 9f0d788
commit 02ee89c
Show file tree

Hide file tree

Showing 26 changed files with 340 additions and 237 deletions.
diff --git a/index.html b/index.html
@@ -4,6 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="description" content="Hearus: 모두의 들을 권리를 위하여" />
     <title>Hearus</title>
   </head>
   <body>

diff --git a/src/apis/auth.ts b/src/apis/auth.ts
@@ -1,4 +1,4 @@
-import { API_URL } from '.';
+import { API_URL, IApiResponse } from '.';
 
 interface IEmailSignUpParams {
   userEmail: string;
@@ -11,34 +11,30 @@ interface IEmailLoginParams {
   userPassword: string;
 }
 
-interface IGoogleLoginParams {
+interface ISocialLoginParams {
+  social: string;
   state: string;
   code: string;
 }
 
-interface ILoginResponse {
-  status: string;
-  msg: string;
-  object: ITokens;
-}
+interface ILoginResponse extends IApiResponse<ITokens> {}
 
-interface IEmailSignupResponse {
-  status: string;
-  msg: string;
-  object: null;
-  success: boolean;
-}
+interface IEmailSignupResponse extends IApiResponse<null> {}
 
 interface ITokens {
   grantType: string;
   accessToken: string;
   refreshToken: string;
 }
 
-export const googleLogin = async ({ state, code }: IGoogleLoginParams) => {
+export const OAuthLogin = async ({
+  social,
+  state,
+  code,
+}: ISocialLoginParams) => {
   try {
     const res = await fetch(
-      `${API_URL}/login/oauth2/code/google?state=${state}&code=${code}`,
+      `${API_URL}/login/oauth2/code/${social}?state=${state}&code=${code}`,
       {
         credentials: 'include',
       },
@@ -66,9 +62,6 @@ export const emailLogin = async ({
         userIsOAuth: false,
       }),
     });
-    if (!res.ok) {
-      throw new Error('Login failed');
-    }
     const data: ILoginResponse = await res.json();
     return data.object;
   } catch (error) {
@@ -95,10 +88,6 @@ export const emailSignUp = async ({
       }),
     });
     const data: IEmailSignupResponse = await res.json();
-
-    if (!res.ok) {
-      throw new Error('SignUp failed');
-    }
     return data;
   } catch (error) {
     throw error;

diff --git a/src/apis/index.ts b/src/apis/index.ts
@@ -1,6 +1,17 @@
+/* 경로 */
 export const API_URL: string = import.meta.env.VITE_API_URL;
 
+export const SOCKETURL = import.meta.env.VITE_SOCKETIO_HOST;
+
+/* API 공통 */
 export const getToken = () => {
   const token = localStorage.getItem('token');
   return token;
 };
+
+export interface IApiResponse<T> {
+  status: string;
+  msg: string;
+  object: T;
+  success: boolean;
+}
diff --git a/src/apis/record.ts b/src/apis/record.ts
diff --git a/src/apis/schedule.ts b/src/apis/schedule.ts
@@ -1,18 +1,14 @@
-import { API_URL } from '.';
+import { API_URL, IApiResponse, getToken } from '.';
 import { IScheduleElement } from '../constants/schedule';
-import { IScheduleElementDTO } from '../utils/schedule';
-import { getToken } from './';
+import { IScheduleElementDTO } from '../constants/schedule';
 
-interface IGetScheduleResponse {
-  status: string;
-  msg: string;
-  object: {
-    id: number;
-    scheduleElements: IScheduleElement[];
-    name: string;
-    userId: string | null;
-  };
-  success: boolean;
+interface IGetScheduleResponse extends IApiResponse<IGetScheduleObject> {}
+
+interface IGetScheduleObject {
+  id: number;
+  scheduleElements: IScheduleElement[];
+  name: string;
+  userId: string | null;
 }
 
 export const getSchedule = async (
@@ -29,18 +25,18 @@ export const getSchedule = async (
       },
     );
     const data: IGetScheduleResponse = await res.json();
+    if (data.msg === 'Schedule not found with name') {
+      await createNewScheduleName(name);
+      return getSchedule(name);
+    }
     return data.object['scheduleElements'];
   } catch (error) {
     throw error;
   }
 };
 
-interface IGetLectureByScheduleElementResponse {
-  status: string;
-  msg: string;
-  object: ILectureItem[];
-  success: boolean;
-}
+interface IGetLectureByScheduleElementResponse
+  extends IApiResponse<ILectureItem[]> {}
 
 interface ILectureItem {
   id: string;
@@ -70,12 +66,7 @@ export const getLectureByScheduleElement = async (id: number) => {
   }
 };
 
-interface IPOSTScheduleElementResponse {
-  status: string;
-  msg: string;
-  object: null;
-  success: boolean;
-}
+interface IPOSTScheduleElementResponse extends IApiResponse<null> {}
 
 export const addScheduleElement = async (
   inputData: IScheduleElementDTO,
@@ -99,7 +90,7 @@ export const addScheduleElement = async (
     const data: IPOSTScheduleElementResponse = await res.json();
     return data.success;
   } catch (error) {
-    throw new Error('Failed to delete schedule element');
+    throw error;
   }
 };
 
@@ -127,6 +118,28 @@ export const deleteScheduleElement = async (
     const data: IPOSTScheduleElementResponse = await res.json();
     return data.success;
   } catch (error) {
-    throw new Error('Failed to delete schedule element');
+    throw error;
+  }
+};
+
+const createNewScheduleName = async (name: string) => {
+  const token = getToken();
+  try {
+    const res = await fetch(`${API_URL}/api/v1/schedule/addSchedule`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${token}`,
+      },
+      body: JSON.stringify({
+        name,
+      }),
+    });
+    const data = await res.json();
+    if (!data.success) {
+      throw new Error(data.msg);
+    }
+  } catch (error) {
+    throw error;
   }
 };
diff --git a/src/apis/script.ts b/src/apis/script.ts
@@ -1,18 +1,8 @@
-import { API_URL, getToken } from '.';
+import { API_URL, getToken, IApiResponse } from '.';
 
-interface IGetAllScriptResponse {
-  status: string;
-  msg: string;
-  object: IScriptInList[];
-  success: boolean;
-}
+interface IGetAllScriptResponse extends IApiResponse<IScriptInList[]> {}
 
-interface IGetScriptDetailResponse {
-  status: string;
-  msg: string;
-  object: IScriptDetail;
-  success: boolean;
-}
+interface IGetScriptDetailResponse extends IApiResponse<IScriptDetail> {}
 
 export interface IScriptInList {
   id: string;

diff --git a/src/apis/test.ts b/src/apis/test.ts
@@ -1,11 +1,6 @@
-import { API_URL, getToken } from '.';
+import { API_URL, getToken, IApiResponse } from '.';
 
-interface IGenerateProblemResponse {
-  status: string;
-  msg: string;
-  object: IQuestion[];
-  success: boolean;
-}
+interface IGenerateProblemResponse extends IApiResponse<IQuestion[]> {}
 
 export interface IQuestion {
   type: string;
@@ -33,7 +28,7 @@ export const generateProblem = async (inputData: IProblemInput) => {
       body: JSON.stringify(inputData),
     });
     const data: IGenerateProblemResponse = await res.json();
-    return data.object;
+    return data;
   } catch (error) {
     throw error;
   }

diff --git a/src/apis/user.ts b/src/apis/user.ts
@@ -1,11 +1,6 @@
-import { API_URL, getToken } from '.';
+import { API_URL, getToken, IApiResponse } from '.';
 
-interface IGetUserInfoResponse {
-  status: string;
-  msg: string;
-  object: IUserInfo;
-  success: boolean;
-}
+interface IGetUserInfoResponse extends IApiResponse<IUserInfo> {}
 
 export interface IUserInfo {
   userId: string;

diff --git a/src/components/molecules/RecordTagDropDown/RecordTagDropDown.tsx b/src/components/molecules/RecordTagDropDown/RecordTagDropDown.tsx
@@ -1,6 +1,8 @@
-import { useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import useRecordModalStore from '../../../store/useRecordModalStore';
+import useRecordModalStore, {
+  ITagItem,
+} from '../../../store/useRecordModalStore';
 import { IScheduleElement } from '../../../constants/schedule';
 import { getSchedule } from '../../../apis/schedule';
 import styles from './RecordTagDropDown.module.scss';
@@ -21,18 +23,33 @@ const RecordTagDropDown = () => {
   const TAGS = useMemo(() => {
     if (!data) return [];
 
-    return Array.from(new Set(data.map((item) => item.name)));
+    const tagObject: { [key: string]: number } = {};
+
+    data.forEach((item) => {
+      if (!tagObject.hasOwnProperty(item.name)) {
+        tagObject[item.name] = item.scheduleId;
+      }
+    });
+
+    return Object.entries(tagObject).map(([name, id]) => ({
+      name,
+      scheduleId: id,
+    }));
   }, [data]);
 
   const handleTagBtnClick = () => {
     setIsTagBtnClicked((prev) => !prev);
   };
 
-  const handleLiClick = (name: string) => {
-    updateRecordData({ tag: name });
+  const handleLiClick = (item: ITagItem) => {
+    updateRecordData({ tag: item.name, scheduleId: item.scheduleId });
     setIsTagBtnClicked(false);
   };
 
+  useEffect(() => {
+    console.log(recordData);
+  }, [recordData]);
+
   return (
     <div className={styles.wrapper}>
       <button
@@ -43,14 +60,14 @@ const RecordTagDropDown = () => {
       </button>
       {isTagBtnClicked && (
         <ul className={styles.tagsUl}>
-          {TAGS.map((name) => (
+          {TAGS.map((item) => (
             <li
-              key={name}
+              key={item.name}
               className={styles.tagLi}
-              onClick={() => handleLiClick(name)}
+              onClick={() => handleLiClick(item)}
               role="option"
             >
-              {name}
+              {item.name}
             </li>
           ))}
         </ul>

diff --git a/src/components/molecules/ScriptToolTip/ScriptToolTip.tsx b/src/components/molecules/ScriptToolTip/ScriptToolTip.tsx
@@ -29,7 +29,9 @@ const ScriptToolTip = ({ id, scheduleName }: IProps) => {
   const deleteMutation = useMutation({
     mutationFn: (id: number) => deleteScheduleElement(id, userInfo.userName),
     onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['schedule', name] });
+      queryClient.invalidateQueries({
+        queryKey: ['schedule', userInfo.userName],
+      });
     },
     onError: () => {
       alert('시간표 삭제를 실패했습니다.');