Merge pull request #21 from Team-B1ND/hotfix/#20

fix :: 내 일정 오류 해결 #20

src/hooks/schedule/useCalendarSchedules.ts

@@ -27,7 +27,7 @@ const useCalendarSchedules = () => {
     if (classificationKeyword === "내 일정") {
       newSchedulesData = newSchedulesData.filter(
         (schedule) =>
-          schedule.targetGrades[0].indexOf(String(memberData?.data.classroom.grade)) > -1 ||
+          schedule.targetGrades[0].indexOf(String(memberData?.data.student.grade)) > -1 ||
           schedule.targetGrades[0] === "전교생",
       );
     }
@@ -37,7 +37,7 @@ const useCalendarSchedules = () => {
         return [...prev, newHandleCalendarSchedule];
       }),
     );
-  }, [classificationKeyword, memberData?.data?.classroom?.grade, schedulesData]);
+  }, [classificationKeyword, memberData?.data?.student?.grade, schedulesData]);
 
   const calendarScheduleTransform = (schedule: Schedule) => {
     const scheduleColor = dataTransform.scheduleTargetTransform(

src/hooks/schedule/useHomeSidebarSchedule.ts

@@ -24,7 +24,7 @@ const useHomeSidebarSchedule = () => {
     setSchedules(
       schedulesData?.data.filter(
         (schedule) =>
-          schedule.targetGrades[0].indexOf(String(memberData?.data.classroom.grade)) > -1 ||
+          schedule.targetGrades[0].indexOf(String(memberData?.data.student.grade)) > -1 ||
           schedule.targetGrades[0] === "전교생",
       )!,
     );

src/types/common/common.type.ts

@@ -1,6 +1,8 @@
-export interface ClassRoom {
-  readonly grade: number;
+export interface Student {
   readonly id: number;
-  readonly placeId: number;
+  readonly name: string;
   readonly room: number;
+  readonly grade: number;
+  readonly placeId: number;
+  readonly parentPhone: string;
 }

src/types/member/member.type.ts

@@ -1,21 +1,15 @@
-import { ClassRoom } from "../common/common.type";
-
-export interface Member {
-  email: string;
-  id: string;
-  readonly joinDate: string;
-  name: string;
-  profileImage: null | string;
-  readonly role: string;
-  readonly status: "ACTIVE" | "DEACTIVATED";
-}
+import { Student } from "../common/common.type";
 
 export interface MyMemberResponse extends Response {
   data: {
-    classroom: ClassRoom;
     id: number;
-    member: Member;
+    name: string;
+    email: string;
     number: number;
     phone: string;
+    student: Student;
+    profileImage: null | string;
+    readonly role: string;
+    readonly status: "ACTIVE" | "DEACTIVATED";
   };
 }