Merge pull request #141 from Dev-FE-1/hotfix/timeline-posts-duplicate…

…-137 [Bug] 타임라인 게시물 중복 해결, 타임라인에 본인 포스트가 올라오지 않는 오류 해결(#137)
Dev-FE-1 · Sep 9, 2024 · 9904502 · 9904502
2 parents dbb3a56 + 2402fda
commit 9904502
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/api/fetchPosts.ts b/src/api/fetchPosts.ts
@@ -128,7 +128,7 @@ export const getPostsByFollowingUsers = async ({
     return [];
   }
 
-  const followingUserIds = userDoc.data().following;
+  const followingUserIds = userDoc.data().following ?? [];
 
   let q = query(
     postsCollection,

diff --git a/src/hooks/useFilteredPostsTimelines.ts b/src/hooks/useFilteredPostsTimelines.ts
@@ -25,13 +25,15 @@ export const useFilteredPostsTimelinesQuery = ({ userId }: { userId: string }) =
         const noneFollowingUserPosts = await getPostsByNonFollowingUsers({
           userId,
           count: POSTS_FETCH_LIMIT,
-          lastPostId: pageParam as string | undefined,
+          lastPostId:
+            followingUserPosts[followingUserPosts.length - 1]?.postId ||
+            (pageParam as string | undefined),
         });
-        posts = noneFollowingUserPosts;
+        posts = [...followingUserPosts, ...noneFollowingUserPosts];
       }
       return {
         posts: posts,
-        nextCursor: posts.length === POSTS_FETCH_LIMIT ? posts[posts.length - 1].postId : null,
+        nextCursor: posts.length > 2 ? posts[posts.length - 1].postId : null,
       };
     },
     getNextPageParam: (lastPage) => lastPage.nextCursor,