@dhyasama/totem-models 12.16.0 → 12.16.1

package/helpers.js

@@ -37,7 +37,7 @@ const cleanPerson = module.exports.cleanPerson = function cleanPerson(doc, custo
 
   if (doc.sources) {
     doc.sources = _.reject(doc.sources, function(source) {
-      let sourceCustomerId = mongoose.Types.ObjectId.isValid(source.customer) ? source.customer : source.customer._id;
+      let sourceCustomerId = (source.customer && source.customer._id) ? source.customer._id : source.customer;
       return sourceCustomerId.toString() !== customerId.toString();
     });
   }
@@ -59,7 +59,7 @@ const cleanRound = module.exports.cleanRound = function cleanRound(doc, fundIds,
 
   if (doc.vehicles) {
     doc.vehicles = _.reject(doc.vehicles, function(item) {
-      var fundId = mongoose.Types.ObjectId.isValid(item.fund) ? item.fund : item.fund._id;
+      var fundId = (item.fund && item.fund._id) ? item.fund._id : item.fund;
       return !_.contains(fundIds, fundId.toString());
     });
   }
@@ -121,7 +121,7 @@ const getPeopleSources = module.exports.getPeopleSources = function getPeopleSou
   result = _.compact(result);
 
   if (result.length === 0) { return []; }
-  if (mongoose.Types.ObjectId.isValid(result[0].person)) { return []; } // not populated
+  if (!result[0].person || !result[0].person._id) { return []; } // not populated
 
   result = _.uniq(result, function(item) {
     if (!item || !item.person) { return ''; }

package/lib/LimitedPartner.js

@@ -311,7 +311,7 @@ module.exports = function(mongoose, config) {
     const self = this;
 
     let match = _.find(self.people, function(person) {
-      let personId = mongoose.Types.ObjectId.isValid(person) ? person : person.id;
+      let personId = (person && person._id) ? person._id : person;
       return personId.toString() === idOfPersonToAdd.toString();
     });
 

package/lib/List.js

@@ -263,7 +263,7 @@ module.exports = function(mongoose, config) {
 
     let dedupeArray = function dedupeArray(arr) {
       return _.uniq(arr, function(item) {
-        return (mongoose.Types.ObjectId.isValid(item) ? item : item._id).toString();
+        return ((item && item._id) ? item._id : item).toString();
       });
     };
 

package/lib/Organization.js

@@ -1003,7 +1003,7 @@ module.exports = function(mongoose, config) {
     // Check if person is already added
     var match = _.find(self.people, function(existingPerson) {
       if (existingPerson.person == null) return null;
-      var id = mongoose.Types.ObjectId.isValid(existingPerson.person) ? existingPerson.person : existingPerson.person.id;
+      var id = (existingPerson.person && existingPerson.person._id) ? existingPerson.person._id : existingPerson.person;
       return id.toString() == personToAdd.person.toString();
     });
 
@@ -1032,7 +1032,7 @@ module.exports = function(mongoose, config) {
     var self = this;
 
     var match = _.find(self.related, function(org) {
-      var orgId = mongoose.Types.ObjectId.isValid(org) ? org : org.id;
+      var orgId = (org && org._id) ? org._id : org;
       return orgId.toString() === id.toString();
     });
 
@@ -1043,7 +1043,7 @@ module.exports = function(mongoose, config) {
   Organization.methods.removePerson = function(personIdToRemove) {
 
     this.people = _.reject(this.people, function(existingPerson) {
-      var id = mongoose.Types.ObjectId.isValid(existingPerson.person) ? existingPerson.person : existingPerson.person._id;
+      var id = (existingPerson.person && existingPerson.person._id) ? existingPerson.person._id : existingPerson.person;
       return id.toString() === personIdToRemove.toString();
     });
 

package/lib/Person.js

@@ -231,7 +231,7 @@ module.exports = function(mongoose, config) {
     switch(chairObj.num) {
       case 'chair1':
         this.chairs.first = _.filter(this.chairs.first, function(chair) {
-          var id = mongoose.Types.ObjectId.isValid(chair.company.toString()) ? chair.company.toString() : chair.company.id.toString();
+          var id = (chair.company && chair.company._id) ? chair.company._id.toString() : chair.company.toString();
           return id !== orgId;
         });
         break;
@@ -239,7 +239,7 @@ module.exports = function(mongoose, config) {
       case 'chair2':
         field = 'chairs.second';
         this.chairs.second = _.filter(this.chairs.second, function(chair) {
-          var id = mongoose.Types.ObjectId.isValid(chair.company.toString()) ? chair.company.toString() : chair.company.id.toString();
+          var id = (chair.company && chair.company._id) ? chair.company._id.toString() : chair.company.toString();
           return id !== orgId;
         });
         break;

package/lib/Round.js

@@ -180,25 +180,21 @@ 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 (!mongoose.Types.ObjectId.isValid(investment)) {
-      investment = investment._id;
-      if (!mongoose.Types.ObjectId.isValid(investment)) throw new Error('Need a valid investment objectid!');
-    }
+    if (investment && investment._id) { investment = investment._id; }
+    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 (!mongoose.Types.ObjectId.isValid(fund)) {
-      fund = fund._id;
-      if (!mongoose.Types.ObjectId.isValid(fund)) throw new Error('Need a valid fund objectid!');
-    }
+    if (fund && fund._id) { fund = fund._id; }
+    if (!mongoose.Types.ObjectId.isValid(fund)) throw new Error('Need a valid fund objectid!');
 
     // Create or update
     var vehicle = self.addVehicle(fund);
-    var fid = mongoose.Types.ObjectId.isValid(vehicle.fund) ? vehicle.fund : vehicle.fund._id;
+    var fid = (vehicle.fund && vehicle.fund._id) ? vehicle.fund._id : vehicle.fund;
 
     // 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 = mongoose.Types.ObjectId.isValid(v.fund) ? v.fund : v.fund._id;
+      var fundid = (v.fund && v.fund._id) ? v.fund._id : v.fund;
       return fundid.toString() === fid.toString();
     });
 
@@ -207,7 +203,7 @@ module.exports = function(mongoose, config) {
 
     // Check if investment is already added
     var match = _.find(vehicle.investments, function(i) {
-      var id = mongoose.Types.ObjectId.isValid(i) ? i : i._id;
+      var id = (i && i._id) ? i._id : i;
       return id.toString() === investment.toString();
     });
 
@@ -229,14 +225,12 @@ 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 (!mongoose.Types.ObjectId.isValid(fund)) {
-      fund = fund._id;
-      if (!mongoose.Types.ObjectId.isValid(fund)) throw new Error('Need a valid fund objectid!');
-    }
+    if (fund && fund._id) { fund = fund._id; }
+    if (!mongoose.Types.ObjectId.isValid(fund)) throw new Error('Need a valid fund objectid!');
 
     // Check if vehicle is already added
     let vehicle = _.find(self.vehicles, function(v) {
-      let fundid = mongoose.Types.ObjectId.isValid(v.fund) ? v.fund : v.fund._id;
+      let fundid = (v.fund && v.fund._id) ? v.fund._id : v.fund;
       return fundid.toString() === fund.toString();
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "12.16.0",
+  "version": "12.16.1",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",