@dhyasama/totem-models 8.0.2 → 8.0.4

package/helpers.js

@@ -2,6 +2,9 @@
 
 const _ = require('underscore');
 const mongoose = require('mongoose');
+const rangeCheck = require('range_check');
+const request = require('request');
+const utilities = require('@dhyasama/totem-utilities');
 
 const cleanOrg = module.exports.cleanOrg = function cleanOrg(doc, customerId) {
 
@@ -49,6 +52,30 @@ const getDefaultOptions = module.exports.getDefaultOptions = function getDefault
 
 };
 
+const getGeolocation = module.exports.getGeolocation = function getGeolocation(ip, cb) {
+
+  if (!rangeCheck.validIp(ip)) { return cb(null, {}); }
+
+  request('https://freegeoip.net/json/' + ip, function (error, response, body) {
+
+    if (error) {
+      return cb(error, null);
+    }
+    else if (response && response.statusCode !== 200) {
+      return cb(new Error('non-200 status code from geoip (' + response.statusCode + ')'), null);
+    }
+    else if (!utilities.isValidJson(body)) {
+      return cb(new Error('invalid json from geoip'), null);
+    }
+    else {
+      return cb(null, JSON.parse(body));
+    }
+
+  });
+
+
+};
+
 const getPeopleSources = module.exports.getPeopleSources = function getPeopleSources(people) {
 
   if (!people) { return []; }

package/lib/Activity.js

@@ -5,10 +5,8 @@ module.exports = function(mongoose, config) {
   var
 
     Schema = mongoose.Schema,
-    Geoip = require('@dhyasama/ffvc-geoip'),
-    geoip = new Geoip(),
     async = require('async'),
-    rangeCheck = require('range_check');
+    helpers = require('../helpers');
 
   var Activity = new Schema({
 
@@ -46,8 +44,6 @@ module.exports = function(mongoose, config) {
 
   });
 
-
-
   Activity.statics.add = function(username, type, remoteAddress, url, filename, callback) {
 
     var self = this;
@@ -76,11 +72,6 @@ module.exports = function(mongoose, config) {
 
     };
 
-    var getGeolocation = function(cb) {
-      if (!rangeCheck.validIp(remoteAddress)) return cb(null, {});
-      geoip.locate(remoteAddress, cb);
-    };
-
     var asyncFinally = function(err, results) {
 
       var activity = results ? results[0] : {};
@@ -111,7 +102,10 @@ module.exports = function(mongoose, config) {
 
     };
 
-    async.parallel([getActivity, getGeolocation], asyncFinally);
+    async.parallel([
+      getActivity,
+      helpers.getGeolocation.bind(null, remoteAddress)
+    ], asyncFinally);
 
   };
 

package/lib/Deal.js

@@ -6,8 +6,7 @@ module.exports = function(mongoose, config) {
 
     Schema = mongoose.Schema,
     async = require('async'),
-    _ = require('underscore'),
-    utilities = require('@dhyasama/ffvc-utilities');
+    _ = require('underscore');
 
   let Deal = new Schema({
 

package/lib/Document.js

@@ -5,7 +5,7 @@ module.exports = function(mongoose, config) {
   var
 
     Schema = mongoose.Schema,
-    utilities = require('@dhyasama/ffvc-utilities'),
+    utilities = require('@dhyasama/totem-utilities'),
     _ = require('underscore');
 
   var Document = new Schema({

package/lib/Interaction.js

@@ -5,7 +5,7 @@ module.exports = function(mongoose, config) {
   let Schema = mongoose.Schema;
   let async = require('async');
   let Note = mongoose.model('Note');
-  let utilities = require('@dhyasama/ffvc-utilities');
+  let utilities = require('@dhyasama/totem-utilities');
   let moment = require('moment');
   let helpers = require('../helpers');
 

package/lib/List.js

@@ -6,7 +6,6 @@ module.exports = function(mongoose, config) {
 
     Schema = mongoose.Schema,
     env = process.env.NODE_ENV || 'development',
-    utils = require('@dhyasama/ffvc-utilities'),
     _ = require('underscore');
 
   let List = new Schema({
@@ -235,7 +234,7 @@ module.exports = function(mongoose, config) {
 
     let dedupeArray = function dedupeArray(arr) {
       return _.uniq(arr, function(item) {
-        return (utils.isValidObjectId(item) ? item : item._id).toString();
+        return (mongoose.Types.ObjectId.isValid(item) ? item : item._id).toString();
       });
     };
 

package/lib/Organization.js

@@ -6,7 +6,7 @@ module.exports = function(mongoose, config) {
 
     _ = require('underscore'),
     async = require('async'),
-    utils = require('@dhyasama/ffvc-utilities'),
+    utilities = require('@dhyasama/totem-utilities'),
     helpers = require('../helpers'),
     Schema = mongoose.Schema,
     Flag = mongoose.model('Flag'),
@@ -932,12 +932,12 @@ module.exports = function(mongoose, config) {
     // Some simple validation
     if (!personToAdd) throw new Error('Must supply person to add');
     if (!personToAdd.person) throw new Error('Person to add must have person reference');
-    if (!utils.isValidObjectId(personToAdd.person)) throw new Error('Person reference must be a valid objectid');
+    if (!mongoose.Types.ObjectId.isValid(personToAdd.person)) throw new Error('Person reference must be a valid objectid');
 
     // Check if person is already added
     var match = _.find(self.people, function(existingPerson) {
       if (existingPerson.person == null) return null;
-      var id = utils.isValidObjectId(existingPerson.person) ? existingPerson.person : existingPerson.person.id;
+      var id = mongoose.Types.ObjectId.isValid(existingPerson.person) ? existingPerson.person : existingPerson.person.id;
       return id.toString() == personToAdd.person.toString();
     });
 
@@ -966,7 +966,7 @@ module.exports = function(mongoose, config) {
     var self = this;
 
     var match = _.find(self.related, function(org) {
-      var orgId = utils.isValidObjectId(org) ? org : org.id;
+      var orgId = mongoose.Types.ObjectId.isValid(org) ? org : org.id;
       return orgId.toString() === id.toString();
     });
 
@@ -977,8 +977,8 @@ module.exports = function(mongoose, config) {
   Organization.methods.removePerson = function(personIdToRemove) {
 
     this.people = _.reject(this.people, function(existingPerson) {
-      var id = utils.isValidObjectId(existingPerson.person) ? existingPerson.person : existingPerson.person._id;
-      return id.toString() == personIdToRemove.toString();
+      var id = mongoose.Types.ObjectId.isValid(existingPerson.person) ? existingPerson.person : existingPerson.person._id;
+      return id.toString() === personIdToRemove.toString();
     });
 
   };
@@ -1240,7 +1240,7 @@ module.exports = function(mongoose, config) {
     if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
 
-    let username = utils.getUsernameFromUrl(value);
+    let username = utilities.getUsernameFromUrl(value);
 
     if (!username) { return cb(null, []); }
 
@@ -1692,7 +1692,7 @@ module.exports = function(mongoose, config) {
     };
 
     // combine provided and default options
-    options = utils.setDefaults(options, defaultOptions);
+    options = _.defaults(options || {}, defaultOptions);
 
     // need to be admin or provide investor id
     if (!options.admin && !options.investor) return cb(null, []);
@@ -1782,7 +1782,7 @@ module.exports = function(mongoose, config) {
 
         data.domain = data.domain.toLowerCase();
 
-        var parsed = utils.getDomain(data.domain);
+        var parsed = utilities.getDomain(data.domain);
         if (parsed) data.domain = parsed;
 
         var domainRegExp = options.fuzzy ? new RegExp(data.domain, 'i') : new RegExp('^' + data.domain + '$', 'i');
@@ -1941,7 +1941,7 @@ module.exports = function(mongoose, config) {
         if (obj.website) {
           obj.website = String(obj.website);
           obj.website = obj.website.replace('http://', '').replace('https://', '').replace(/\/+$/, '');
-          obj.website = utils.getDomain(obj.website);
+          obj.website = utilities.getDomain(obj.website);
         }
 
         // Format website aliases
@@ -1949,7 +1949,7 @@ module.exports = function(mongoose, config) {
           obj.websiteAliases = _.map(obj.websiteAliases, function(alias) {
             alias = String(alias);
             alias = alias.replace('http://', '').replace('https://', '').replace(/\/+$/, '');
-            return utils.getDomain(alias);
+            return utilities.getDomain(alias);
           });
         }
 

package/lib/Person.js

@@ -9,7 +9,7 @@ module.exports = function(mongoose, config) {
     Note = mongoose.model('Note'),
     Flag = mongoose.model('Flag'),
     helpers = require('../helpers'),
-    utils = require('@dhyasama/ffvc-utilities'),
+    utilities = require('@dhyasama/totem-utilities'),
     async = require('async'),
     _ = require('underscore'),
     PhoneNumber = require( 'awesome-phonenumber'),
@@ -240,21 +240,21 @@ module.exports = function(mongoose, config) {
     switch(chairObj.num) {
       case 'chair1':
         this.chairs.first = _.filter(this.chairs.first, function(chair) {
-          var id = utils.isValidObjectId(chair.company.toString()) ? chair.company.toString() : chair.company.id.toString();
-          return id != orgId;
+          var id = mongoose.Types.ObjectId.isValid(chair.company.toString()) ? chair.company.toString() : chair.company.id.toString();
+          return id !== orgId;
         });
         break;
 
       case 'chair2':
         field = 'chairs.second';
         this.chairs.second = _.filter(this.chairs.second, function(chair) {
-          var id = utils.isValidObjectId(chair.company.toString()) ? chair.company.toString() : chair.company.id.toString();
-          return chair.company.id != orgId;
+          var id = mongoose.Types.ObjectId.isValid(chair.company.toString()) ? chair.company.toString() : chair.company.id.toString();
+          return id !== orgId;
         });
         break;
     }
 
-    if(chairObj.val && chairObj.val == "") {
+    if(chairObj.val && chairObj.val === '') {
       this.previous.push({
         field: field,
         value: {
@@ -352,7 +352,7 @@ module.exports = function(mongoose, config) {
 
     if (!value) { return cb(new Error('value must be provided'), null); }
 
-    let username = utils.getUsernameFromUrl(value);
+    let username = utilities.getUsernameFromUrl(value);
 
     if (!username) { return cb(null, []); }
 
@@ -906,7 +906,7 @@ module.exports = function(mongoose, config) {
     };
 
     // combine provided and default options
-    options = utils.setDefaults(options, defaultOptions);
+    options = _.defaults(options || {}, defaultOptions);
 
     // need to be admin or provide investor id
     if (!options.admin && !options.investor) return cb(null, []);

package/lib/Round.js

@@ -19,7 +19,6 @@
 module.exports = function(mongoose, config) {
 
   let Schema = mongoose.Schema;
-  let utils = require('@dhyasama/ffvc-utilities');
   let async = require('async');
   let _ = require('underscore');
   let helpers = require('../helpers');
@@ -209,7 +208,7 @@ module.exports = function(mongoose, config) {
 
     _.each(rounds, function(r) {
       r.vehicles = _.filter(r.vehicles, function(v) {
-        var fundid = utils.isValidObjectId(v.fund) ? v.fund : v.fund._id;
+        var fundid = mongoose.Types.ObjectId.isValid(v.fund) ? v.fund : v.fund._id;
         return fundIds.indexOf(fundid.toString()) >= 0;
       });
     });
@@ -242,7 +241,7 @@ module.exports = function(mongoose, config) {
     // sums the value (fair or realized) of all vehicles in the round
     var self = this;
     return _.reduce(self.vehicles, function(memo, vehicle) {
-      if (self.roundName == 'Proceeds') return memo + vehicle.realized; // proceeds are realized and do not have a fair value
+      if (self.roundName === 'Proceeds') return memo + vehicle.realized; // proceeds are realized and do not have a fair value
       else return memo + vehicle.fairValue;
     }, 0);
   });
@@ -280,26 +279,26 @@ module.exports = function(mongoose, config) {
     if (!fund) throw new Error('Must supply fund to add');
 
     // Do our best to accept an object or an objectid
-    if (!utils.isValidObjectId(investment)) {
+    if (!mongoose.Types.ObjectId.isValid(investment)) {
       investment = investment._id;
-      if (!utils.isValidObjectId(investment)) throw new Error('Need a valid investment objectid!');
+      if (!mongoose.Types.ObjectId.isValid(investment)) throw new Error('Need a valid investment objectid!');
     }
 
     // Do our best to accept an object or an objectid
-    if (!utils.isValidObjectId(fund)) {
+    if (!mongoose.Types.ObjectId.isValid(fund)) {
       fund = fund._id;
-      if (!utils.isValidObjectId(fund)) throw new Error('Need a valid fund objectid!');
+      if (!mongoose.Types.ObjectId.isValid(fund)) throw new Error('Need a valid fund objectid!');
     }
 
     // Create or update
     var vehicle = self.addVehicle(fund, data);
-    var fid = utils.isValidObjectId(vehicle.fund) ? vehicle.fund : vehicle.fund._id;
+    var fid = mongoose.Types.ObjectId.isValid(vehicle.fund) ? vehicle.fund : vehicle.fund._id;
 
     // The vehicle returned by addVehicle, appears to be a copy not a reference which is odd to me.
     // We need a reference to add the investment, so go get it.
     vehicle = _.find(self.vehicles, function(v) {
-      var fundid = utils.isValidObjectId(v.fund) ? v.fund : v.fund._id;
-      return fundid.toString() == fid.toString();
+      var fundid = mongoose.Types.ObjectId.isValid(v.fund) ? v.fund : v.fund._id;
+      return fundid.toString() === fid.toString();
     });
 
     // bail if not found
@@ -307,8 +306,8 @@ module.exports = function(mongoose, config) {
 
     // Check if investment is already added
     var match = _.find(vehicle.investments, function(i) {
-      var id = utils.isValidObjectId(i) ? i : i._id;
-      return id.toString() == investment.toString();
+      var id = mongoose.Types.ObjectId.isValid(i) ? i : i._id;
+      return id.toString() === investment.toString();
     });
 
     // If not, add it
@@ -326,16 +325,16 @@ module.exports = function(mongoose, config) {
     if (!person) throw new Error('Must supply person to add');
 
     // Do our best to accept an object or an objectid
-    if (!utils.isValidObjectId(person)) {
+    if (!mongoose.Types.ObjectId.isValid(person)) {
       person = person._id;
-      if (!utils.isValidObjectId(person)) throw new Error('Need a valid objectid!');
+      if (!mongoose.Types.ObjectId.isValid(person)) throw new Error('Need a valid objectid!');
     }
 
     // Check if person is already added
     var match = _.find(self.people, function(existingPerson) {
       var p = existingPerson.person || existingPerson;
-      var id = utils.isValidObjectId(p) ? p : p._id;
-      return id.toString() == person.toString();
+      var id = mongoose.Types.ObjectId.isValid(p) ? p : p._id;
+      return id.toString() === person.toString();
     });
 
     // If not, add it
@@ -353,14 +352,14 @@ module.exports = function(mongoose, config) {
     // Note investment data is not added here
     // Note data will overwrite values for an existing vehicle.
 
-    var self = this;
+    const self = this;
 
-    if (!fund) throw new Error('Must supply fund to add');
+    if (!fund) { throw new Error('Must supply fund to add'); }
 
     // Do our best to accept an object or an objectid
-    if (!utils.isValidObjectId(fund)) {
+    if (!mongoose.Types.ObjectId.isValid(fund)) {
       fund = fund._id;
-      if (!utils.isValidObjectId(fund)) throw new Error('Need a valid fund objectid!');
+      if (!mongoose.Types.ObjectId.isValid(fund)) throw new Error('Need a valid fund objectid!');
     }
 
     data = data || {};
@@ -369,9 +368,9 @@ module.exports = function(mongoose, config) {
     data.valuationDate = data.valuationDate || null;
 
     // Check if vehicle is already added
-    var vehicle = _.find(self.vehicles, function(v) {
-      var fundid = utils.isValidObjectId(v.fund) ? v.fund : v.fund._id;
-      return fundid.toString() == fund;
+    let vehicle = _.find(self.vehicles, function(v) {
+      let fundid = mongoose.Types.ObjectId.isValid(v.fund) ? v.fund : v.fund._id;
+      return fundid.toString() === fund.toString();
     });
 
     // update data on existing vehicle
@@ -882,7 +881,7 @@ module.exports = function(mongoose, config) {
         }
 
         // escrow is also special, except the gains are unrealized
-        else if (doc.roundName == 'Escrow') {
+        else if (doc.roundName === 'Escrow') {
           vehicle.unrealized = vehicle.fairValue - vehicle.cost;
           vehicle.realized = 0;
         }

package/package.json

@@ -1,19 +1,21 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
   "main": "index.js",
+  "engines": {
+    "node": "12.13.1"
+  },
   "scripts": {
-    "test": "NODE_ENV=test node ./changeBSON && mocha -R spec -t 15000 --exit"
+    "test": "NODE_ENV=test mocha -R spec -t 15000 --exit"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@dhyasama/ffvc-geoip": "^1.0.0",
-    "@dhyasama/ffvc-utilities": "^2.7.5",
+    "@dhyasama/totem-utilities": "^3.0.0",
     "async": "^2.6.3",
     "awesome-phonenumber": "^1.0.14",
     "bluebird": "^3.7.0",
@@ -22,6 +24,7 @@
     "mongoose-deep-populate": "^3.0.0",
     "mongoose-filter-denormalize": "^0.2.1",
     "range_check": "^1.4.0",
+    "request": "^2.88.0",
     "underscore": "~1.5.0",
     "validator": "^5.4.0"
   },

package/test/Round.js

@@ -16,7 +16,6 @@ var
 var orgid = new mongoose.Types.ObjectId();
 var personid = new mongoose.Types.ObjectId();
 var fundid = new mongoose.Types.ObjectId();
-var investmentid = new mongoose.Types.ObjectId();
 var organization, organization2, fund, person, investment, investment2;
 
 describe('Rounds', function() {