From d83dc17651456a67e909bd3421e5f76ca9613763 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Tue, 2 Apr 2024 17:49:29 +0800 Subject: [PATCH] fix tests --- packages/api/src/repository/library_item.ts | 4 ---- packages/api/src/services/library_item.ts | 13 ++++++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/api/src/repository/library_item.ts b/packages/api/src/repository/library_item.ts index 9dd0b315e..fd933faf2 100644 --- a/packages/api/src/repository/library_item.ts +++ b/packages/api/src/repository/library_item.ts @@ -105,7 +105,3 @@ export const libraryItemRepository = appDataSource ) as Promise }, }) - -export const metadataColumnsInItem = getColumns(libraryItemRepository).filter( - (column) => column !== 'readableContent' && column !== 'originalContent' -) diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index 3e47d6d76..12e6b7581 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -23,10 +23,7 @@ import { getRepository, queryBuilderToRawSql, } from '../repository' -import { - libraryItemRepository, - metadataColumnsInItem, -} from '../repository/library_item' +import { libraryItemRepository } from '../repository/library_item' import { Merge } from '../util' import { setRecentlySavedItemInRedis } from '../utils/helpers' import { logger } from '../utils/logger' @@ -719,11 +716,17 @@ export const findRecentLibraryItems = async ( limit = 1000, offset?: number ) => { + const selectColumns = getColumns(libraryItemRepository) + .filter( + (column) => column !== 'readableContent' && column !== 'originalContent' + ) + .map((column) => `library_item.${column}`) + return authTrx( async (tx) => tx .createQueryBuilder(LibraryItem, 'library_item') - .select(metadataColumnsInItem.map((column) => `library_item.${column}`)) + .select(selectColumns) .leftJoinAndSelect('library_item.labels', 'labels') .leftJoinAndSelect('library_item.highlights', 'highlights') .where(