diff --git a/apps/shelter/src/apis/shelter.ts b/apps/shelter/src/apis/shelter.ts index 3d2b17e4..5da11b21 100644 --- a/apps/shelter/src/apis/shelter.ts +++ b/apps/shelter/src/apis/shelter.ts @@ -8,8 +8,8 @@ type PasswordUpdateParams = { }; type PageParams = { - pageSize: number; - pageNumber: number; + page: number; + size: number; }; export const getShelterInfoAPI = () => diff --git a/apps/shelter/src/pages/my/reviews/hooks/useFetchShelterReviews.tsx b/apps/shelter/src/pages/my/reviews/hooks/useFetchShelterReviews.tsx index 48bb56dd..bfbf3e9e 100644 --- a/apps/shelter/src/pages/my/reviews/hooks/useFetchShelterReviews.tsx +++ b/apps/shelter/src/pages/my/reviews/hooks/useFetchShelterReviews.tsx @@ -2,11 +2,10 @@ import { useSuspenseInfiniteQuery } from '@tanstack/react-query'; import { getShelterReviewList } from '@/apis/shelter'; -export default function useFetchShelterReviews(pageSize: number) { +export default function useFetchShelterReviews(size: number) { return useSuspenseInfiniteQuery({ queryKey: ['reviews'], - queryFn: ({ pageParam }) => - getShelterReviewList({ pageNumber: pageParam, pageSize }), + queryFn: ({ pageParam }) => getShelterReviewList({ page: pageParam, size }), initialPageParam: 0, getNextPageParam: ({ data: { pageInfo } }, _, lastPageParam) => pageInfo.hasNext ? lastPageParam + 1 : null, diff --git a/apps/shelter/src/pages/volunteers/_queryOptions/recruitment.ts b/apps/shelter/src/pages/volunteers/_queryOptions/recruitment.ts index c21e82f8..ec90374d 100644 --- a/apps/shelter/src/pages/volunteers/_queryOptions/recruitment.ts +++ b/apps/shelter/src/pages/volunteers/_queryOptions/recruitment.ts @@ -40,8 +40,8 @@ const recruitmentQueryOptions: RecruitmentQueryOptions = { queryKey: ['recruitments'], queryFn: ({ pageParam }) => getShelterRecruitments({ - pageNumber: pageParam, - pageSize: 10, + page: pageParam, + size: 10, }), initialPageParam: 0, getNextPageParam: ({ data: { pageInfo } }, _, lastPageParam) => @@ -57,8 +57,8 @@ const recruitmentQueryOptions: RecruitmentQueryOptions = { queryFn: ({ pageParam }) => getShelterRecruitments({ ...searchFilter, - pageNumber: pageParam, - pageSize: 10, + page: pageParam, + size: 10, }), initialPageParam: 0, getNextPageParam: ({ data: { pageInfo } }, _, lastPageParam) => diff --git a/apps/shelter/src/types/apis/recruitment.ts b/apps/shelter/src/types/apis/recruitment.ts index a3c9d847..45c0d9bf 100644 --- a/apps/shelter/src/types/apis/recruitment.ts +++ b/apps/shelter/src/types/apis/recruitment.ts @@ -8,8 +8,8 @@ export type PageInfo = { }; export type Pagination = { - pageSize: number; - pageNumber: number; + page: number; + size: number; }; export type Recruitment = { diff --git a/apps/volunteer/src/apis/volunteer.ts b/apps/volunteer/src/apis/volunteer.ts index 71bb4869..90447e53 100644 --- a/apps/volunteer/src/apis/volunteer.ts +++ b/apps/volunteer/src/apis/volunteer.ts @@ -44,8 +44,8 @@ export const getVolunteerApplicants = (params: PagenationRequestParams) => }); type Pagination = { - pageSize: number; - pageNumber: number; + page: number; + size: number; }; type MyReview = { diff --git a/apps/volunteer/src/pages/shelters/profile/_components/ShelterReviews.tsx b/apps/volunteer/src/pages/shelters/profile/_components/ShelterReviews.tsx index 9a224832..8f32d02e 100644 --- a/apps/volunteer/src/pages/shelters/profile/_components/ShelterReviews.tsx +++ b/apps/volunteer/src/pages/shelters/profile/_components/ShelterReviews.tsx @@ -24,8 +24,8 @@ function ShelterReviews() { queryFn: async ({ pageParam }) => ( await getVolunteerReviewsOnShelter(shelterId, { - pageNumber: pageParam, - pageSize: 10, + page: pageParam, + size: 10, }) ).data, initialPageParam: 1, diff --git a/apps/volunteer/src/pages/volunteers/_queryOptions/recruitments.ts b/apps/volunteer/src/pages/volunteers/_queryOptions/recruitments.ts index 0c9b9381..110ddd17 100644 --- a/apps/volunteer/src/pages/volunteers/_queryOptions/recruitments.ts +++ b/apps/volunteer/src/pages/volunteers/_queryOptions/recruitments.ts @@ -40,8 +40,8 @@ const recruitmentQueryOptions: RecruitmentQueryOptions = { queryKey: ['recruitments'], queryFn: ({ pageParam }) => getRecruitments({ - pageNumber: pageParam, - pageSize: 10, + page: pageParam, + size: 10, }), initialPageParam: 0, getNextPageParam: ({ data: { pageInfo } }, _, lastPageParam) => @@ -57,8 +57,8 @@ const recruitmentQueryOptions: RecruitmentQueryOptions = { queryFn: ({ pageParam }) => getRecruitments({ ...searchFilter, - pageNumber: pageParam, - pageSize: 10, + page: pageParam, + size: 10, }), initialPageParam: 0, getNextPageParam: ({ data: { pageInfo } }, _, lastPageParam) => diff --git a/apps/volunteer/src/types/apis/recruitment.ts b/apps/volunteer/src/types/apis/recruitment.ts index 1eac34dd..19afb9d7 100644 --- a/apps/volunteer/src/types/apis/recruitment.ts +++ b/apps/volunteer/src/types/apis/recruitment.ts @@ -4,8 +4,8 @@ export type PageInfo = { }; export type Pagination = { - pageSize: number; - pageNumber: number; + size: number; + page: number; }; export type Recruitment = { diff --git a/apps/volunteer/src/types/apis/review.ts b/apps/volunteer/src/types/apis/review.ts index 0ba3264a..170ba3b4 100644 --- a/apps/volunteer/src/types/apis/review.ts +++ b/apps/volunteer/src/types/apis/review.ts @@ -4,8 +4,8 @@ export type PageInfo = { }; export type Pagination = { - pageSize: number; - pageNumber: number; + page: number; + size: number; }; export type ReviewDetailResponse = { diff --git a/packages/shared/apis/common/Recruitments.ts b/packages/shared/apis/common/Recruitments.ts index 8a1f5fd3..6e775fda 100644 --- a/packages/shared/apis/common/Recruitments.ts +++ b/packages/shared/apis/common/Recruitments.ts @@ -23,8 +23,8 @@ export const getRecruitmentDetail = (recruitmentId: number) => // 봉사자가 완료한 봉사 모집글 리스트 조회 export const getCompletedVolunteers = ( volunteerId: number, - pageNumber: number, - pageSize: number, + page: number, + size: number, ) => axiosInstance.get< { @@ -39,19 +39,19 @@ export const getCompletedVolunteers = ( shelterName: string; }[]; }, - { pageNumber: number; pageSize: number } + { page: number; size: number } >(`/volunteers/${volunteerId}/recruitments/completed`, { params: { - pageNumber, - pageSize, + page, + size, }, }); //보호소가 생성한 봉사 모집글 리스트 조회 export const getShelterRecruitment = ( shelterId: number, - pageNumber: number, - pageSize: number, + page: number, + size: number, ) => axiosInstance.get< { @@ -69,10 +69,10 @@ export const getShelterRecruitment = ( recruitmentApplicantCount: number; }[]; }, - { pageNumber: number; pageSize: number } + { page: number; size: number } >(`/shelters/${shelterId}/recruitments`, { params: { - pageNumber, - pageSize, + page, + size, }, }); diff --git a/packages/shared/apis/common/Review.ts b/packages/shared/apis/common/Review.ts index 211b85a6..531b981e 100644 --- a/packages/shared/apis/common/Review.ts +++ b/packages/shared/apis/common/Review.ts @@ -2,8 +2,8 @@ import axiosInstance from 'apis/axiosInstance'; export const getVolunteerReviews = ( volunteerId: number, - pageNumber: number, - pageSize: number, + page: number, + size: number, ) => axiosInstance.get< { @@ -20,12 +20,12 @@ export const getVolunteerReviews = ( }[]; }, { - pageNumber: number; - pageSize: number; + page: number; + size: number; } >(`/volunteers/${volunteerId}/reviews`, { params: { - pageNumber, - pageSize, + page, + size, }, });