Remove pagination in get users

GladysAssistant · Sep 17, 2016 · 74b701a · 74b701a
1 parent 27626bb
commit 74b701a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/api/controllers/UserController.js b/api/controllers/UserController.js
@@ -17,10 +17,10 @@
 module.exports = {
 
     /**
-     * Get users with pagingation
+     * Get all users
      */
    index: function(req, res, next){
-      gladys.user.get(req.query)
+      gladys.user.get()
         .then(function(users){
            return res.json(users); 
         })

diff --git a/api/core/user/user.get.js b/api/core/user/user.get.js
@@ -1,10 +1,5 @@
 var queries = require('./user.queries.js');
 
-module.exports = function get(options){
-
-    options = options || {};
-    options.take = parseInt(options.take) || 50;
-    options.skip = parseInt(options.skip) || 0;
-
-    return gladys.utils.sql(queries.get, [options.take, options.skip]);
+module.exports = function get(){
+    return gladys.utils.sql(queries.get, []);
 };
diff --git a/api/core/user/user.queries.js b/api/core/user/user.queries.js
@@ -1,7 +1,7 @@
 
 module.exports = {
   getByEmail: 'SELECT * FROM user WHERE email = ?;',
-  get: 'SELECT id, firstname, lastname, email, birthdate, gender, language, assistantName, preparationTimeAfterWakeUp, role, createdAt, updatedAt FROM user LIMIT ? OFFSET ?;' ,
+  get: 'SELECT id, firstname, lastname, email, birthdate, gender, language, assistantName, preparationTimeAfterWakeUp, role, createdAt, updatedAt FROM user;' ,
   getAdmin: 'SELECT id, firstname, lastname, email, birthdate, gender, language, assistantName, preparationTimeAfterWakeUp, role, createdAt, updatedAt FROM user WHERE role = "admin";',
   getById: 'SELECT id, firstname, lastname, email, birthdate, gender, language, assistantName, preparationTimeAfterWakeUp, role, createdAt, updatedAt FROM user WHERE id = ?;',
   delete: 'DELETE FROM user WHERE id = ?;'