From feac3147fe3af648f8f39f339411dbeff116ca6c Mon Sep 17 00:00:00 2001
From: Mohamed Bassem <me@mbassem.com>
Date: Sat, 1 Mar 2025 15:19:12 +0000
Subject: refactor: Move the list logic into a separate model

---
 packages/trpc/routers/bookmarks.ts | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

(limited to 'packages/trpc/routers/bookmarks.ts')

diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts
index 3b2d23ce..63d20625 100644
--- a/packages/trpc/routers/bookmarks.ts
+++ b/packages/trpc/routers/bookmarks.ts
@@ -26,7 +26,6 @@ import {
   AssetTypes,
   bookmarkAssets,
   bookmarkLinks,
-  bookmarkLists,
   bookmarks,
   bookmarksInLists,
   bookmarkTags,
@@ -70,6 +69,7 @@ import type { AuthedContext, Context } from "../index";
 import { authedProcedure, router } from "../index";
 import { mapDBAssetTypeToUserType } from "../lib/attachments";
 import { getBookmarkIdsFromMatcher } from "../lib/search";
+import { List } from "../models/lists";
 import { ensureAssetOwnership } from "./assets";
 
 export const ensureBookmarkOwnership = experimental_trpcMiddleware<{
@@ -652,31 +652,10 @@ export const bookmarksAppRouter = router({
         input.limit = DEFAULT_NUM_BOOKMARKS_PER_PAGE;
       }
       if (input.listId) {
-        const list = await ctx.db.query.bookmarkLists.findFirst({
-          where: and(
-            eq(bookmarkLists.id, input.listId),
-            eq(bookmarkLists.userId, ctx.user.id),
-          ),
-        });
-        if (!list) {
-          throw new TRPCError({
-            code: "NOT_FOUND",
-            message: "List not found",
-          });
-        }
+        const list = await List.fromId(ctx, input.listId);
         if (list.type === "smart") {
-          invariant(list.query);
-          const query = parseSearchQuery(list.query);
-          if (query.result !== "full") {
-            throw new TRPCError({
-              code: "INTERNAL_SERVER_ERROR",
-              message: "Found an invalid smart list query",
-            });
-          }
-          if (query.matcher) {
-            input.ids = await getBookmarkIdsFromMatcher(ctx, query.matcher);
-            delete input.listId;
-          }
+          input.ids = await list.getBookmarkIds();
+          delete input.listId;
         }
       }
 
-- 
cgit v1.2.3-70-g09d2