From 24711169559bed41c11fcd7a7202663167fe9176 Mon Sep 17 00:00:00 2001 From: WizardRabbit Date: Mon, 25 Dec 2023 13:41:37 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20msw=20=EB=AA=A8=ED=82=B9=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=EC=97=90=EC=84=9C=EC=9D=98=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=AA=85=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ~~DateFormat → ~~Date --- frontend/src/mocks/handlers/calendar.ts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/frontend/src/mocks/handlers/calendar.ts b/frontend/src/mocks/handlers/calendar.ts index abf4cf93..fd261c8d 100644 --- a/frontend/src/mocks/handlers/calendar.ts +++ b/frontend/src/mocks/handlers/calendar.ts @@ -12,20 +12,19 @@ let mySchedules = [...myScheduleData]; export const calendarHandlers = [ //통합캘린더 일정 기간 조회 rest.get(`/api/my-calendar/schedules`, (req, res, ctx) => { - const startDateFormat = req.url.searchParams.get('startDate'); - const endDateFormat = req.url.searchParams.get('endDate'); + const startDate = req.url.searchParams.get('startDate'); + const endDate = req.url.searchParams.get('endDate'); - if (!startDateFormat || !endDateFormat) { + if (!startDate || !endDate) { return res(ctx.status(400)); } const searchedMySchedules = mySchedules.filter( ({ startDateTime, endDateTime }) => { const isScheduleInRange = - startDateFormat <= + startDate <= generateYYYYMMDDWithoutHyphens(new Date(startDateTime)) || - endDateFormat >= - generateYYYYMMDDWithoutHyphens(new Date(endDateTime)); + endDate >= generateYYYYMMDDWithoutHyphens(new Date(endDateTime)); return isScheduleInRange; }, @@ -44,8 +43,8 @@ export const calendarHandlers = [ `/api/team-place/:teamPlaceId/calendar/schedules`, (req, res, ctx) => { const teamPlaceId = Number(req.params.teamPlaceId); - const startDateFormat = req.url.searchParams.get('startDate'); - const endDateFormat = req.url.searchParams.get('endDate'); + const startDate = req.url.searchParams.get('startDate'); + const endDate = req.url.searchParams.get('endDate'); const index = teamPlaces.findIndex( (teamPlace) => teamPlace.id === teamPlaceId, @@ -53,17 +52,16 @@ export const calendarHandlers = [ if (index === -1) return res(ctx.status(403)); - if (!startDateFormat || !endDateFormat) { + if (!startDate || !endDate) { return res(ctx.status(400)); } const searchedSchedules = schedules.filter( ({ startDateTime, endDateTime }) => { const isScheduleInRange = - startDateFormat <= + startDate <= generateYYYYMMDDWithoutHyphens(new Date(startDateTime)) || - endDateFormat >= - generateYYYYMMDDWithoutHyphens(new Date(endDateTime)); + endDate >= generateYYYYMMDDWithoutHyphens(new Date(endDateTime)); return isScheduleInRange; },