From 46f6e1766315182c344e176e2db226579a94d4a0 Mon Sep 17 00:00:00 2001 From: ppetzold Date: Mon, 22 Aug 2022 20:23:28 +0200 Subject: [PATCH] improve code style --- src/paginate.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/paginate.ts b/src/paginate.ts index f81030d..448146b 100644 --- a/src/paginate.ts +++ b/src/paginate.ts @@ -173,11 +173,6 @@ export async function paginate( if (config.sortableColumns.length < 1) throw new ServiceUnavailableException() - let NULL_SORT: 'NULLS LAST' | 'NULLS FIRST' - if (config.nullSort) { - NULL_SORT = config.nullSort === 'last' ? 'NULLS LAST' : 'NULLS FIRST' - } - if (query.sortBy) { for (const order of query.sortBy) { if (isEntityKey(config.sortableColumns, order[0]) && ['ASC', 'DESC'].includes(order[1])) { @@ -223,11 +218,16 @@ export async function paginate( }) } + let nullSort: 'NULLS LAST' | 'NULLS FIRST' | undefined = undefined + if (config.nullSort) { + nullSort = config.nullSort === 'last' ? 'NULLS LAST' : 'NULLS FIRST' + } + for (const order of sortBy) { if (order[0].split('.').length > 1) { - queryBuilder.addOrderBy(`${queryBuilder.alias}_${order[0]}`, order[1], NULL_SORT) + queryBuilder.addOrderBy(`${queryBuilder.alias}_${order[0]}`, order[1], nullSort) } else { - queryBuilder.addOrderBy(`${queryBuilder.alias}.${order[0]}`, order[1], NULL_SORT) + queryBuilder.addOrderBy(`${queryBuilder.alias}.${order[0]}`, order[1], nullSort) } }