Add Joi, Boom and separate db access from controller in puriya cli

bin/addSpec.js

@@ -21,15 +21,15 @@ program
 
       if (!fs.existsSync(`./features/${feature}`)) {
 
-        log(`Please add the feature first of ${feature} by puriya feature`);
+        log(`Please add the feature first of ${feature} by puriya feature ${feature}`);
         process.exit(1);
       }
-      let result;
+      let result = spec.addimports();
       let bodyfield = '';
       const noofTestSuites = readlineSync.question("No of testsuite :  ");
       for (let i = 0; i < noofTestSuites; i++) {
         const describeMessage = readlineSync.question("Message for describe block :  ");
-        result = spec.addimports() + spec.addtestsuite(describeMessage);
+        result = result + spec.addtestsuite(describeMessage);
         const noofTestCases = readlineSync.question("No of testcases :  ");
         for (let j = 0; j < noofTestCases; j++) {
           const itMessage = readlineSync.question("Message for it block :  ");

bin/feature.js

@@ -12,6 +12,7 @@ const ctrl = require('../files/feature/ctrl');
 const routes = require('../files/feature/routes');
 const spec = require('../files/feature/spec');
 const readlineSync = require('readline-sync');
+const db = require('../files/feature/db');
 
 function makeDir(dirName) {
 
@@ -75,6 +76,7 @@ program
     makeFile(name, `${name}.model`, model.addNewModal(name, modelData));
     makeFile(name, `${name}.ctrl`, ctrl.makeBasicCtrl(name));
     makeFile(name, `${name}.route`, routes.makeBasic(name));
+    makeFile(name, `${name}.db`, db.makeBasicdb(name));
     fs.readFile('./routes/router.js', 'utf8', function (err, data) {
       if (err) {
         log(`File not found  ${err.path}`);
@@ -89,7 +91,6 @@ program
         if (err) { return log(err); }
       });
     });
-
   })
 
   .parse(process.argv);

bin/index.js

@@ -35,6 +35,10 @@ const route = require('../files/route/route');
 const user = require('../bin/usermodel');
 const congfigspec = require('../files/spec/config');
 const dropdb = require('../files/spec/dropdb');
+const uservalidator = require('../files/feature/validator');
+const validator = require('../files/common/validator');
+const type = require('../files/feature/type');
+const db = require('../files/feature/db');
 let name; function makeDir(dirName) {
 
   mkdirp(`./${name}/${dirName}`, function (err) {
@@ -103,6 +107,7 @@ program
         makeFile('common', 'log.js', logs());
         makeFile('common', 'codes.js', codes());
         makeFile('common', 'messages.js', messages());
+        makeFile('common', 'validator.js', validator());
         makeFile('', '.gitIgnore', gitIgnore());
         makeFile('', '.eslintignore', eslintignore());
         makeFile('', '.eslintrc.json', esLint());
@@ -116,6 +121,9 @@ program
         user.makefile(name, `users`, "user.route", routes.defaultroute());
         user.makefile(name, `users`, "user.messages", usermessages.defaultusermessage());
         user.makefile(name, `users`, "user.spec", userspec.defaultspec());
+        user.makefile(name, `users`, "user.type", type.defaultType());
+        user.makefile(name, `users`, "user.validator", uservalidator.defaultValidate());
+        user.makefile(name, `users`, "user.db", db.defaultDb());
       }
     });
   })

bin/routeAdd.js

@@ -7,6 +7,7 @@ const mkdirp = require('mkdirp');
 const program = require('commander');
 const fs = require('fs');
 const ctrl = require('../files/feature/ctrl');
+const db = require('../files/feature/db');
 const routes = require('../files/feature/routes');
 const log = require('tracer').console({ format: "{{message}}  - {{file}}:{{line}}" }).log;
 const readlineSync = require('readline-sync');
@@ -82,11 +83,17 @@ program
       });
 
       const dataCtrl = ctrl.makerouteCtrl(feature, query, queryRoute, methodName);
+      const datadb = db.makeRoutedb(methodName, queryRoute, query, feature);
 
       fs.appendFile(`./features/${feature}/${feature}.ctrl.js`, dataCtrl, function (err) {
 
         if (err) { return log('Controller not found'); }
 
+      });
+      fs.appendFile(`./features/${feature}/${feature}.db.js`, datadb, function (err) {
+
+        if (err) { return log('DB access file not found'); }
+
       });
 
       // fs.readFile(`./features/${feature}/${feature}.ctrl.js`, 'utf8', function (err, data) {

files/common/logs.js

@@ -5,8 +5,8 @@ const makeLogs = function () {
   logs = `const winston = require('winston');
     require('winston-papertrail').Papertrail;
     const log = require('tracer').console({ format: '{{message}}  - {{file}}:{{line}}' }).log;
-    const host = \`logs6.papertrailapp.com\`;
-    const port = 29324;
+    const host = \`\`;
+    const port = \`\`;
 
     const nodeWinstonPapertrail = new winston.transports.Papertrail({
       host: host,

files/common/validator.js

@@ -0,0 +1,24 @@
+const validator = function () {
+  return `
+  // Models Requires
+const Joi = require('Joi');
+// User Package Requires
+const log = require('@common/log');
+
+exports.validate = function (incomingData, schemaValidation) {
+  return new Promise(function (resolve, reject) {
+    Joi.validate(incomingData, schemaValidation, function (err, value) {
+      if (err) {
+
+        log(err);
+        return reject(err);
+      } else {
+
+        resolve(value);
+      }
+    });
+  });
+};
+`;
+};
+module.exports = validator;

files/common/verify.js

@@ -62,38 +62,13 @@ const makeVerify = function () {
     };
 
     exports.admin = function (req, res, next) {
-      // check header or url parameters or post parameters for token
-      const token = req.body.token || req.query.token || req.headers[\`x-access-token\`];
-
-      // decode token
-      if (token) {
-        // verifies secret and checks exp
-        jwt.verify(token, config.secretKey, function (err, decoded) {
-          if (err) {
-            const error = new Error(\`You are not authenticated!\`);
-            error.status = 401;
-            return next(err);
-          } else {
-            // if everything is good, save to request for use in other routes
-            req._user = decoded;
-
-            // check if the user has admin flag true
-            if (req._user.admin) {
-              next();
-            } else {
-              res.status(403).json({
-                'message': \`You are not authorized to perform this operation!\`
-              });
-            }
-          }
-        });
-      } else {
-        // if there is no token
-        // return an error
-        const err = new Error(\`No token provided!\`);
-        err.status = 403;
-        return next(err);
-      }
+      if (req._user.admin) {
+    next();
+  } else {
+    res.status(403).json({
+      'message': \`You are not authorized to perform this operation!\`
+    });
+  }
 
     };`;