Merge pull request #84 from nearform/pagination

Added pagination implementation on list user service. See #80
Concorda · Jan 27, 2016 · 0d0c1cb · 0d0c1cb
2 parents 162996e + cb71072
commit 0d0c1cb
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "history": "1.17.x",
     "inert": "3.x.x",
     "influx": "4.0.x",
+    "jsonic": "0.2.2",
     "lodash": "3.10.1",
     "material-ui": "0.14.x",
     "moment": "2.11.x",

diff --git a/server/concorda.js b/server/concorda.js
@@ -2,6 +2,7 @@
 
 const _ = require('lodash')
 const Async = require('async')
+var Jsonic = require('jsonic')
 
 module.exports = function (opts) {
   var seneca = this
@@ -12,7 +13,35 @@ module.exports = function (opts) {
   options = _.extend(options, opts || {})
 
   function listUsers (msg, response) {
-    this.make$('sys', 'user').list$({}, function (err, users) {
+    // @ToDo - change msg.req$.query.* to msg.* after seneca-web is published with latest version
+    var limit = msg.req$.query.limit
+    var skip = msg.req$.query.skip
+    var orderBy = msg.req$.query.order
+
+    var q = {}
+
+    if (limit) {
+      q['limit$'] = limit
+    }
+    if (skip) {
+      q['skip$'] = skip
+    }
+
+    if (orderBy) {
+      if (_.isObject(orderBy)) {
+        q['sort$'] = orderBy
+      }
+      else {
+        try {
+          orderBy = orderBy.replace(/%22/g, '\"').replace(/%20/g, ' ')
+          q['sort$'] = Jsonic(orderBy)
+        }
+        catch (e) {
+        }
+      }
+    }
+
+    this.make$('sys', 'user').list$(q, function (err, users) {
       if (err) {
         return response(null, {ok: false, why: err})
       }
@@ -111,7 +140,7 @@ module.exports = function (opts) {
   }
 
   seneca
-    .use('mesh',{auto:true, pin:'role:user'})
+    .use('mesh', {auto: true, pin: 'role: user'})
 
   seneca
     .add({role: options.name, cmd: 'closeSession'}, closeUserSessions)

diff --git a/test/hapi.user.test.js b/test/hapi.user.test.js
@@ -82,7 +82,7 @@ suite('Hapi user suite tests ', () => {
     }, (res) => {
       Assert.equal(200, res.statusCode)
 
-      Assert.equal(false, JSON.parse(res.payload).err)
+      Assert.equal(true, JSON.parse(res.payload).ok)
       Assert(JSON.parse(res.payload).data)
       Assert.equal(user2.name, JSON.parse(res.payload).data.name)
 
@@ -92,10 +92,10 @@ suite('Hapi user suite tests ', () => {
     })
   })
 
+  let newName = 'newName'
   test('update another user test', (done) => {
     let url = '/api/user'
 
-    let newName = 'newName'
     user2.name = newName
     server.inject({
       url: url,
@@ -105,11 +105,115 @@ suite('Hapi user suite tests ', () => {
     }, (res) => {
       Assert.equal(200, res.statusCode)
 
-      Assert.equal(false, JSON.parse(res.payload).err)
+      Assert.equal(true, JSON.parse(res.payload).ok)
       Assert(JSON.parse(res.payload).data)
       Assert.equal(newName, JSON.parse(res.payload).data.name)
 
       done()
     })
   })
+
+  test('list user test with name sorted ASC', (done) => {
+    let url = '/api/user?order={name: 1}'
+
+    server.inject({
+      url: url,
+      method: 'GET',
+      headers: { cookie: 'seneca-login=' + cookie }
+    }, function (res) {
+      Assert.equal(200, res.statusCode)
+      Assert.equal(2, JSON.parse(res.payload).data.length)
+      Assert.equal(2, JSON.parse(res.payload).count)
+
+      Assert.equal(newName, JSON.parse(res.payload).data[0].name)
+
+      done()
+    })
+  })
+
+  test('list user test with name sorted DESC', (done) => {
+    let url = '/api/user?order={name: -1}'
+
+    server.inject({
+      url: url,
+      method: 'GET',
+      headers: { cookie: 'seneca-login=' + cookie }
+    }, function (res) {
+      Assert.equal(200, res.statusCode)
+      Assert.equal(2, JSON.parse(res.payload).data.length)
+      Assert.equal(2, JSON.parse(res.payload).count)
+
+      Assert.equal(user.name, JSON.parse(res.payload).data[0].name)
+
+      done()
+    })
+  })
+
+  test('list user test with name sorted DESC and limit 1', (done) => {
+    let url = '/api/user?order={name: -1}&limit=1'
+
+    server.inject({
+      url: url,
+      method: 'GET',
+      headers: { cookie: 'seneca-login=' + cookie }
+    }, function (res) {
+      Assert.equal(200, res.statusCode)
+      Assert.equal(1, JSON.parse(res.payload).data.length)
+      Assert.equal(1, JSON.parse(res.payload).count)
+
+      Assert.equal(user.name, JSON.parse(res.payload).data[0].name)
+
+      done()
+    })
+  })
+
+  test('list user test with name sorted DESC and limit 1 and skip 1', (done) => {
+    let url = '/api/user?order={name: -1}&limit=1&skip=1'
+
+    server.inject({
+      url: url,
+      method: 'GET',
+      headers: { cookie: 'seneca-login=' + cookie }
+    }, function (res) {
+      Assert.equal(200, res.statusCode)
+      Assert.equal(1, JSON.parse(res.payload).data.length)
+      Assert.equal(1, JSON.parse(res.payload).count)
+
+      Assert.equal(newName, JSON.parse(res.payload).data[0].name)
+
+      done()
+    })
+  })
+
+  test('list user test with name sorted DESC and limit 1 and skip 10', (done) => {
+    let url = '/api/user?order={name: -1}&limit=1&skip=10'
+
+    server.inject({
+      url: url,
+      method: 'GET',
+      headers: { cookie: 'seneca-login=' + cookie }
+    }, function (res) {
+      Assert.equal(200, res.statusCode)
+      Assert.equal(0, JSON.parse(res.payload).data.length)
+      Assert.equal(0, JSON.parse(res.payload).count)
+
+      done()
+    })
+  })
+
+  test('list user test with name sorted DESC and limit 1 and skip 10', (done) => {
+    let url = '/api/user?order={name: -1}&limit=1&skip=10'
+
+    server.inject({
+      url: url,
+      method: 'GET',
+      headers: { cookie: 'seneca-login=' + cookie }
+    }, function (res) {
+      Assert.equal(200, res.statusCode)
+      Assert.equal(0, JSON.parse(res.payload).data.length)
+      Assert.equal(0, JSON.parse(res.payload).count)
+
+      done()
+    })
+  })
 })