fix :: API 연동 함수 return 값 변경

DSM-PICK · Nov 9, 2023 · 60d8087 · 60d8087
1 parent 2d8e8c0
commit 60d8087
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 94 deletions.
diff --git a/src/components/activityAccept/ApplicationList.tsx b/src/components/activityAccept/ApplicationList.tsx
@@ -48,7 +48,7 @@ const ApplicationList = ({
         grade: gradeResult.id as number,
         classNum: classResult.id as number,
         floor: layerResult.id as number,
-        type: (todayType?.data.type as string) || "SELF_STUDY",
+        type: (todayType?.type as string) || "SELF_STUDY",
       }),
     {
       cacheTime: 0,

diff --git a/src/components/activityAccept/Modal.tsx b/src/components/activityAccept/Modal.tsx
@@ -108,15 +108,13 @@ const OutingIssueModal = ({ setIsOpenOutingModal }: OutingIssueModalProps) => {
               value={name}
               onChange={(e) => setName(e.target.value)}
             />
-            {name != "" && !(userList?.data.length === 0) && (
+            {name != "" && !(userList?.length === 0) && (
               <SearchStudentList>
-                {userList?.data.map(
-                  (value: SearchedUserListType, idx: number) => (
-                    <span key={idx} onClick={() => onSetId(value)}>
-                      {value.num} {value.name}
-                    </span>
-                  )
-                )}
+                {userList?.map((value: SearchedUserListType, idx: number) => (
+                  <span key={idx} onClick={() => onSetId(value)}>
+                    {value.num} {value.name}
+                  </span>
+                ))}
               </SearchStudentList>
             )}
             <AddButton onClick={pushUserIdList}>추가</AddButton>

diff --git a/src/components/activityAccept/MovedStudent.tsx b/src/components/activityAccept/MovedStudent.tsx
@@ -57,8 +57,8 @@ const MovedStudent = ({
         </ActivityBtn>
       </HeadBar>
       <MovingBox>
-        {moveList?.data.move_list.length ? (
-          moveList?.data.move_list.map((data) => (
+        {moveList?.move_list.length ? (
+          moveList?.move_list.map((data) => (
             <MovingComponent
               key={data.student_number}
               student_number={data.student_number}

diff --git a/src/components/attendance/Filter.tsx b/src/components/attendance/Filter.tsx
@@ -56,10 +56,10 @@ const Filter = ({ setClassName, setDate, setClassroomId }: Props) => {
     () =>
       getLayerClassList(
         floorDropDownResult.id,
-        isSuccessDateType && !!dateType.data.type ? dateType.data.type : ""
+        isSuccessDateType && !!dateType.type ? dateType.type : ""
       ),
     {
-      enabled: isSuccessDateType && !!dateType.data.type,
+      enabled: isSuccessDateType && !!dateType.type,
     }
   );
 

diff --git a/src/components/sidebar/SidebarLayout.tsx b/src/components/sidebar/SidebarLayout.tsx
@@ -61,7 +61,7 @@ const SidebarLayout = ({ children }: { children: React.ReactNode }) => {
   const router = useRouter();
   const { handleError } = useApiError();
 
-  const { data: state, isSuccess } = useQuery(
+  const { data: state } = useQuery(
     "state",
     () => getTodaySelfStudyTeacherWhether(),
     {
@@ -83,7 +83,7 @@ const SidebarLayout = ({ children }: { children: React.ReactNode }) => {
       <SidebarWrapper id="sidebar">
         <TitleContainer>
           <Image onClick={onClickLogo} src={Logo} alt="logo" />
-          <h1>{state?.data.name} 선생님</h1>
+          <h1>{state?.name} 선생님</h1>
         </TitleContainer>
         <ItemContainer>
           {nameToInfo.map((item, idx) => {

diff --git a/src/pages/attendance.tsx b/src/pages/attendance.tsx
@@ -39,8 +39,8 @@ const AttendancePage = () => {
       <>
         <Header className={className} isFriday={isFriday} />
         <StudentWrapper>
-          {isSuccess && attendanceCheckList.data.student_list.length ? (
-            attendanceCheckList.data.student_list.map((data, idx) => {
+          {isSuccess && attendanceCheckList.student_list.length ? (
+            attendanceCheckList.student_list.map((data, idx) => {
               return (
                 <List
                   key={idx}

diff --git a/src/pages/change-person/club.tsx b/src/pages/change-person/club.tsx
@@ -1,5 +1,5 @@
 import styled from "@emotion/styled";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { ItemType } from "../../models/common/index";
 import Member from "@/components/club/member";
 import DropDown from "@/components/common/Dropdown";
@@ -69,22 +69,22 @@ const ClubPerson = () => {
 
   return (
     <PageContainer
-      title={clubList?.data.club_name! && `${clubList?.data.club_name}`}
+      title={clubList?.club_name! && `${clubList?.club_name}`}
       subTitle={
-        clubList?.data
-          ? `${clubList?.data.classroom_name}(${clubList?.data.teacher_name}
+        clubList
+          ? `${clubList.classroom_name}(${clubList.teacher_name}
             선생님 담당)`
           : `층 및 동아리를 선택해주세요.`
       }
       filter={filter}
     >
       <Container>
-        {clubList && clubList.data.student_list.length ? (
-          clubList.data.student_list?.map((list) => (
+        {clubList && clubList.student_list.length ? (
+          clubList.student_list?.map((list) => (
             <Member
               key={list.student_id}
-              head_club_id={clubList.data.club_id}
-              club_name={clubList.data.club_name}
+              head_club_id={clubList.club_id}
+              club_name={clubList.club_name}
               refetch={refetch}
               {...list}
             />

diff --git a/src/pages/main.tsx b/src/pages/main.tsx
@@ -10,87 +10,85 @@ import {
   getMainpageStudnetCount,
 } from "@/utils/api/selfStudy/index";
 import { useApiError } from "@/hooks/useApiError";
+import { MainPageStudentNumber } from "@/models/selfStudy/response";
+
+const QUERY_KEYS = {
+  POST_LIST: "postlist",
+  STATE: "state",
+  STUDENTS: "students",
+};
+
+const OutingText = ({ students }: { students: MainPageStudentNumber }) => (
+  <>
+    <p>현재 외출 신청 학생은</p>
+    <p>
+      총 <i>{students?.application}명</i>입니다.
+    </p>
+  </>
+);
+
+const MoveText = ({ students }: { students: MainPageStudentNumber }) => (
+  <>
+    <p>현재 2층에서 이동한</p>
+    <p>
+      학생 수는 <i>{students?.classroom_movement}명</i>입니다.
+    </p>
+  </>
+);
+
+const OutingListText = ({ students }: { students: MainPageStudentNumber }) => (
+  <>
+    <p> 현재 외출 중인 학생은</p>
+    <p>
+      총 <i>{students?.picnic}명</i>입니다.
+    </p>
+  </>
+);
 
 const Home = () => {
   const { handleError } = useApiError();
-  const { data } = useQuery("postlist", () => getTodaySelfStudyTeacher(), {
-    onError: handleError,
-  });
+
+  const { data: teachers } = useQuery(
+    QUERY_KEYS.POST_LIST,
+    getTodaySelfStudyTeacher,
+    { onError: handleError }
+  );
 
   const { data: state } = useQuery(
-    "state",
-    () => getTodaySelfStudyTeacherWhether(),
-    {
-      onError: handleError,
-    }
+    QUERY_KEYS.STATE,
+    getTodaySelfStudyTeacherWhether,
+    { onError: handleError }
   );
 
   const { data: students } = useQuery(
-    "students",
-    () => getMainpageStudnetCount(),
+    QUERY_KEYS.STUDENTS,
+    getMainpageStudnetCount,
     { onError: handleError, cacheTime: 0 }
   );
 
-  const OutingText = () => {
-    return (
-      <>
-        <p>현재 외출 신청 학생은</p>
-        <p>
-          총 <i>{students?.data.application}명</i>입니다.
-        </p>
-      </>
-    );
-  };
-
-  const MoveText = () => {
-    return (
-      <>
-        <p>현재 2층에서 이동한</p>
-        <p>
-          학생 수는 <i>{students?.data.classroom_movement}명</i>입니다.
-        </p>
-      </>
-    );
-  };
-
-  const OutingListText = () => {
-    return (
-      <>
-        <p> 현재 외출 중인 학생은</p>
-        <p>
-          총 <i>{students?.data.picnic}명</i>입니다.
-        </p>
-      </>
-    );
-  };
-
   return (
     <MainPageContainer>
-      <Date
-        date={state?.data.date!}
-        name={state?.data.name!}
-        floor={state?.data.floor!}
-      />
+      <Date date={state?.date!} name={state?.name!} floor={state?.floor!} />
       <TodayTeacher
-        second_floor={data?.data.second_floor!}
-        third_floor={data?.data.third_floor!}
-        fourth_floor={data?.data.fourth_floor!}
+        second_floor={teachers?.second_floor!}
+        third_floor={teachers?.third_floor!}
+        fourth_floor={teachers?.fourth_floor!}
       />
       <CardContainer>
         <Card
-          text={OutingText}
+          text={() => <OutingText students={students!} />}
           img={Outing}
           btnText="외출 수락하러 가기"
           link="/activity-accept"
         />
         <Card
-          text={MoveText}
+          text={() => <MoveText students={students!} />}
           img={Attendance}
           btnText="출결 상태 확인하기"
           link="/attendance"
         />
         <Card
-          text={OutingListText}
+          text={() => <OutingListText students={students!} />}
           img={OutingList}
           btnText="외출자 목록보기"
           link="/outlist"

diff --git a/src/pages/weekend-meal.tsx b/src/pages/weekend-meal.tsx
@@ -68,13 +68,13 @@ const WeekendMeal = () => {
       }),
     {
       onSuccess: () => {
-        setIsTeacherCheck(isTeacherCheckData?.data.check);
+        setIsTeacherCheck(isTeacherCheckData?.check);
       },
     }
   );
 
   useEffect(() => {
-    setIsTeacherCheck(isTeacherCheckData?.data.check);
+    setIsTeacherCheck(isTeacherCheckData?.check);
   }, [isTeacherCheckData]);
 
   const { mutate: teacherCheck } = useMutation(
@@ -130,12 +130,12 @@ const WeekendMeal = () => {
         <StudentContainer
           title="응답자"
           subTitle="응답자의 상태는 수정할 수 없습니다"
-          students={studentList?.data.response_students}
+          students={studentList?.response_students}
         />
         <StudentContainer
           title="미응답자"
           subTitle="미응답자의 상태를 수정할 수 있습니다"
-          students={studentList?.data.non_response_students}
+          students={studentList?.non_response_students}
         />
       </Wrapper>
     </PageContainer>

diff --git a/src/utils/api/common/index.ts b/src/utils/api/common/index.ts
@@ -14,7 +14,7 @@ export const getDateType = async (date: string) => {
   const dateType = await instance.get<GetDateTypeDto>(
     `/pick/admin/?date=${date}`
   );
-  return dateType;
+  return dateType.data;
 };
 
 interface GetTeachersListDto {

diff --git a/src/utils/api/outing/index.ts b/src/utils/api/outing/index.ts
@@ -48,5 +48,5 @@ export const searchUser = async (name: string) => {
   const userList = await instance.get<SearchedUserListType[]>(
     `/users/search?name=${name}`
   );
-  return userList;
+  return userList.data;
 };
diff --git a/src/utils/api/selfStudy/index.ts b/src/utils/api/selfStudy/index.ts
@@ -27,14 +27,14 @@ import {
 export const getTodaySelfStudyTeacherWhether = async () => {
   const todaySelfStudyTeacherWhether =
     await instance.get<TodaySelfStudyTeacher>(`/pick/admin/state`);
-  return todaySelfStudyTeacherWhether;
+  return todaySelfStudyTeacherWhether.data;
 };
 
 export const getTodaySelfStudyTeacher = async () => {
   const todaySelfStudyTeacher = await instance.get<TodaySelfStudyTeacherDto>(
     `/pick/self-study/today`
   );
-  return todaySelfStudyTeacher;
+  return todaySelfStudyTeacher.data;
 };
 
 export const getChargeClass = async () => {
@@ -63,14 +63,14 @@ export const getMainpageStudnetCount = async () => {
   const getManipageCount = await instance.get<MainPageStudentNumber>(
     `/pick/admin/students/count`
   );
-  return getManipageCount;
+  return getManipageCount.data;
 };
 
 export const getMoveStudentList = async (request: MoveStudentRequest) => {
   const moveStudentList = await instance.get<MoveSudentList>(
     `/pick/admin/movement?grade=${request.grade}&classNum=${request.classNum}&floor=${request.floor}`
   );
-  return moveStudentList;
+  return moveStudentList.data;
 };
 
 export const getAttendanceCheckList = async (
@@ -79,7 +79,7 @@ export const getAttendanceCheckList = async (
   const attendanceCheckList = await instance.get<AttendanceCheckStudentList>(
     `/pick/admin/attendance/${request.classroom_id}?date=${request.date}`
   );
-  return attendanceCheckList;
+  return attendanceCheckList.data;
 };
 
 export const getAfterSchoolMemberList = async (after_school_id: string) => {
@@ -93,7 +93,7 @@ export const getClubMemberList = async (club_id: string) => {
   const clubMemberList = await instance.get<ClubMemberList>(
     `/pick/admin/club/${club_id}`
   );
-  return clubMemberList;
+  return clubMemberList.data;
 };
 
 export const postIssuanceOuting = async (request: IssuanceOuting) => {

diff --git a/src/utils/api/weekendMeal/index.ts b/src/utils/api/weekendMeal/index.ts
@@ -9,10 +9,10 @@ import instance from "@/utils/axios";
 export const getWeekendMealStudentList = async (
   request: WeekendMealStudentListRequestDto
 ) => {
-  const weekendMealStudentList = await instance.get(
+  const response = await instance.get(
     `/applications/admin/weekend-meal/?grade=${request.gradeNum}&classNum=${request.classNum}`
   );
-  return weekendMealStudentList;
+  return response.data;
 };
 
 export const checkTeacher = async (request: CheckTeacherRequestDto) => {
@@ -47,7 +47,8 @@ export const weekendMealPeriodChange = async (allowedPeriod: boolean) => {
 export const getIsTeacherCheck = async (
   request: getIsTeacherCheckRequestDto
 ) => {
-  return instance.get(
+  const response = await instance.get(
     `/applications/admin/check?grade=${request.gradeNum}&classNum=${request.classNum}`
   );
+  return response.data;
 };