Refactor: 무한스크롤 리팩토링 #65

puppypawpaw · Oct 16, 2023 · be00ae8 · be00ae8
1 parent 6a7779f
commit be00ae8
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 112 deletions.
diff --git a/components/pages/main/Feed/BoardsList/index.tsx b/components/pages/main/Feed/BoardsList/index.tsx
@@ -20,9 +20,7 @@ export default function BoardsList({
     data: boardList,
     isLoading,
     hasNextPage,
-  } = useGetBoardList({
-    infiniteQueryKey: ['boards'],
-  });
+  } = useGetBoardList();
 
   return (
     <FlexBox direction="column" className="w-full gap-10">

diff --git a/hooks/common/useInfiniteScroll.tsx b/hooks/common/useInfiniteScroll.tsx
@@ -0,0 +1,46 @@
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { useEffect } from 'react';
+import { useInView } from 'react-intersection-observer';
+
+interface InfiniteScrollProps<T> {
+  queryKey: string;
+  firstPageParam: number;
+  queryFn: (pageNumber: number) => Promise<T>;
+  getNextPageParamFn: (page: T) => void;
+}
+
+export default function useInfiniteScroll<T>({
+  queryKey,
+  firstPageParam,
+  queryFn,
+  getNextPageParamFn,
+}: InfiniteScrollProps<T>) {
+  const { data, fetchNextPage, isLoading, hasNextPage, isFetchingNextPage } =
+    useInfiniteQuery({
+      queryKey: [queryKey],
+      queryFn: ({ pageParam = firstPageParam }): Promise<T> =>
+        queryFn(pageParam),
+      getNextPageParam: getNextPageParamFn,
+    });
+
+  // 무한 스크롤 화면 가장 아래 부분 탐지하는 observer
+  function Observer({ children }: { children: React.ReactNode }) {
+    const { ref, inView } = useInView({ threshold: 1 });
+    useEffect(() => {
+      if (inView && hasNextPage) {
+        fetchNextPage();
+      }
+    }, [inView]);
+    if (!hasNextPage || !data) return null;
+    return (
+      <div ref={ref}>{isLoading || isFetchingNextPage ? children : null}</div>
+    );
+  }
+
+  return {
+    Observer,
+    data,
+    isLoading,
+    hasNextPage,
+  };
+}
diff --git a/hooks/queries/useGetBoardList.tsx b/hooks/queries/useGetBoardList.tsx
@@ -1,52 +1,19 @@
 'use client';
 
-import { useEffect } from 'react';
-import { useInView } from 'react-intersection-observer';
-import { useInfiniteQuery } from '@tanstack/react-query';
 import { getBoardList } from '@/service/board';
 import { BoardList } from '@/types/types';
+import useInfiniteScroll from '../common/useInfiniteScroll';
 
-interface InfiniteScrollProps {
-  infiniteQueryKey: string[];
-  pageParameter?: number;
-  pageSize?: number;
-  inViewThreshold?: number;
-}
-
-export default function useGetBoardList({
-  infiniteQueryKey,
-  pageParameter = 1,
-  pageSize = 5,
-}: InfiniteScrollProps) {
-  const { data, fetchNextPage, isLoading, hasNextPage, isFetchingNextPage } =
-    useInfiniteQuery({
-      queryKey: infiniteQueryKey,
-      queryFn: ({ pageParam = pageParameter }): Promise<BoardList> =>
-        getBoardList({ pageParam, pageSize }),
-      getNextPageParam: (boardlist) =>
-        boardlist.last ? undefined : boardlist.number + 1,
-      select: (d) => ({
-        pages: d.pages.flatMap((page) => page),
-        pageParams: d.pageParams,
-      }),
+export default function useGetBoardList() {
+  const { data, isLoading, Observer, hasNextPage } =
+    useInfiniteScroll<BoardList>({
+      queryKey: 'boardsList',
+      firstPageParam: 0,
+      queryFn: getBoardList,
+      getNextPageParamFn: (boardList) =>
+        boardList.last ? undefined : boardList.number + 1,
     });
 
-  // 무한 스크롤 화면 가장 아래 부분 탐지하는 observer
-  function Observer({ children }: { children: React.ReactNode }) {
-    const { ref, inView } = useInView({ threshold: 1 });
-
-    useEffect(() => {
-      if (inView && hasNextPage) {
-        fetchNextPage();
-      }
-    }, [inView]);
-
-    if (!hasNextPage || !data) return null;
-    return (
-      <div ref={ref}>{isLoading || isFetchingNextPage ? children : null}</div>
-    );
-  }
-
   return {
     Observer,
     data,

diff --git a/hooks/queries/useGetMyBoardList.tsx b/hooks/queries/useGetMyBoardList.tsx
@@ -1,42 +1,17 @@
 'use client';
 
-import { useEffect } from 'react';
-import { useInView } from 'react-intersection-observer';
-import { useInfiniteQuery } from '@tanstack/react-query';
 import getMyBoardList from '@/service/myPage';
 import { MyBoardList } from '@/types/types';
-
-const QUERY_KEY = ['myBoards'];
+import useInfiniteScroll from '../common/useInfiniteScroll';
 
 export default function useGetMyBoardList() {
-  const { data, fetchNextPage, isLoading, hasNextPage, isFetchingNextPage } =
-    useInfiniteQuery({
-      queryKey: QUERY_KEY,
-      queryFn: ({ pageParam = 0 }): Promise<MyBoardList> =>
-        getMyBoardList(pageParam),
-      getNextPageParam: (lastPage, allPages) =>
-        allPages.length < 20 ? allPages.length + 1 : undefined,
-      select: (d) => ({
-        pages: d.pages.flatMap((page) => page),
-        pageParams: d.pageParams,
-      }),
-    });
-
-  // 무한 스크롤 화면 가장 아래 부분 탐지하는 observer
-  function Observer({ children }: { children: React.ReactNode }) {
-    const { ref, inView } = useInView({ threshold: 1 });
-
-    useEffect(() => {
-      if (inView && hasNextPage) {
-        fetchNextPage();
-      }
-    }, [inView]);
-
-    if (!hasNextPage || !data) return null;
-    return (
-      <div ref={ref}>{isLoading || isFetchingNextPage ? children : null}</div>
-    );
-  }
+  const { data, isLoading, Observer } = useInfiniteScroll<MyBoardList>({
+    queryKey: 'myBoards',
+    firstPageParam: 0,
+    queryFn: getMyBoardList,
+    getNextPageParamFn: (boardlist) =>
+      boardlist.last ? undefined : boardlist.number + 1,
+  });
 
   return {
     Observer,

diff --git a/hooks/queries/useGetMyBookmarkedBoardList.tsx b/hooks/queries/useGetMyBookmarkedBoardList.tsx
@@ -6,32 +6,24 @@ import { useInfiniteQuery } from '@tanstack/react-query';
 import getMyBoardList from '@/service/myPage';
 import { BookmarkedBoardList } from '@/types/types';
 
-const QUERY_KEY = ['bookmarkedBoards'];
-
 export default function useGetBookmarkedBoardList() {
   const { data, fetchNextPage, isLoading, hasNextPage, isFetchingNextPage } =
     useInfiniteQuery({
-      queryKey: QUERY_KEY,
+      queryKey: ['bookmarkedBoards'],
       queryFn: ({ pageParam = 0 }): Promise<BookmarkedBoardList> =>
         getMyBoardList(pageParam),
-      getNextPageParam: (lastPage, allPages) =>
-        allPages.length < 20 ? allPages.length + 1 : undefined,
-      select: (d) => ({
-        pages: d.pages.flatMap((page) => page),
-        pageParams: d.pageParams,
-      }),
+      getNextPageParam: (boardlist) =>
+        boardlist.last ? undefined : boardlist.number + 1,
     });
 
   // 무한 스크롤 화면 가장 아래 부분 탐지하는 observer
   function Observer({ children }: { children: React.ReactNode }) {
     const { ref, inView } = useInView({ threshold: 1 });
-
     useEffect(() => {
       if (inView && hasNextPage) {
         fetchNextPage();
       }
     }, [inView]);
-
     if (!hasNextPage || !data) return null;
     return (
       <div ref={ref}>{isLoading || isFetchingNextPage ? children : null}</div>

diff --git a/service/board.ts b/service/board.ts
@@ -10,10 +10,6 @@ interface PostCommentType {
   parentId: number;
   content: string;
 }
-interface GetListApiProps {
-  pageParam: number;
-  pageSize: number;
-}
 
 export async function postBoard(postBoardData: PostBoardType) {
   const url = `endpoint/api/board/register`;
@@ -29,10 +25,16 @@ export async function postBoard(postBoardData: PostBoardType) {
   return response.json();
 }
 
-export async function getBoardList({ pageParam, pageSize }: GetListApiProps) {
+export async function getBoardList(pageParam: number) {
+  let url = `/endpoint/api/board/list?pageSize=5`;
+  if (pageParam !== 0) {
+    url += `&pageNumber=${pageParam}`;
+  }
   try {
-    const url = `/endpoint/api/board/list?pageNumber=${pageParam}&pageSize=${pageSize}`;
     const response = await fetch(url);
+    if (response.status === 401) {
+      throw new AuthError('로그인이 필요한 서비스입니다.');
+    }
     if (!response.ok) {
       throw new Error(`서버오류:${response.status}`);
     }
@@ -59,20 +61,3 @@ export async function postComment(postCommentData: PostCommentType) {
   });
   return response.json();
 }
-
-// export async function getCommentList({ pageParam, pageSize }: GetListApiProps) {
-//   try {
-//     const url = `/endpoint/api/reply/list?pageNumber=${pageParam}&pageSize=${pageSize}`;
-//     const response = await fetch(url);
-//     if (!response.ok) {
-//       throw new Error(`서버오류:${response.status}`);
-//     }
-//     return await response.json();
-//   } catch (error) {
-//     if (error instanceof AuthError) {
-//       window.location.replace('/auth/login');
-//       alert(error.message);
-//     }
-//     throw error;
-//   }
-// }