From 0faafa078693b9069f5ceae1ee45248ecf73b944 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Tue, 23 Apr 2024 16:04:59 +0800 Subject: [PATCH] fix rebase conflicts --- packages/api/src/services/library_item.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index 5c4bd2d2b..a837ad066 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -647,17 +647,15 @@ export const buildQuery = ( args.useFolders ) } - queryBuilder.where('library_item.user_id = :userId', { userId }) - // add select - selects.forEach((select) => { - queryBuilder.addSelect(select.column, select.alias) - }) + queryBuilder.select(selects.map((select) => select.column)) if (args.includeContent) { queryBuilder.addSelect('library_item.readableContent') } + queryBuilder.where('library_item.user_id = :userId', { userId }) + if (!args.includePending) { queryBuilder.andWhere("library_item.state <> 'PROCESSING'") }