From cff44b83a8dbec9bc6d80b97cf96d9a5df1ef87b Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 14 Aug 2024 16:10:41 +0800 Subject: [PATCH] fix: total count cache should be fixed for pagination --- packages/api/src/resolvers/article/index.ts | 22 +++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index 4043b657c..c69cdad93 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -606,8 +606,6 @@ export const searchResolver = authorized< } const searchLibraryItemArgs = { - from: Number(startCursor), - size: first + 1, // fetch one more item to get next cursor includePending: true, includeContent: params.includeContent ?? true, // by default include content for offline use for now includeDeleted: params.query?.includes('in:trash'), @@ -615,7 +613,14 @@ export const searchResolver = authorized< useFolders: params.query?.includes('use:folders'), } - const libraryItems = await searchLibraryItems(searchLibraryItemArgs, uid) + const libraryItems = await searchLibraryItems( + { + ...searchLibraryItemArgs, + from: Number(startCursor), + size: first + 1, // fetch one more item to get next cursor + }, + uid + ) const start = startCursor && !isNaN(Number(startCursor)) ? Number(startCursor) : 0 @@ -688,14 +693,19 @@ export const updatesSinceResolver = authorized< } sort:${sort.by}-${sort.order}` const searchLibraryItemArgs = { - from: Number(startCursor), - size: size + 1, // fetch one more item to get next cursor includeDeleted: true, query, includeContent: true, // by default include content for offline use for now } - const libraryItems = await searchLibraryItems(searchLibraryItemArgs, uid) + const libraryItems = await searchLibraryItems( + { + ...searchLibraryItemArgs, + from: Number(startCursor), + size: size + 1, // fetch one more item to get next cursor + }, + uid + ) const start = startCursor && !isNaN(Number(startCursor)) ? Number(startCursor) : 0