Merge pull request #201 from NickPhura/PRC-1046-2

PRC-1046-2: additional minor tweaks to linters/formatting.

.eslintignore

@@ -1,3 +1,9 @@
 node_modules
 
 dist
+
+openshift
+sonar-runner
+uploads
+
+.vscode

.prettierignore

@@ -1 +1,9 @@
+node_modules
+
 dist
+
+openshift
+sonar-runner
+uploads
+
+.vscode

api/controllers/document.js

@@ -153,9 +153,6 @@ exports.protectedHead = function(args, res, next) {
 };
 
 exports.protectedGet = function(args, res, next) {
-  var self = this;
-  self.scopes = args.swagger.operation['x-security-scopes'];
-
   defaultLog.info('args.swagger.params:', args.swagger.operation['x-security-scopes']);
 
   // Build match query if on docId route
@@ -232,9 +229,6 @@ exports.publicDownload = function(args, res, next) {
 };
 
 exports.protectedDownload = function(args, res, next) {
-  var self = this;
-  self.scopes = args.swagger.operation['x-security-scopes'];
-
   defaultLog.info('args.swagger.params:', args.swagger.operation['x-security-scopes']);
 
   // Build match query if on docId route

api/controllers/feature.js

@@ -43,9 +43,6 @@ exports.publicGet = function(args, res, next) {
   });
 };
 exports.protectedGet = function(args, res, next) {
-  var self = this;
-  self.scopes = args.swagger.operation['x-security-scopes'];
-
   defaultLog.info('args.swagger.params:', args.swagger.operation['x-security-scopes']);
 
   var query = {};

api/controllers/user.js

@@ -10,9 +10,6 @@ exports.protectedOptions = function(args, res, rest) {
 };
 
 exports.protectedGet = function(args, res, next) {
-  var self = this;
-  self.scopes = args.swagger.operation['x-security-scopes'];
-
   defaultLog.info('args.swagger.params:', args.swagger.operation['x-security-scopes']);
 
   // Build match query if on userId route

app.js

@@ -84,7 +84,6 @@ swaggerTools.initializeMiddleware(swaggerConfig, function(middleware) {
   }
   // Load up DB
   var options = {
-    poolSize: 10,
     user: db_username,
     pass: db_password,
     reconnectTries: Number.MAX_VALUE, // Never stop trying to reconnect
@@ -99,7 +98,7 @@ swaggerTools.initializeMiddleware(swaggerConfig, function(middleware) {
   };
   defaultLog.info('Connecting to:', dbConnection);
   mongoose.Promise = global.Promise;
-  var db = mongoose.connect(encodeURI(dbConnection), options).then(
+  mongoose.connect(encodeURI(dbConnection), options).then(
     () => {
       defaultLog.info('Database connected');
 

migrations/.eslintrc

@@ -0,0 +1,5 @@
+{
+  "rules": {
+      "no-console": "off"
+  }
+}

migrations/20181121185425-add-centroid-2dindex.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var dbm;
-var type;
-var seed;
+var type; // eslint-disable-line no-unused-vars
+var seed; // eslint-disable-line no-unused-vars
 
 /**
  * We receive the dbmigrate dependency from dbmigrate initially.

migrations/20181121194209-add-feature-2dindex.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var dbm;
-var type;
-var seed;
+var type; // eslint-disable-line no-unused-vars
+var seed; // eslint-disable-line no-unused-vars
 
 /**
  * We receive the dbmigrate dependency from dbmigrate initially.

migrations/20181128220107-add-tantalisID-index.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var dbm;
-var type;
-var seed;
+var type; // eslint-disable-line no-unused-vars
+var seed; // eslint-disable-line no-unused-vars
 
 /**
  * We receive the dbmigrate dependency from dbmigrate initially.

package.json

@@ -15,9 +15,9 @@
     "tests": "UPLOAD_DIRECTORY='./api/test/uploads/' jest api --runInBand",
     "tests-debug": "node --inspect node_modules/.bin/jest --runInBand",
     "coverage": "jest --collectCoverageFrom=api/**.js --coverage api",
-    "lint": "eslint -c .eslintrc api/**/*.js --ignore-path .eslintignore",
-    "lint-fix:1": "eslint -c .eslintrc api/**/*.js --ignore-path .eslintignore --fix",
-    "lint-fix:2": "prettier api/**/*.js --write --loglevel warn",
+    "lint": "eslint .",
+    "lint-fix:1": "eslint ./**/*.js --fix",
+    "lint-fix:2": "prettier ./**/*.js --write --loglevel warn",
     "lint-fix": "npm-run-all -l -s -c lint-fix:*"
   },
   "dependencies": {
@@ -73,7 +73,7 @@
   },
   "lint-staged": {
     "*.js": [
-      "eslint -c .eslintrc --ignore-path .eslintignore --fix",
+      "eslint --fix",
       "prettier --write --loglevel warn",
       "git add"
     ]

seed/.eslintrc

@@ -0,0 +1,5 @@
+{
+  "rules": {
+      "no-console": "off"
+  }
+}

seed/addUsers.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 //
 // Example: node addUsers.js username password http localhost 3000
 //

seed/loadApps.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 'use strict';
 
 var applist = require('./applist.json');

seed/loadDocs.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 'use strict';
 
 var doclist = require('./doclist.json');

seed/seed.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 'use strict';
 
 //
@@ -75,37 +74,39 @@ var doWork = function(e, route) {
     // console.log("e:", e);
     var postBody = JSON.stringify(e);
 
+    var f;
+
     // Bind the objectID's
     if (route === 'api/document' || route === 'api/commentperiod') {
       // console.log('app:', _applications);
       // console.log('e._application:', e._application);
       // console.log('e._decision:', e._decision);
       // console.log('e._comment:', e._comment);
       if (e._application) {
-        var f = _.find(_applications, { code: e._application });
+        f = _.find(_applications, { code: e._application });
         e._application = f._id;
       } else if (e._decision) {
-        var f = _.find(_decisions, { code: e._decision });
+        f = _.find(_decisions, { code: e._decision });
         e._decision = f._id;
       }
 
       if (route === 'api/document') {
         if (e._comment) {
-          var f = _.find(_comments, { code: e._comment });
+          f = _.find(_comments, { code: e._comment });
           e._comment = f._id;
         }
       }
     }
     if (route === 'api/public/comment') {
       // console.log('cmt:', _commentPeriods);
-      var f = _.find(_commentPeriods, { code: e.commentPeriod });
+      f = _.find(_commentPeriods, { code: e.commentPeriod });
       e._commentPeriod = f._id;
     }
     if (route === 'api/application') {
-      e.client = e.client;
+      // e.client = e.client;
     }
     if (route === 'api/decision') {
-      var f = _.find(_applications, { code: e._application });
+      f = _.find(_applications, { code: e._application });
       // e._decision = f._id;
       e._application = f._id;
     }
@@ -230,7 +231,6 @@ var doWork = function(e, route) {
 };
 
 var insertAll = function(route, entries) {
-  var self = this;
   return new Promise(function(resolve, reject) {
     console.log('route:', route);
 
@@ -246,15 +246,16 @@ var insertAll = function(route, entries) {
   });
 };
 
-var updateAll = function(collectionName, entries) {
-  if (_.isEmpty(entries)) {
-    return Promise.resolve();
-  }
-  var updates = _.map(entries, function(entry) {
-    return update(collectionName, { _id: entry._id }, entry);
-  });
-  return Promise.all(updates);
-};
+// var updateAll = function(collectionName, entries) {
+//   if (_.isEmpty(entries)) {
+//     return Promise.resolve();
+//   }
+//   var updates = _.map(entries, function(entry) {
+//     return update(collectionName, { _id: entry._id }, entry);
+//   });
+//   return Promise.all(updates);
+// };
+
 console.log('Logging in and getting JWT:');
 login(username, password)
   .then(function() {

seed/shapesMigration/updateShapes.js

@@ -32,7 +32,9 @@ var _accessToken = '';
 var args = process.argv.slice(2);
 console.log('=======================================================');
 if (args.length !== 8) {
-  console.log('Please specify proper parameters: <username> <password> <protocol> <host> <port> <client_id> <grant_type> <auth_endpoint>');
+  console.log(
+    'Please specify proper parameters: <username> <password> <protocol> <host> <port> <client_id> <grant_type> <auth_endpoint>'
+  );
   console.log('Example: node updateShapes.js admin admin http localhost 3000 client_id grant_type auth_endpoint');
   console.log('=======================================================');
   process.exit(1);
@@ -538,13 +540,21 @@ loginToACRFD(username, password)
   })
   .then(function(recentlyUpdatedApplicationIDs) {
     console.log('-----------------------------------------------');
-    console.log('5. Fetching all non-deleted ACRFD applications and cross referencing with recently updated Tantalis applications.');
+    console.log(
+      '5. Fetching all non-deleted ACRFD applications and cross referencing with recently updated Tantalis applications.'
+    );
     return getAllApplicationIDs().then(function(allACRFDApplicationIDs) {
-      return allACRFDApplicationIDs.map(app => app.tantalisID).filter(tantalisID => recentlyUpdatedApplicationIDs.includes(tantalisID));
+      return allACRFDApplicationIDs
+        .map(app => app.tantalisID)
+        .filter(tantalisID => recentlyUpdatedApplicationIDs.includes(tantalisID));
     });
   })
   .then(function(applicationIDsToUpdate) {
-    console.log(` - Found ${applicationIDsToUpdate.length} ACRFD Applications with matching recently updated Tantalis application.`);
+    console.log(
+      ` - Found ${
+        applicationIDsToUpdate.length
+      } ACRFD Applications with matching recently updated Tantalis application.`
+    );
     // For each ACRFD application with a matching recently updated application from Tantalis, fetch the matching record in ACRFD and update it
     return applicationIDsToUpdate.reduce(function(previousItem, currentItem) {
       return previousItem.then(function() {