started testing routes

iolufemi · iolufemi · commit 5a53cb6b457d · 2017-08-27T22:49:10.000+01:00
diff --git a/TODO.md b/TODO.md
@@ -1,7 +1,6 @@
 ### TODOs
 | Filename | line # | TODO
 |:------|:------:|:------
-| routes/index.js | 214 | Implement API Generator
-| routes/initialize.js | 10 | Test initialize route
+| routes/index.js | 228 | Implement API Generator
 | routes/users.js | 43 | Test users route
 | services/queue/clock.js | 11 | work on a clock functionality so kue can support scheduled jobs
diff --git a/controllers/Users.js b/controllers/Users.js
@@ -53,6 +53,10 @@ UsersController.find = function(req,res,next){
         });
     }else{
         query = req.query;
+        // Clean appId and userId
+        delete query.appId;
+        delete query.userId;
+        delete query.developer;
         var projection = query.projection; // Projection should be comma separated. eg. name,location
         var ourProjection;
         
@@ -107,10 +111,12 @@ UsersController.find = function(req,res,next){
         var question = Users.find(query);
 
         if(limit){
-            var ourLimit = limit * 1;
+            totalResult = totalResult.limit(limit);
             question = question.limit(limit);
         }else{
-            limit = 0;
+            limit = 50;
+            totalResult = totalResult.limit(limit);
+            question = question.limit(limit);
         }
         if(sort){
             question = question.sort(sort);
@@ -131,6 +137,7 @@ UsersController.find = function(req,res,next){
                 extraData.total = total;
                 extraData.totalResult = totalResult;
                 extraData.lastId = ourLastId;
+                extraData.isLastPage = (totalResult < limit) ? true : false;
                 res.ok(resp, false, extraData);
             })
             .catch(function(err){
@@ -150,6 +157,7 @@ UsersController.find = function(req,res,next){
                 extraData.total = total;
                 extraData.lastId = ourLastId;
                 extraData.totalResult = totalResult;
+                extraData.isLastPage = (totalResult < limit) ? true : false;
                 res.ok(resp, false, extraData);
             })
             .catch(function(err){
diff --git a/models/.gitkeep b/models/.gitkeep
diff --git a/models/Users.js b/models/Users.js
@@ -9,6 +9,7 @@ var collection = 'Users';
 var debug = require('debug')(collection);
 
 var schemaObject = {
+    // ++++++++++++++ Modify to your own schema ++++++++++++++++++
     name: {
         type: 'String'
     },
@@ -19,6 +20,8 @@ var schemaObject = {
         type: db.Schema.Types.ObjectId,
         ref: 'Users'
     }
+
+    // ++++++++++++++ Modify to your own schema ++++++++++++++++++
 };
 
 schemaObject.createdAt = {
diff --git a/models/index.js b/models/index.js
@@ -1,9 +1,13 @@
 "use strict";
 
-var models = {
-    RequestLogs: require('./RequestLogs'),
-    Trash: require('./Trash'),
-    Users: require('./Users')
-};
+var models = {};
+var normalizedPath = require("path").join(__dirname, "./");
+
+require("fs").readdirSync(normalizedPath).forEach(function(file) {
+    var splitFileName = file.split('.');
+    if(splitFileName[0] !== 'index'){
+        models[splitFileName[0]] = require('./'+splitFileName[0]);
+    }
+});
 
 module.exports = models;
diff --git a/routes/.gitkeep b/routes/.gitkeep
diff --git a/routes/index.js b/routes/index.js
@@ -58,6 +58,8 @@ router._enforceUserIdAndAppId = function(req,res,next){
     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 if(!developer){
+    return res.badRequest(false,'No developer parameter was passed in the payload of this request. Please pass a developer id.');
 }else{
     req.userId = userId;
     req.appId = appId;
@@ -152,6 +154,9 @@ router.use(bodyParser.urlencoded({ extended: false }));
 router.use(bodyParser.json());
 router.use(bodyParser.raw());
 router.use(bodyParser.text());
+// load response handlers
+router.use(response);
+// Watch for encrypted requests
 router.use(encryption.interpreter);
 router.use(hpp());
 router.use(contentLength.validateMax({max: MAX_CONTENT_LENGTH_ACCEPTED, status: 400, message: "Stop! Maximum content length exceeded."})); // max size accepted for the content-length
@@ -170,14 +175,14 @@ limiter({
 }
 });
 
-router.use(response);
+
 router.use(expressValidator());
 
 // no client side caching
 if(config.noFrontendCaching === 'yes'){
   router.use(helmet.noCache());
 }else{
-   router.use(router._APICache);
+ router.use(router._APICache);
 }
 
 router.get('/', function (req, res) {
@@ -199,9 +204,18 @@ router.use('/', initialize);
 // Make userId compolsory in every request
 router.use(router._enforceUserIdAndAppId);
 
+// Should automatically load routes
 // Other routes here
-// 
-// 
+var ourRoutes = {};
+var normalizedPath = require("path").join(__dirname, "./");
+
+require("fs").readdirSync(normalizedPath).forEach(function(file) {
+    var splitFileName = file.split('.');
+    if(splitFileName[0] !== 'index' && splitFileName[0] !== 'initialize'){
+        ourRoutes[splitFileName[0]] = require('./'+splitFileName[0]);
+        router.use('/', ourRoutes[splitFileName[0]]);
+    }
+});
 
 router.use(function(req, res, next) { // jshint ignore:line
   res.notFound();
diff --git a/routes/initialize.js b/routes/initialize.js
@@ -7,4 +7,3 @@ var initializeController = require('../controllers/Initialize');
 router.get('/initialize', initializeController.init);
 
 module.exports = router;
-// Todo: Test initialize route
diff --git a/services/database/mongo.js b/services/database/mongo.js
@@ -4,7 +4,9 @@ var config = require('../../config');
 var log = require('../../services/logger');
 
 // Connect to DB
-mongoose.connect(config.mongoURL);
+mongoose.connect(config.mongoURL, {
+    useMongoClient: true
+});
 
 // Set the prefered promise library
 mongoose.Promise = require('q').Promise;
@@ -13,7 +15,7 @@ var db = mongoose.connection;
 
 db.on('error', log.error);
 db.once('open', function() {
-  log.info('MongoDB database connection successful');
+    log.info('MongoDB database connection successful');
 });
 
 module.exports = mongoose;
diff --git a/test/controllers/users.js b/test/controllers/users.js
@@ -89,14 +89,15 @@ describe('Users controller', function(){
             req.query.search = 'i like pizza';
             users.find(req, res, next);
         });
-        it('should limit the number of returned documents', function(done){
+        it('should limit the number of returned documents and check if it is the last page', function(done){
             var next = function(err){
                 done(err);
             };
             var res = {};
             res.ok = function(data, cache, extraData){
 
                 data.should.be.an.object; /* jslint ignore:line */
+                extraData.isLastPage.should.exist; /* jslint ignore:line */
                 data.length.should.equal(2);
                 done();
             };
@@ -105,7 +106,7 @@ describe('Users controller', function(){
             req.query.limit = 2;
             users.find(req, res, next);
         });
-        it('should contains count of total record for the query', function(done){
+        it('should contain count of total record for the query', function(done){
             var next = function(err){
                 done(err);
             };
diff --git a/test/models/users.js b/test/models/users.js
@@ -20,6 +20,9 @@ describe('User Model',function(){
     before(function(){  /* jslint ignore:line */
         User = require('../../models/Users');
         var workers = require('../../services/queue/workers');
+        var workers1 = require('../../services/queue/workers');
+        var workers2 = require('../../services/queue/workers');
+        var workers3 = require('../../services/queue/workers');
     });
 
     describe('Test CRUDS', function(){
diff --git a/test/routes/index.js b/test/routes/index.js
@@ -171,7 +171,12 @@ it('should enforce UserId', function(done){
     nextChecker.should.be.false; /* jslint ignore:line */
     req.body.appId = 'jdjdjdjd';
     router._enforceUserIdAndAppId(req, res, next);
-    res.badRequest.should.be.called.twice; /* jslint ignore:line */
+    res.badRequest.should.be.callCount(3); /* jslint ignore:line */
+    res.badRequest.should.be.calledWith(false, 'No developer parameter was passed in the payload of this request. Please pass a developer id.');
+    nextChecker.should.be.false; /* jslint ignore:line */
+    req.body.developer = 'jdjdjdjd';
+    router._enforceUserIdAndAppId(req, res, next);
+    res.badRequest.should.be.callCount(3); /* jslint ignore:line */
     nextChecker.should.be.true; /* jslint ignore:line */
     done();
 });
diff --git a/test/routes/initialize.js b/test/routes/initialize.js
@@ -0,0 +1,89 @@
+'use strict';
+var chai = require('chai');
+chai.should();
+var config = require('../../config');
+var chaiAsPromised = require("chai-as-promised");
+chai.use(chaiAsPromised);
+var request = require('supertest');
+var express = require('express');
+var sinon = require("sinon");
+var sinonChai = require("sinon-chai");
+chai.use(sinonChai);
+
+
+var response = require('../../services/response');
+
+var express = require('express');
+var app = express();
+var bodyParser = require('body-parser');
+var router = require('../../routes/initialize');
+var routers = require('../../routes');
+
+var app = express();
+
+app.use(bodyParser.urlencoded({ extended: false }));
+app.use(bodyParser.json());
+app.use(routers._APICache);
+app.use(response);
+
+
+
+
+app.use('/',router);
+
+
+var agent = request.agent(app);
+var requestId;
+
+var res = {};
+var req = {};
+
+var nextChecker = false;    
+var next = function(){
+    if(arguments.length > 0){
+        console.log(arguments[0]);
+    }else{
+        nextChecker = true;
+    }
+    
+    return nextChecker;
+};
+res.json = function(data){
+    return res;
+};
+
+res.badRequest = sinon.spy();
+
+res.status = function(status){
+    return res;
+};
+
+var header = {};
+res.set = function(key, value){
+    header[key] = value;
+    return header[key];
+};
+req.get = function(key){
+    return header[key];
+};
+
+header.set = function(data){
+    header.temp = data;
+    return header.temp;
+};
+
+req.method = '';
+
+describe('/initialize', function(){
+    it('should return a string', function(done){
+        agent
+        .get('/initialize')
+        .then(function(resp){
+            resp.body.data['x-tag'].should.be.a('string');
+            done();
+        })
+        .catch(function(err){
+            done(err);
+        });
+    });
+});
diff --git a/test/routes/users.js b/test/routes/users.js

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,3 @@ var initializeController = require('../controllers/Initialize');`
`7`	`7`	`router.get('/initialize', initializeController.init);`
`8`	`8`
`9`	`9`	`module.exports = router;`
`10`		`-// Todo: Test initialize route`