feat: Response 객체에 totalElements 값 추가

woowacourse-teams · Oct 12, 2023 · 838d38e · 838d38e
1 parent a860bb6
commit 838d38e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/frontend/src/hooks/queries/recipe/useInfiniteRecipeCommentQuery.ts b/frontend/src/hooks/queries/recipe/useInfiniteRecipeCommentQuery.ts
@@ -3,19 +3,30 @@ import { useSuspendedInfiniteQuery } from '../useSuspendedInfiniteQuery';
 import { recipeApi } from '@/apis';
 import type { CommentResponse } from '@/types/response';
 
-const fetchRecipeComments = async (pageParam: number, recipeId: number) => {
-  const response = await recipeApi.get({ params: `/${recipeId}/comments`, queries: `?lastId=${pageParam}` });
+interface PageParam {
+  lastId: number;
+  totalElements: number | null;
+}
+
+const fetchRecipeComments = async (pageParam: PageParam, recipeId: number) => {
+  const { lastId, totalElements } = pageParam;
+  const response = await recipeApi.get({
+    params: `/${recipeId}/comments`,
+    queries: `?lastId=${lastId}&totalElements=${totalElements}`,
+  });
   const data: CommentResponse = await response.json();
   return data;
 };
 
 const useInfiniteRecipeCommentQuery = (recipeId: number) => {
   return useSuspendedInfiniteQuery(
     ['recipeComment', recipeId],
-    ({ pageParam = 0 }) => fetchRecipeComments(pageParam, recipeId),
+    ({ pageParam }) => fetchRecipeComments(pageParam, recipeId),
     {
       getNextPageParam: (prevResponse: CommentResponse) => {
-        const lastCursor = prevResponse.comments[prevResponse.comments.length - 1].id;
+        const lastId = prevResponse.comments[prevResponse.comments.length - 1].id;
+        const totalElements = prevResponse.totalElements;
+        const lastCursor = { lastId: lastId, totalElements: totalElements };
         return prevResponse.hasNext ? lastCursor : undefined;
       },
     }

diff --git a/frontend/src/types/response.ts b/frontend/src/types/response.ts
@@ -66,5 +66,6 @@ export interface MemberRecipeResponse {
 
 export interface CommentResponse {
   hasNext: boolean;
+  totalElements: number | null;
   comments: Comment[];
 }