json-server 0.10.0 → 0.10.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [0.10.1][2017-05-16] `GET /posts?_sort=user,views&_order=desc,asc`
+
+* Multiple fields sorting
+
 ## [0.10.0][2017-04-26]
 
 * __Drop Node `v0.12` support__

package/README.md

@@ -154,8 +154,14 @@ _10 items are returned by default_
 Add `_sort` and `_order` (ascending order by default)
 
 ```
-GET /posts?_sort=views&_order=DESC
-GET /posts/1/comments?_sort=votes&_order=ASC
+GET /posts?_sort=views&_order=asc
+GET /posts/1/comments?_sort=votes&_order=asc
+```
+
+For multiple fields, use the following format:
+
+```
+GET /posts?_sort=user,views&_order=desc,asc
 ```
 
 ### Slice

package/lib/server/router/plural.js

@@ -134,15 +134,11 @@ module.exports = function (db, name) {
 
     // Sort
     if (_sort) {
-      _order = _order || 'ASC';
-
-      chain = chain.sortBy(function (element) {
-        return _.get(element, _sort);
+      var _sortSet = _sort.split(',');
+      var _orderSet = (_order || '').split(',').map(function (s) {
+        return s.toLowerCase();
       });
-
-      if (_order === 'DESC') {
-        chain = chain.reverse();
-      }
+      chain = chain.orderBy(_sortSet, _orderSet);
     }
 
     // Slice result

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-server",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Serves JSON files through REST routes.",
   "main": "./lib/server/index.js",
   "bin": "./bin/index.js",

package/test/server/plural.js

@@ -42,6 +42,18 @@ describe('Server', () => {
       { id: 5, body: 'quux', published: false, postId: 2, userId: 1 }
     ]
 
+    db.buyers = [
+      { id: 1, name: 'Aileen', country: 'Colombia', total: 100 },
+      { id: 2, name: 'Barney', country: 'Colombia', total: 200 },
+      { id: 3, name: 'Carley', country: 'Colombia', total: 300 },
+      { id: 4, name: 'Daniel', country: 'Belize', total: 30 },
+      { id: 5, name: 'Ellen', country: 'Belize', total: 20 },
+      { id: 6, name: 'Frank', country: 'Belize', total: 10 },
+      { id: 7, name: 'Grace', country: 'Argentina', total: 1 },
+      { id: 8, name: 'Henry', country: 'Argentina', total: 2 },
+      { id: 9, name: 'Isabelle', country: 'Argentina', total: 3 }
+    ]
+
     db.refs = [
       { id: 'abcd-1234', url: 'http://example.com', postId: 1, userId: 1 }
     ]
@@ -269,6 +281,18 @@ describe('Server', () => {
         .expect([ db.nested[1], db.nested[0], db.nested[2] ])
         .expect(200)
     ))
+
+    it('should sort on multiple fields', () => (
+      request(server)
+        .get('/buyers?_sort=country,total&_order=asc,desc')
+        .expect('Content-Type', /json/)
+        .expect([
+          db.buyers[8], db.buyers[7], db.buyers[6],
+          db.buyers[3], db.buyers[4], db.buyers[5],
+          db.buyers[2], db.buyers[1], db.buyers[0]
+        ])
+        .expect(200)
+    ))
   })
 
   describe('GET /:resource?_start=&_end=', () => {