[refactor] Extract the bookmark model to be a high level model to support other type of bookmarks

2 files changed, 13 insertions, 15 deletions

diff --git a/packages/web/app/api/v1/links/[linkId]/route.ts b/packages/web/app/api/v1/bookmarks/[bookmarkId]/route.ts
index 39449d6d..6adcf771 100644
--- a/packages/web/app/api/v1/links/[linkId]/route.ts
+++ b/packages/web/app/api/v1/bookmarks/[bookmarkId]/route.ts
@@ -1,5 +1,5 @@
 import { authOptions } from "@/lib/auth";
-import { unbookmarkLink } from "@/lib/services/links";
+import { deleteBookmark } from "@/lib/services/bookmarks";
 import { Prisma } from "@remember/db";
 
 import { getServerSession } from "next-auth";
@@ -7,7 +7,7 @@ import { NextRequest } from "next/server";
 
 export async function DELETE(
   _request: NextRequest,
-  { params }: { params: { linkId: string } },
+  { params }: { params: { bookmarkId: string } },
 ) {
   // TODO: We probably should be using an API key here instead of the session;
   const session = await getServerSession(authOptions);
@@ -16,7 +16,7 @@ export async function DELETE(
   }
 
   try {
-    await unbookmarkLink(params.linkId, session.user.id);
+    await deleteBookmark(params.bookmarkId, session.user.id);
   } catch (e: unknown) {
     if (
       e instanceof Prisma.PrismaClientKnownRequestError &&
diff --git a/packages/web/app/api/v1/links/route.ts b/packages/web/app/api/v1/bookmarks/route.ts
index 87541634..b9305ca8 100644
--- a/packages/web/app/api/v1/links/route.ts
+++ b/packages/web/app/api/v1/bookmarks/route.ts
@@ -1,11 +1,11 @@
 import { authOptions } from "@/lib/auth";
-import { bookmarkLink, getLinks } from "@/lib/services/links";
+import { bookmarkLink, getBookmarks } from "@/lib/services/bookmarks";
 
 import {
-  zNewBookmarkedLinkRequestSchema,
-  ZGetLinksResponse,
-  ZBookmarkedLink,
-} from "@/lib/types/api/links";
+  zNewBookmarkRequestSchema,
+  ZGetBookmarksResponse,
+  ZBookmark,
+} from "@/lib/types/api/bookmarks";
 import { getServerSession } from "next-auth";
 import { NextRequest, NextResponse } from "next/server";
 
@@ -16,9 +16,7 @@ export async function POST(request: NextRequest) {
     return new Response(null, { status: 401 });
   }
 
-  const linkRequest = zNewBookmarkedLinkRequestSchema.safeParse(
-    await request.json(),
-  );
+  const linkRequest = zNewBookmarkRequestSchema.safeParse(await request.json());
 
   if (!linkRequest.success) {
     return NextResponse.json(
@@ -29,9 +27,9 @@ export async function POST(request: NextRequest) {
     );
   }
 
-  const link = await bookmarkLink(linkRequest.data.url, session.user.id);
+  const bookmark = await bookmarkLink(linkRequest.data.url, session.user.id);
 
-  let response: ZBookmarkedLink = { ...link };
+  let response: ZBookmark = { ...bookmark };
   return NextResponse.json(response, { status: 201 });
 }
 
@@ -42,8 +40,8 @@ export async function GET() {
     return new Response(null, { status: 401 });
   }
 
-  const links = await getLinks(session.user.id);
+  const bookmarks = await getBookmarks(session.user.id);
 
-  let response: ZGetLinksResponse = { links };
+  let response: ZGetBookmarksResponse = { bookmarks };
   return NextResponse.json(response);
 }