Change postNum incrementing into atomic operation; Edit db

Vrezerino · Sep 13, 2024 · 709c902 · 709c902
1 parent 49f1193
commit 709c902
Show file tree

Hide file tree

Showing 5 changed files with 25,145 additions and 13,629 deletions.
diff --git a/app/api/posts/route.ts b/app/api/posts/route.ts
@@ -1,6 +1,6 @@
 import { getMongoDb as db } from '@/app/lib/mongodb';
 import { newPostSchema } from '@/app/lib/newPostSchema';
-import { NewPostType } from '@/app/lib/definitions';
+import { NewPostType, CounterDocument } from '@/app/lib/definitions';
 import {
     ACCEPTED_IMAGE_TYPES,
     MAX_FILE_SIZE, boards,
@@ -116,24 +116,43 @@ export const POST = async (req: NextRequest) => {
         newPost.imageUrl = file?.size > 0 ? `${AWS_URL}/img/posts/${filename}` : '';
         delete newPost.image;
 
-        // Save post to database
-        const result = await (await db()).collection('posts').insertOne(newPost);
+        // Increment counter value atomically
+        const getNextPostNum = async (): Promise<number> => {
+            const result = await (await db()).collection<CounterDocument>('counters').findOneAndUpdate(
+                { _id: 'postNum' },
+                { $inc: { seq_value: 1 } },
+                { returnDocument: 'after', upsert: true }
+            );
+
+            if (result) {
+                return result.seq_value;
+            } else {
+                throw { message: 'Failed incrementing postNum counter', status: 500 };
+            }
+        };
 
-        // Get the postNum of the post we just inserted
-        const newPostNum = await fetchPostWithPostNum(result.insertedId);
+        const newPostNum = await getNextPostNum();
+
+        // Save post to database
+        const result = await (await db()).collection('posts').insertOne({
+            ...newPost,
+            postNum: newPostNum
+        });
 
         // Add the postNum to all recipients' reply arrays
         const recipients = JSON.parse(formData.get('replyTo') as string);
 
         if (recipients?.length > 0) {
-            await (await db()).collection('posts').updateMany(
+            await (await db()).collection<NewPostType>('posts').updateMany(
                 { 'postNum': { $in: recipients } },
                 {
                     $push: { replies: newPostNum }
                 }
             );
         }
 
+
+
         if (result.acknowledged && result.insertedId) {
             return NextResponse.json('Created', { status: 201 });
         }

diff --git a/app/dashboard/[board]/[postNum]/page.tsx b/app/dashboard/[board]/[postNum]/page.tsx
@@ -13,10 +13,15 @@ type PostParams = {
 const Page = async ({ params }: PostParams) => {
     const data: PostType = await getPost(params.board, params.postNum.toString());
     if (Object.keys(data).length === 0) notFound();
-    if (!data.OP) redirect(`/dashboard/${data.board}/${data.replyTo[0]}`);
+
+    /* 
+      If the post is not OP (thread starter), don't allow single post view,
+      redirect to parent thread instead 
+    */
+    if (!data.OP) redirect(`/dashboard/${data.board}/${data.thread}`);
 
     return (
-        <Post post={data}/>
+        <Post post={data} />
     );
 };
 

diff --git a/app/lib/definitions.ts b/app/lib/definitions.ts
@@ -34,4 +34,9 @@ export interface CatalogOPType extends Omit<PostType, 'replies' | 'replyTo' | 'O
 export type ErrorWithStatusCode = {
     message: string;
     status: number
-};
+};
+
+export interface CounterDocument {
+    _id: string;
+    seq_value: number;
+}