caritas/nestjs-paginate
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve code style

Browse Source
This commit is contained in:
ppetzold 2022-08-22 20:23:28 +02:00
parent dd48068b09
commit 46f6e17663
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/paginate.ts
View File

@ -173,11 +173,6 @@ export async function paginate<T>(
if (config.sortableColumns.length < 1) throw new ServiceUnavailableException() 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) { if (query.sortBy) {
for (const order of query.sortBy) { for (const order of query.sortBy) {
if (isEntityKey(config.sortableColumns, order[0]) && ['ASC', 'DESC'].includes(order[1])) { if (isEntityKey(config.sortableColumns, order[0]) && ['ASC', 'DESC'].includes(order[1])) {
@ -223,11 +218,16 @@ export async function paginate<T>(
}) })
} }
let nullSort: 'NULLS LAST' | 'NULLS FIRST' | undefined = undefined
if (config.nullSort) {
nullSort = config.nullSort === 'last' ? 'NULLS LAST' : 'NULLS FIRST'
}
for (const order of sortBy) { for (const order of sortBy) {
if (order[0].split('.').length > 1) { 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 { } else {
queryBuilder.addOrderBy(`${queryBuilder.alias}.${order[0]}`, order[1], NULL_SORT) queryBuilder.addOrderBy(`${queryBuilder.alias}.${order[0]}`, order[1], nullSort)
} }
} }