From ce16eda75f4d93646e485b7115398e81e7c88acc Mon Sep 17 00:00:00 2001 From: Mohamed Bassem Date: Sat, 4 Jan 2025 14:39:38 +0000 Subject: fix: Change search endpoint to accept query as raw string --- packages/trpc/routers/bookmarks.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'packages/trpc') diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts index 47ba623b..f3884053 100644 --- a/packages/trpc/routers/bookmarks.ts +++ b/packages/trpc/routers/bookmarks.ts @@ -47,7 +47,6 @@ import { zNewBookmarkRequestSchema, zUpdateBookmarksRequestSchema, } from "@hoarder/shared/types/bookmarks"; -import { zMatcherSchema } from "@hoarder/shared/types/search"; import type { AuthedContext, Context } from "../index"; import { authedProcedure, router } from "../index"; @@ -525,7 +524,6 @@ export const bookmarksAppRouter = router({ .input( z.object({ text: z.string(), - matcher: zMatcherSchema.optional(), cursor: z .object({ offset: z.number(), @@ -553,10 +551,14 @@ export const bookmarksAppRouter = router({ message: "Search functionality is not configured", }); } + const parsedQuery = parseSearchQuery(input.text); let filter: string[]; - if (input.matcher) { - const bookmarkIds = await getBookmarkIdsFromMatcher(ctx, input.matcher); + if (parsedQuery.matcher) { + const bookmarkIds = await getBookmarkIdsFromMatcher( + ctx, + parsedQuery.matcher, + ); filter = [ `userId = '${ctx.user.id}' AND id IN [${bookmarkIds.join(",")}]`, ]; @@ -564,7 +566,7 @@ export const bookmarksAppRouter = router({ filter = [`userId = '${ctx.user.id}'`]; } - const resp = await client.search(input.text, { + const resp = await client.search(parsedQuery.text, { filter, showRankingScore: true, attributesToRetrieve: ["id"], -- cgit v1.2.3-70-g09d2