Fix/sonar

.travis.yml

@@ -141,6 +141,7 @@ matrix:
         packages:
         - g++-4.8
         - python3-pip
+        - python3.5
     before_script:
     - |-
       wget -q ${HELM_URL}/${HELM_TGZ}
@@ -192,19 +193,21 @@ matrix:
       export MINIO_SECRET_KEY="secretkey"
       ./minio server /tmp &
     - |-
+      alias python3=python3.5
       cd /home/travis/build/bcgov/OCWA/microservices/validateApi
       sudo pip3 install -U setuptools
       sudo pip3 install -r requirements.txt
       cp config/default.json.template config/default.json
       sudo pip3 install -e .
-      python3 wsgi.py &
+      python3.5 wsgi.py &
     - |-
+      alias python3=python3.5
       cd /home/travis/build/bcgov/OCWA/microservices/policyApi
       sudo pip3 install -U setuptools
       sudo pip3 install -r requirements.txt
       cp config/default.json.template config/default.json
       sudo pip3 install -e .
-      python3 wsgi.py &
+      python3.5 wsgi.py &
     - |-
       cd /home/travis/build/bcgov/OCWA/microservices/requestApi
       NODE_ENV=test npm start &

microservices/forumApi/db/db.js

@@ -5,10 +5,10 @@ mongoose.set('useCreateIndex', true);
 
 const dbProps = config.get('database');
 
-dbHost = dbProps.host;
-dbUser = dbProps.username;
-dbPass = dbProps.password;
-dbName = dbProps.dbName;
+const dbHost = dbProps.host;
+const dbUser = dbProps.username;
+const dbPass = dbProps.password;
+const dbName = dbProps.dbName;
 
 var db = {};
 
@@ -37,9 +37,7 @@ db.init = function(){
     db.Permission = require('./model/permission');
     db.User = require('./model/user');
 
-    var collections = Object.keys(db.db.collections);
-
-};
+}
 
 
 

microservices/forumApi/db/model/topic.js

@@ -34,7 +34,7 @@ model.getAll = function(query, limit, page, user, callback){
             checkGroups.splice(index,1);
         }
 
-        var index = checkGroups.indexOf('/oc');
+        index = checkGroups.indexOf('/oc');
         if (index !== -1){
             checkGroups.splice(index,1);
         }
@@ -54,7 +54,8 @@ model.getAll = function(query, limit, page, user, callback){
                 from: "permissions",
                 let: { topicId: "$_id", parent: "$parent_id"},
                 pipeline: [
-                    {$match: {
+                    {
+                        $match: {
                             $expr: {
                                 $and: [
                                     {$or: [
@@ -65,7 +66,8 @@ model.getAll = function(query, limit, page, user, callback){
                                     {$eq: ["$allow", true]}
                                 ]
                             }
-                        }},
+                        }
+                    },
                     {
                         $match: {
                             $or: [

microservices/forumApi/routes/v1/routes/comments.js

@@ -79,10 +79,10 @@ router.post("/:topicId", function(req, res, next){
             return;
         }
 
-        subscribers.subscribe(topic._id, req.user.id, true, (err) => {
-            if (err) {
+        subscribers.subscribe(topic._id, req.user.id, true, (err2) => {
+            if (err2) {
                 res.status(500);
-                res.json({error: err.message});
+                res.json({error: err2.message});
                 return;
             }
 

microservices/forumApi/routes/v1/routes/topics.js

@@ -142,9 +142,7 @@ router.post("/", function(req, res, next){
 
 router.delete('/:topicId', function(req, res){
     var db = require('../db/db');
-    var config = require('config');
     var logger = require('npmlog');
-    var mongoose = require('mongoose');
     var topicId = mongoose.Types.ObjectId(req.params.topicId);
 
     db.Topic.getAll({_id: topicId}, 1, 1, req.user, function(topicErr, topicRes) {
@@ -188,7 +186,6 @@ router.delete('/:topicId', function(req, res){
 
 router.put('/:topicId/subscribe', function(req, res){
     var db = require('../db/db');
-    var mongoose = require('mongoose');
     var subscribers = require('../subscribers/subscribers');
     var topicId = mongoose.Types.ObjectId(req.params.topicId);
 
@@ -215,7 +212,6 @@ router.put('/:topicId/subscribe', function(req, res){
 
 router.put('/:topicId/unsubscribe', function(req, res){
     var db = require('../db/db');
-    var mongoose = require('mongoose');
     var subscribers = require('../subscribers/subscribers');
     var topicId = mongoose.Types.ObjectId(req.params.topicId);
 

microservices/forumApi/routes/v1/subscribers/subscribers.js

@@ -1,8 +1,8 @@
 var db = require('../db/db');
 
-var subscribers = {};
+var s = {};
 
-subscribers.subscribe = function(topicId, userId, contributed, callback){
+s.subscribe = function(topicId, userId, contributed, callback){
     db.Topic.findById(topicId).exec((err, topic) => {
         if (err || topic == null) {
             callback({error:'topic not found'});
@@ -30,7 +30,7 @@ subscribers.subscribe = function(topicId, userId, contributed, callback){
     });
 };
 
-subscribers.unsubscribe = function(topicId, userId, callback){
+s.unsubscribe = function(topicId, userId, callback){
     db.Topic.findById(topicId).exec((err, topic) => {
         if (err || topic == null) {
             callback({error:'topic not found'});
@@ -51,4 +51,4 @@ subscribers.unsubscribe = function(topicId, userId, callback){
 };
 
 
-module.exports = subscribers;
+module.exports = s;

microservices/requestApi/auth/auth.js

@@ -9,7 +9,7 @@ var auth = function(db){
 
     const isOutputChecker = (user => user.groups.includes(config.get('outputCheckerGroup')))
     const isInReportsGroup = (user => user.groups.includes(config.get('reportsGroup')))
-    const isInGroupToCreateRequest = (user => user.groups.includes(config.get('requiredRoleToCreateRequest')))
+
 
     passport.use(new JWTStrategy({
             jwtFromRequest: ExtractJWT.fromAuthHeaderAsBearerToken(),

microservices/requestApi/auth/webhook_auth.js

@@ -1,10 +1,10 @@
 var auth = function(){
     const passport = require('passport');
-    const passJwt = require('passport-jwt');
+
     const passApiKey = require('passport-headerapikey');
     const HeaderAPIKeyStrategy = passApiKey.HeaderAPIKeyStrategy;
     const config = require('config');
-    const logger = require('npmlog');
+
 
     passport.use(new HeaderAPIKeyStrategy(
         { header: 'Authorization', prefix: 'Api-Key ' },

microservices/requestApi/clients/formio_client.js

@@ -59,7 +59,7 @@ formio.auth = function(callback){
 formio.getSubmissions = function(formName, callback) {
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/"+formName+"/submission";
 
@@ -85,7 +85,7 @@ formio.getSubmission = function(formName, submissionId, callback) {
 
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/"+formName+"/submission/"+submissionId;
         logger.verbose("formio get submission", url);
@@ -106,7 +106,7 @@ formio.getSubmission = function(formName, submissionId, callback) {
 formio.postSubmission = function(formName, values, callback) {
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/"+formName+"/submission";
 
@@ -139,7 +139,7 @@ formio.postSubmission = function(formName, values, callback) {
 formio.deleteSubmission = function(formName, submissionId, callback) {
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/"+formName+"/submission/"+submissionId;
 
@@ -156,7 +156,7 @@ formio.deleteSubmission = function(formName, submissionId, callback) {
 formio.putSubmission = function(formName, submissionId, values, callback) {
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/"+formName+"/submission/"+submissionId;
 
@@ -182,7 +182,7 @@ formio.getForms = function(callback) {
     }
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/form";
 
@@ -208,7 +208,7 @@ formio.getForm = function(formName, callback) {
     }
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/"+formName;
 
@@ -229,7 +229,7 @@ formio.getForm = function(formName, callback) {
 formio.postForm = function(data, callback) {
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/form";
 
@@ -246,7 +246,7 @@ formio.postForm = function(data, callback) {
 formio.putForm = function(formName, data, callback) {
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/form/" + formName;
 
@@ -263,7 +263,7 @@ formio.putForm = function(formName, data, callback) {
 formio.deleteForm = function(formName, callback) {
     this.auth(function(err, jwt){
         if (err){
-            logger.error("Error getting jwt", err);
+            logger.debug("Error getting jwt", err);
         }
         var url = config.get('formio.url') + "/" + formName;
 

microservices/requestApi/db/db.js

@@ -5,10 +5,10 @@ mongoose.set('useCreateIndex', true);
 
 const dbProps = config.get('database');
 
-dbHost = dbProps.host;
-dbUser = dbProps.username;
-dbPass = dbProps.password;
-dbName = dbProps.dbName;
+const dbHost = dbProps.host;
+const dbUser = dbProps.username;
+const dbPass = dbProps.password;
+const dbName = dbProps.dbName;
 
 function versionedDB(version){
 
@@ -45,7 +45,7 @@ function versionedDB(version){
     db.init();
 
     return db;
-};
+}
 
 
 

microservices/requestApi/db/model/request.js

@@ -325,7 +325,7 @@ model.getAll = function(query, limit, page, user, callback){
 
     logger.verbose("getAll ", user.supervisor, user.outputchecker);   
 
-    var queryRequests = function(err, topicR, projectR){
+    var queryRequests = function(err2, topicR, projectR){
         logger.verbose("get all topics model get all", topicR);
         if ('_id' in query) {
             query['_id'] = mongoose.Types.ObjectId(query['_id']);
@@ -399,24 +399,35 @@ model.getAll = function(query, limit, page, user, callback){
         ];
 
         db.Request.aggregate(q).exec(function(err, results){
+            if (err){
+                return callback(err, []);
+            }
             logger.verbose("in topic bind");
             if (results){
                 for (var i=0; i<results.length; i++){
-                    let topicId = results[i].topic;
-                    results[i].projects = projectR.get(topicId);
+                    if ( (typeof(results[i]) !== "undefined") && (typeof(results[i].topic) !== "undefined") ){
+                        let topicId = results[i].topic;
+                        results[i].projects = projectR.get(topicId);
+                    }
                 }
             }
             callback(err, results);
         });
     }
 
     if ('_id' in query) {
-        db.Request.findById(query['_id'], (err, req) => {
-            getAllTopics(user, { id: req.topic }, queryRequests);
+        db.Request.findById(query['_id'], (err3, req) => {
+            if ( (req !== null) && (typeof(req) !== "undefined") && (typeof(req.topic) !== "undefined") ){
+                getAllTopics(user, { id: req.topic }, queryRequests);
+            }else{
+                callback(null, []);
+            }
         });
     } else {
         getAllTopics(user, {}, queryRequests);
     }
 };
 
+model.VERSION = 1;
+
 module.exports = model;

microservices/requestApi/notifications/email/index.js

@@ -1,4 +1,4 @@
-var notifications = function(db){
+var notification = function(db){
 
     var notifications = {};
     var fs = require('fs');
@@ -80,14 +80,14 @@ var notifications = function(db){
 
         if ( (submittedUnclaimed) && (config.has('emailOnInitialSubmit')) ){
             var emailList = config.get('emailOnInitialSubmit');
-            for (var i=0; i<emailList.length; i++){
+            for (let i=0; i<emailList.length; i++){
                 sendEmail(request, {name: emailList[i].name, email: emailList[i].email}, user, "emailSubmitTemplate.html");
             }
         }
 
         logger.verbose("Notification[email] triggered", user);
 
-        for (var i=0; i<notifyWho.length; i++){
+        for (let i=0; i<notifyWho.length; i++){
 
             var who = notifyWho[i];
 
@@ -160,4 +160,4 @@ var notifications = function(db){
     return notifications;
 }
 
-module.exports = notifications;
+module.exports = notification;