From 9f8b5e9800d4996b40db95b8ad7d3aa55d7ea1ec Mon Sep 17 00:00:00 2001 From: typicode Date: Thu, 11 May 2017 13:08:55 +0200 Subject: [PATCH] Refactor sort --- src/server/router/plural.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/server/router/plural.js b/src/server/router/plural.js index 5dc5104..d94c5d4 100644 --- a/src/server/router/plural.js +++ b/src/server/router/plural.js @@ -144,19 +144,9 @@ module.exports = (db, name) => { // Sort if (_sort) { - if (_sort.match(/,/)) { - const _sortSet = _sort.split(/,/) - const _orderSet = _order.split(/,/) - chain = chain.orderBy(_sortSet, _orderSet) - } else { - _order = _order || 'ASC' - chain = chain.sortBy(function (element) { - return _.get(element, _sort) - }) - if (_order === 'DESC') { - chain = chain.reverse() - } - } + const _sortSet = _sort.split(',') + const _orderSet = (_order || '').split(',').map(s => s.toLowerCase()) + chain = chain.orderBy(_sortSet, _orderSet) } // Slice result