From 002e455bbdf45dbc61c37d09aeb7c74f676d5d24 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Tue, 23 Apr 2024 17:54:52 +0800 Subject: [PATCH] fix tests --- packages/api/src/services/library_item.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index a837ad066..47ec7bba8 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -627,7 +627,9 @@ export const buildQuery = ( // select all columns except content const selects: Select[] = getColumns(libraryItemRepository) .filter( - (select) => select !== 'readableContent' && select !== 'originalContent' + (select) => + select !== 'originalContent' && // exclude original content + (args.includeContent || select !== 'readableContent') // exclude content if not requested ) .map((column) => ({ column: `library_item.${column}` })) @@ -647,12 +649,14 @@ export const buildQuery = ( args.useFolders ) } - // add select - queryBuilder.select(selects.map((select) => select.column)) - if (args.includeContent) { - queryBuilder.addSelect('library_item.readableContent') - } + // add select + selects.forEach((select, index) => { + // select must be defined before adding additional selects + index === 0 + ? queryBuilder.select(select.column, select.alias) + : queryBuilder.addSelect(select.column, select.alias) + }) queryBuilder.where('library_item.user_id = :userId', { userId })