Merge branch 'users-pagination' into 'graphql-api'

Paginate users query result

See merge request !26

src/models/user/user.controller.js

@@ -83,7 +83,7 @@ const getUser = async (id, options = {}) => {
 
 const getDisplayName = async user => user.getDisplayName()
 
-const getUsers = async (options = {}) => {
+const getUsers = async (queryParams = {}, options = {}) => {
   try {
     const { trx, ...restOptions } = options
     return useTransaction(
@@ -91,7 +91,7 @@ const getUsers = async (options = {}) => {
         logger.info(
           `${USER_CONTROLLER} getUsers: fetching all users based on provided options ${restOptions}`,
         )
-        return User.find({}, { trx: tr, ...restOptions })
+        return User.find(queryParams, { trx: tr, ...restOptions })
       },
       { trx, passedTrxOnly: true },
     )

src/models/user/user.graphql

@@ -3,7 +3,7 @@ scalar DateTime
 # find a better place to inject that
 input PageInput {
   pageSize: Int!
-  pageNumber: Int!
+  page: Int!
 }
 #
 type User {
@@ -68,9 +68,13 @@ input UpdatePasswordInput {
   newPassword: String!
 }
 
+input UsersQueryParams {
+  isActive: Boolean
+}
+
 extend type Query {
   user(id: ID): User
-  users: Users!
+  users(queryParams: UsersQueryParams, options: PageInput): Users!
   currentUser: User!
 }
 

src/models/user/user.resolvers.js

@@ -38,10 +38,10 @@ const userResolver = async (_, { id }, ctx) => {
   }
 }
 
-const usersResolver = async (_, args, ctx) => {
+const usersResolver = async (_, { queryParams, options }, ctx) => {
   try {
     logger.error(`${USER_RESOLVER} users`)
-    return getUsers()
+    return getUsers(queryParams, options)
   } catch (e) {
     logger.error(`${USER_RESOLVER} users: ${e.message}`)
     throw new Error(e)