From 7db79e5dd465335baf33c1afa65a99a05b9e3d91 Mon Sep 17 00:00:00 2001 From: Seok93 Date: Thu, 28 Nov 2024 14:13:59 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Fix:=20#274=20=EA=B0=80=EC=9E=85=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EB=8C=80=EA=B8=B0=ED=98=84=ED=99=A9=20=ED=8C=80?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=ED=95=84=ED=84=B0=EB=A7=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/query/useTeamQuery.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hooks/query/useTeamQuery.ts b/src/hooks/query/useTeamQuery.ts index 0c271a5e..945ba785 100644 --- a/src/hooks/query/useTeamQuery.ts +++ b/src/hooks/query/useTeamQuery.ts @@ -42,8 +42,8 @@ export function useReadTeams() { }, }); - const joinedTeamList = teamList.filter((team) => team.isPendingApproval === true); - const invitedTeamList = teamList.filter((team) => team.isPendingApproval === false); + const joinedTeamList = teamList.filter((team) => team.isPendingApproval === false); + const invitedTeamList = teamList.filter((team) => team.isPendingApproval === true); return { joinedTeamList, invitedTeamList, teamList, isLoading, isError, error }; } From 43447e404567780d7b7570c0c310e5f13e75655a Mon Sep 17 00:00:00 2001 From: Seok93 Date: Thu, 28 Nov 2024 14:15:40 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Fix:=20#274=20=ED=95=84=ED=84=B0=EB=A7=81?= =?UTF-8?q?=20=EC=A1=B0=EA=B1=B4=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20mock=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mocks/mockData.ts | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/mocks/mockData.ts b/src/mocks/mockData.ts index 29d3dc09..01bc8f64 100644 --- a/src/mocks/mockData.ts +++ b/src/mocks/mockData.ts @@ -327,123 +327,123 @@ export const TEAM_USER_DUMMY: TeamUser[] = [ teamId: 1, userId: 1, roleId: 1, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 1, userId: 3, roleId: 2, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 1, userId: 4, roleId: 3, - isPendingApproval: false, + isPendingApproval: true, }, { teamId: 1, userId: 8, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 1, userId: 9, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 1, userId: 11, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 1, userId: 12, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 1, userId: 13, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 1, userId: 14, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 1, userId: 15, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, // 팀2 소속 유저 정보 { teamId: 2, userId: 1, roleId: 2, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 2, userId: 3, roleId: 2, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 2, userId: 4, roleId: 1, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 2, userId: 5, roleId: 3, - isPendingApproval: false, + isPendingApproval: true, }, { teamId: 2, userId: 7, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 2, userId: 10, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, // 팀3 소속 유저 정보 { teamId: 3, userId: 1, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 3, userId: 2, roleId: 3, - isPendingApproval: true, + isPendingApproval: false, }, { teamId: 3, userId: 5, roleId: 2, - isPendingApproval: false, + isPendingApproval: true, }, { teamId: 3, userId: 6, roleId: 1, - isPendingApproval: true, + isPendingApproval: false, }, ] as const; From 94e58334d287b72b7d5f3bbde6eac98601c8b518 Mon Sep 17 00:00:00 2001 From: Seok93 Date: Thu, 28 Nov 2024 15:18:23 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Fix:=20#274=20=ED=95=84=ED=84=B0=EB=A7=81?= =?UTF-8?q?=20=EA=B0=92=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0=EB=A5=B8?= =?UTF-8?q?=20=ED=8C=80=20=EC=B4=88=EB=8C=80=20=EC=88=98=EB=9D=BD=20MSW=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mocks/services/teamServiceHandler.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mocks/services/teamServiceHandler.ts b/src/mocks/services/teamServiceHandler.ts index b5e0cd52..82fd8c10 100644 --- a/src/mocks/services/teamServiceHandler.ts +++ b/src/mocks/services/teamServiceHandler.ts @@ -225,9 +225,7 @@ const teamServiceHandler = [ (teamUser) => teamUser.teamId === Number(teamId) && teamUser.userId === Number(userId), ); - if (teamUser) { - teamUser.isPendingApproval = true; - } + if (teamUser) teamUser.isPendingApproval = false; return new HttpResponse(null, { status: 200 }); }), From 4029c5406a15bab735851e3d95ccbd0ca69ff136 Mon Sep 17 00:00:00 2001 From: Seok93 Date: Thu, 28 Nov 2024 15:31:12 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Fix:=20#274=20=ED=8C=80=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EB=B0=8F=20=ED=8C=80=EC=9B=90=20=EC=B4=88=EB=8C=80?= =?UTF-8?q?=20MSW=20=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mocks/services/teamServiceHandler.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mocks/services/teamServiceHandler.ts b/src/mocks/services/teamServiceHandler.ts index 82fd8c10..8f6ad844 100644 --- a/src/mocks/services/teamServiceHandler.ts +++ b/src/mocks/services/teamServiceHandler.ts @@ -85,7 +85,7 @@ const teamServiceHandler = [ teamId: newTeamId, userId: coworker.userId, roleId: role.roleId, - isPendingApproval: false, + isPendingApproval: true, }); } TEAM_USER_DUMMY.push(...validTeamUsers); @@ -99,7 +99,7 @@ const teamServiceHandler = [ teamId: newTeamId, userId, roleId: creatorRole.roleId, - isPendingApproval: true, + isPendingApproval: false, }); return new HttpResponse(null, { @@ -319,7 +319,7 @@ const teamServiceHandler = [ teamId: Number(teamId), userId: Number(userId), roleId: role.roleId, - isPendingApproval: true, + isPendingApproval: false, }; TEAM_USER_DUMMY.push(newUser);