feat: update query for home page

Author: luannguyenQV

apps/web/@/molecules/posts/post-item/bookmark-button/index.tsx

@@ -1,9 +1,8 @@
 import React from "react"
 
-import { PostOnUserType } from "database"
+import { PostOnUserType, TPostItem } from "database"
 
 import { getTotalActions } from "@/actions/protect/postAction"
-import { TPostItem } from "@/types/posts"
 
 import BookmarkButton from "./BookmarkButton"
 

apps/web/@/molecules/posts/post-item/comment-button/index.tsx

@@ -1,10 +1,10 @@
 import React from "react"
 import Link from "next/link"
 
+import { TPostItem } from "database"
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "ui"
 
 import APP_ROUTES from "@/constants/routes"
-import { TPostItem } from "@/types/posts"
 import { generatePath } from "@/utils/generatePath"
 
 type CommentButtonProps = {

apps/web/@/molecules/posts/post-item/index.tsx

@@ -42,13 +42,12 @@ export default function PostItem({ post }: { post: TPostItem }) {
           }}
         />
 
-        {/* <div className="mt-2 flex justify-between">
+        <div className="mt-2 flex justify-between">
           <div className="flex gap-4">
             <LikeButton post={post} />
             <CommentButton post={post} />
           </div>
-          <BookmarkButton post={post} />
-        </div> */}
+        </div>
       </div>
       {post.Image && (
         <div className="flex items-center">

apps/web/@/molecules/posts/post-item/like-button/index.tsx

@@ -1,8 +1,7 @@
+import { TPostItem } from "database"
 import { useTranslations } from "next-intl"
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger, Typography } from "ui"
 
-import { TPostItem } from "@/types/posts"
-
 type LikeButtonProps = {
   post: TPostItem
 }

apps/web/@/molecules/posts/post-item/post-meta/index.tsx

@@ -12,6 +12,8 @@ type PostMetaProps = {
 }
 
 const PostMeta: React.FC<PostMetaProps> = ({ post }) => {
+  if (!post?.author) return null
+
   return (
     <div className="mt-2 flex items-center gap-2 text-xs text-gray-400">
       <div className="text hover:underline">

apps/web/app/[lang]/(public)/page.tsx

@@ -15,7 +15,10 @@ export default async function Page({
 }: {
   searchParams: { [key: string]: string | string[] | undefined }
 }) {
-  const posts = await getPosts(searchParams)
+  const posts = await getPosts({
+    ...searchParams,
+    postStatus: PostStatus.PUBLISHED,
+  })
 
   return (
     <div className="">

packages/database/src/posts/queries.ts

@@ -45,7 +45,7 @@ export const getPost = async ({
   }
 }
 
-export const getPosts = async ({ searchParams }: TGetPostsRequest): Promise<TGetPostsResponse> => {
+export const getPosts = async (searchParams: TGetPostsRequest): Promise<TGetPostsResponse> => {
   const searchTerm = searchParams?.search || ""
   const tag = searchParams?.tag || ""
   const filter = searchParams?.filter || FilterValues.LASTED // lasted or hot
@@ -144,7 +144,9 @@ export const getPosts = async ({ searchParams }: TGetPostsRequest): Promise<TGet
       prisma.post.count({ where }),
       prisma.post.findMany({
         where,
-        select: postSelect,
+        select: {
+          ...postSelect,
+        },
         take: Number(limit),
         skip: (Number(page) - 1) * Number(limit),
         orderBy,
@@ -153,8 +155,8 @@ export const getPosts = async ({ searchParams }: TGetPostsRequest): Promise<TGet
 
     return {
       data: {
-        data: posts,
         total,
+        data: posts,
         page: Number(page),
         limit: Number(limit),
         totalPages: Math.ceil(total / Number(limit)),

packages/database/src/posts/selects.ts

@@ -24,19 +24,12 @@ export const postSelect = {
       image: true,
     },
   },
-  postOnUser: {
+  _count: {
     select: {
-      type: true,
-      userId: true,
-      postId: true,
+      comments: true,
+      postOnUser: true,
     },
   },
-  // _count: {
-  //   select: {
-  //     comments: true,
-  //     postOnUser: true,
-  //   },
-  // },
   tagOnPost: {
     select: {
       tag: {

packages/database/src/posts/type.ts

@@ -6,15 +6,13 @@ import { TPostItem } from "./selects"
 export type TGetPostsResponse = IActionReturn<IGetListResponse<TPostItem>>
 
 export type TGetPostsRequest = {
-  searchParams: {
-    query?: string
-    search?: string
-    tag?: string
-    filter?: string
-    period?: string
-    limit?: string
-    page?: string
-    authorId?: string
-    postStatus?: PostStatus
-  }
+  query?: string
+  search?: string
+  tag?: string
+  filter?: string
+  period?: string
+  limit?: string
+  page?: string
+  authorId?: string
+  postStatus?: PostStatus
 }