From 8579b79eb36cf5022277804e6f64ff59ee459573 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Tue, 5 Dec 2023 20:58:08 +0800 Subject: [PATCH] fix tests --- packages/api/src/services/library_item.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index 1c54b80e0..54442d635 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -213,23 +213,23 @@ export const buildQuery = ( switch (folder) { case InFilter.ALL: return null - case InFilter.INBOX: - return 'library_item.archived_at IS NULL' case InFilter.ARCHIVE: return 'library_item.archived_at IS NOT NULL' case InFilter.TRASH: // return only deleted pages within 14 days return "library_item.deleted_at >= now() - interval '14 days'" default: { - if (!useFolders) { - throw new Error(`Unexpected keyword: ${folder}`) + let sql = 'library_item.archived_at IS NULL' + if (useFolders) { + const param = `folder_${parameters.length}` + const folderSql = escapeQueryWithParameters( + `library_item.folder = :${param}`, + { [param]: folder } + ) + sql = `(${sql} AND ${folderSql})` } - const param = `folder_${parameters.length}` - return escapeQueryWithParameters( - `(library_item.folder = :${param} AND library_item.archived_at IS NULL)`, - { [param]: folder } - ) + return sql } } }