From b9b1b3bd4f41ee7154f357fdd269345cf5cf7005 Mon Sep 17 00:00:00 2001 From: JitHoon Date: Mon, 22 Jan 2024 15:49:30 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=88=84=EC=A0=81=20=EB=A6=AC=ED=8F=AC?= =?UTF-8?q?=ED=8A=B8=20=EC=97=B0=EB=8F=84=20select=20=EB=A6=AC=EC=BD=94?= =?UTF-8?q?=EC=9D=BC=20atom=EC=97=90=EC=84=9C=20=EB=B0=9B=EC=95=84?= =?UTF-8?q?=EC=98=A8=20=EA=B0=92=EC=9C=BC=EB=A1=9C=20=EC=97=B0=EB=8F=84=20?= =?UTF-8?q?=EB=B3=84=20=EA=B7=B8=EB=9E=98=ED=94=84=20API=20=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/lib/getYearReport.ts | 6 +++--- src/components/Report/LeftSection/index.tsx | 10 +++++++--- src/hooks/queries/useGetYearReport.ts | 7 +++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/api/lib/getYearReport.ts b/src/api/lib/getYearReport.ts index 42a4d44e..e5f8e6dc 100644 --- a/src/api/lib/getYearReport.ts +++ b/src/api/lib/getYearReport.ts @@ -2,11 +2,11 @@ import { instance } from '..'; import { YearReportResult } from '@/types/report'; const getYearReport = async ( - accommodation_id: number - // recoil로 쿼리 정보 가져오기 + accommodation_id: number, + year: number ): Promise => { const response = await instance.get( - `/v1/dashboards/${accommodation_id}/reports/year?year=${2023}` + `/v1/dashboards/${accommodation_id}/reports/year?year=${year}` ); return response.data; diff --git a/src/components/Report/LeftSection/index.tsx b/src/components/Report/LeftSection/index.tsx index 97266e6d..ab7777c5 100644 --- a/src/components/Report/LeftSection/index.tsx +++ b/src/components/Report/LeftSection/index.tsx @@ -1,15 +1,19 @@ import { useRecoilValue } from 'recoil'; import styled from '@emotion/styled'; -import { headerAccommodationState } from '@recoil/index'; +import { headerAccommodationState, selectedYearState } from '@recoil/index'; import { useGetYearReport } from '@hooks/index'; import { DashboardHeader } from '@components/common'; import YearReport from './YearReport'; import Graph from './Graph'; const LeftSection = () => { - const headerSelectState = useRecoilValue(headerAccommodationState); - const { data: yearReportData } = useGetYearReport(headerSelectState.id); + const selectedAccommodation = useRecoilValue(headerAccommodationState); + const selectedYear = useRecoilValue(selectedYearState); + const { data: yearReportData } = useGetYearReport( + selectedAccommodation.id, + selectedYear.year + ); const { coupon_sales_list: graphProps, ...yearReportProps } = yearReportData; const yearReport = Object.entries(yearReportProps); diff --git a/src/hooks/queries/useGetYearReport.ts b/src/hooks/queries/useGetYearReport.ts index 538fcca1..d6028956 100644 --- a/src/hooks/queries/useGetYearReport.ts +++ b/src/hooks/queries/useGetYearReport.ts @@ -3,11 +3,10 @@ import { useSuspenseQuery } from '@tanstack/react-query'; import { getYearReport } from 'src/api'; import { YearReportResult } from '@/types/report'; -// recoil로 쿼리 정보 가져오기 -const useGetYearReport = (accommodation_id: number) => +const useGetYearReport = (accommodation_id: number, year: number) => useSuspenseQuery({ - queryKey: ['YearReport', accommodation_id], - queryFn: () => getYearReport(accommodation_id) + queryKey: ['YearReport', accommodation_id, year], + queryFn: () => getYearReport(accommodation_id, year) }); export default useGetYearReport;