From 1823bc3e0e458843e7884b9024b522b382cb43d1 Mon Sep 17 00:00:00 2001
From: Bakhtiyor Ganijon <b.yusupoff001@gmail.com>
Date: Mon, 27 Nov 2023 16:42:53 +0900
Subject: [PATCH] Fix post deletion and user history retrieval

---
 app/api/post/[postid]/route.ts         | 37 ++++++++++++++++++++------
 components/editor/post-editor-form.tsx |  2 +-
 components/tags/post-card-v2.tsx       |  2 +-
 lib/prisma/feed.ts                     |  2 +-
 lib/prisma/session.ts                  | 14 +++++++---
 5 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/app/api/post/[postid]/route.ts b/app/api/post/[postid]/route.ts
index b11622b..d1de058 100644
--- a/app/api/post/[postid]/route.ts
+++ b/app/api/post/[postid]/route.ts
@@ -92,50 +92,71 @@ export async function DELETE(
 ) {
   try {
     const { postid } = params;
+    
+    const post = await postgres.post.findUnique({
+      where: {
+        id: postid,
+      },
+    });
+    
+    if (!post) {
+      throw new Error('Post not found');
+    }
 
-    if (!(await verifyCurrentUserHasAccessToPost(postid))) {
+    const authorId = post.authorId;
+
+    if (!(await verifyCurrentUserHasAccessToPost(post.id))) {
       return new Response(null, { status: 403 });
     }
 
+    
+
     // Disconnect all connections of the post
     await postgres.postTag.deleteMany({
       where: {
-        postId: postid,
+        postId: post.id,
       },
     })
 
     await postgres.comment.deleteMany({
       where: {
-        postId: postid,
+        postId: post.id,
       },
     })
 
     await postgres.like.deleteMany({
       where: {
-        postId: postid,
+        postId: post.id,
       },
     })
 
     await postgres.bookmark.deleteMany({
       where: {
-        postId: postid,
+        postId: post.id,
       },
     })
-
     await postgres.readingHistory.deleteMany({
       where: {
         postId: postid,
+        userId: authorId,
+      },
+    });
+
+    await postgres.readingHistory.deleteMany({
+      where: {
+        postId: post.id,
       },
     })
+
     await postgres.draftPost.deleteMany({
       where: {
-        postId: postid,
+        postId: post.id,
       },
     })
     // Delete the post.
     await postgres.post.delete({
       where: {
-        id: postid,
+        id: post.id,
       },
     })
 
diff --git a/components/editor/post-editor-form.tsx b/components/editor/post-editor-form.tsx
index 6acdbf8..099a71a 100644
--- a/components/editor/post-editor-form.tsx
+++ b/components/editor/post-editor-form.tsx
@@ -616,7 +616,7 @@ export function PostEditorForm(props: { post: any, user: any }) {
                          <Link href={`/@${props.user?.username}`} className="flex align-items-center">
                               <Avatar className="h-8 w-8 mr-1 border">
                                    <AvatarImage src={ props.user?.image } alt={ props.user?.name || props.user?.username } />
-                                   <AvatarFallback>{props.user?.name.charAt(0)}</AvatarFallback>
+                                   <AvatarFallback>{props.user?.name ? props.user?.name.charAt(0) : props.user?.username.charAt(0)}</AvatarFallback>
 
                               </Avatar>
                               <Button variant="ghost" size={"sm"} className="hidden md:flex" asChild>
diff --git a/components/tags/post-card-v2.tsx b/components/tags/post-card-v2.tsx
index 1362586..7b52541 100644
--- a/components/tags/post-card-v2.tsx
+++ b/components/tags/post-card-v2.tsx
@@ -81,7 +81,7 @@ export default function PostCard(
                                    )
                               }
                               <span className="!text-muted-foreground text-sm">
-                                   {dateFormat(props.post.publishedAt)}
+                                   {props.post.published ? dateFormat(props.post.publishedAt) : dateFormat(props.post.createdAt)}
                               </span>
                          </div>
                     </CardHeader>
diff --git a/lib/prisma/feed.ts b/lib/prisma/feed.ts
index c70506d..afca977 100644
--- a/lib/prisma/feed.ts
+++ b/lib/prisma/feed.ts
@@ -158,7 +158,7 @@ const tagCounts = tags.reduce((counts, tag) => {
 // Sort the tags by their count in descending order
 const sortedTagIds = Object.entries(tagCounts)
   .sort((a, b) => b[1] - a[1])
-  .map(([tagId]) => Number(tagId).toString()); // Convert numbers to strings
+  .map(([tagId]) => tagId)
 
   const posts = await postgres.post.findMany({
     where: { tags: { some: { tagId: { in: sortedTagIds.slice(0, 5) } } } },
diff --git a/lib/prisma/session.ts b/lib/prisma/session.ts
index ded0f11..93b5788 100644
--- a/lib/prisma/session.ts
+++ b/lib/prisma/session.ts
@@ -169,7 +169,8 @@ export const getBookmarks = async ({ id, limit = 5, page = 0 }: { id: string | u
 export const getHistory = async ({ id, limit = 5, page = 0 }: { id: string | undefined, limit?: number, page?: number }) => {
   const user = await postgres.user.findFirst({
     where: { id },
-    include: {
+    select: {
+      id: true,
       readinghistory: {
         include: {
           post: {
@@ -186,10 +187,15 @@ export const getHistory = async ({ id, limit = 5, page = 0 }: { id: string | und
       },
       _count: { select: { readinghistory: true } },
     },
-      }
-  );
+  });
+
+  if (!user) {
+    throw new Error('User not found');
+  }
+
+  const history = user.readinghistory.filter((historyItem : any) => historyItem.post !== null);
 
-  return { history: JSON.parse(JSON.stringify(user?.readinghistory)), historyCount: user?._count?.readinghistory };
+  return { history: JSON.parse(JSON.stringify(history)), historyCount: user._count.readinghistory };
 }
 
 export const getNotifications = async ({ id }: { id: string | undefined }) => {