wrote more controller functions

Author: iolufemi

TODO.md

@@ -4,18 +4,19 @@
 | gulpfile.js | 146 | Add gulp-banner to add GNU GPL nitice on every js file.
 | controllers/Initialize.js | 18 | Test initialize controller
 | controllers/Users.js | 9 | Test buildProjection function
-| controllers/Users.js | 110 | Test limiting
-| controllers/Users.js | 111 | Test that response contains count of total record for the query
-| controllers/Users.js | 112 | Test that the last document Id in the return array of documents is in the response
-| controllers/Users.js | 113 | Test that sorting works
-| controllers/Users.js | 114 | Test that projection works
-| controllers/Users.js | 115 | Test that populating works
-| controllers/Users.js | 116 | Test that date range works
-| controllers/Users.js | 158 | Finish users controller
-| controllers/Users.js | 159 | Finish users route
-| routes/index.js | 208 | Implement API Generator
+| controllers/Users.js | 112 | Test limiting
+| controllers/Users.js | 113 | Test that response contains count of total record for the query
+| controllers/Users.js | 114 | Test that the last document Id in the return array of documents is in the response
+| controllers/Users.js | 115 | Test that sorting works
+| controllers/Users.js | 116 | Test that projection works
+| controllers/Users.js | 117 | Test that populating works
+| controllers/Users.js | 118 | Test that date range works
+| controllers/Users.js | 216 | Finish users controller
+| controllers/Users.js | 217 | Finish users route
+| controllers/Users.js | 218 | Test that any deleted data is backed up
+| routes/index.js | 213 | Implement API Generator
 | routes/initialize.js | 10 | Test initialize route
-| services/encryption/index.js | 40 | Generate checksum here
 | services/queue/clock.js | 11 | work on a clock functionality so kue can support scheduled jobs
 | services/queue/jobs.js | 75 | Add webhook Job here
-| services/queue/workers.js | 18 | Add Webhook worker here
+| services/queue/workers.js | 18 | Add Webhook worker here
+| services/encryption/index.js | 40 | Generate checksum here

controllers/Users.js

@@ -119,43 +119,100 @@ UsersController.find = function(req,res,next){
     }
 };
 
-UsersController.findOne = function(id,projection,options){
-    return Users.findById(id,projection,options);
+UsersController.findOne = function(req,res,next){
+    var id = req.query.id;
+    Users.findById(id)
+    .then(function(resp){
+        res.ok(resp);
+    })
+    .catch(function(err){
+        next(err);
+    });
 };
 
-UsersController.search = function(string){
-    return Users.search(string);
+UsersController.search = function(req,res,next){
+    var query = req.query.query;
+    Users.search(query)
+    .then(function(resp){
+        res.ok(resp);
+    })
+    .catch(function(err){
+        next(err);
+    });
 };
 
-UsersController.create = function(data){
-    return Users.create(data);
+UsersController.create = function(req,res,next){
+    var data  = req.body;
+    Users.create(data)
+    .then(function(resp){
+        res.ok(resp);
+    })
+    .catch(function(err){
+        next(err);
+    });
+};
+
+UsersController.update = function(req,res,next){
+    var query = req.query;
+    var data  = req.body;
+    Users.update(query,data)
+    .then(function(resp){
+        res.ok(resp);
+    })
+    .catch(function(err){
+        next(err);
+    });
 };
 
-UsersController.update = function(query, data){
-    return Users.update(query,data);
+UsersController.updateOne = function(req,res,next){
+    var id = req.query.id;
+    var data  = req.body;
+    Users.findByIdAndUpdate(id,data)
+    .then(function(resp){
+        res.ok(resp);
+    })
+    .catch(function(err){
+        next(err);
+    });
 };
 
-UsersController.updateOne = function(id, data){
-    return Users.findByIdAndUpdate(id,data);
+UsersController.count = function(req,res,next){
+    var query = req.query;
+    if(!query){
+        query = {};
+    }
+    Users.count(query)
+    .then(function(resp){
+        res.ok(resp);
+    })
+    .catch(function(err){
+        next(err);
+    });
 };
 
 UsersController.delete = function(query){
+    // Find match
+    // Push match to a queue for back up
+    // Delete matches
     return Users.deleteMany(query);
 };
 
 UsersController.deleteOne = function(id){
+    // Find match
+    // Push match to a queue for back up
+    // Delete matches
     return Users.findByIdAndRemove(id);
 };
 
-UsersController.count = function(query){
-    return Users.count(query);
-};
-
 UsersController.restore = function(query){
+    // Find data by ID from trash 
+    // Restore to DB
+    // Delete from trash
     return Users.count(query);
 };
 
 module.exports = UsersController;
 
 // Todo: Finish users controller
 // Todo: Finish users route
+// ToDo: Test that any deleted data is backed up

routes/index.js

@@ -53,13 +53,18 @@ next();
 router._enforceUserIdAndAppId = function(req,res,next){
   var userId = req.param('userId');
   var appId = req.param('appId');
+  var developer = req.param('developer');
   if(!userId){
     return res.badRequest(false,'No userId parameter was passed in the payload of this request. Please pass a userId.');
 }else if(!appId){
     return res.badRequest(false,'No appId parameter was passed in the payload of this request. Please pass an appId.');
 }else{
     req.userId = userId;
     req.appId = appId;
+    req.body.client = appId;
+    req.body.owner = userId;
+    req.body.createdBy = userId;
+    req.body.developer = developer;
     next();
 }
 };