refactor: report api mocking 로직 수정 (#285)

soyoung125 · May 7, 2024 · 5dc44b1 · 5dc44b1
1 parent ecf944c
commit 5dc44b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/mocks/handlers.ts b/src/mocks/handlers.ts
@@ -357,21 +357,21 @@ export const handlers = [
     );
   }),
 
-  http.get<MonthScheduleQuery>(`${DOMAIN}/report/month`, async ({ params }) => {
-    // const user_id = req.url.searchParams.get("user_id");
-    // const date = req.url.searchParams.get("date");
-    const { user_id, date } = params;
+  http.get(`${DOMAIN}/report/month`, async ({ request }) => {
+    const url = new URL(request.url);
+    const user_id = url.searchParams.get("user_id");
+    const date = url.searchParams.get("date");
     const schedules = getLocalStorage<Schedule[]>(
       LOCAL_STORAGE_KEY_SCHEDULES,
       []
     );
     const monthSchedules = schedules.filter(
       (schedule) =>
         schedule.user_id === user_id &&
-        moment(date).isSame(schedule.start_date, "month")
+        moment(date).isSameOrAfter(schedule.start_date, "month") &&
+        moment(date).isSameOrBefore(schedule.end_date, "month")
     );
     await delay(1000);
-
     if (monthSchedules.length === 0) {
       return HttpResponse.json(
         {

diff --git a/src/pages/reports/Report/Report.tsx b/src/pages/reports/Report/Report.tsx
@@ -56,7 +56,8 @@ function Report() {
   if (isPending) {
     return <>loading</>;
   }
-  if (!report?.date || isError) {
+
+  if (!report?.expenditure_this_month || isError) {
     return <>소비 데이터가 없습니다.</>;
   }