@dhyasama/totem-models 10.5.0 → 10.7.0

package/helpers.js

@@ -16,14 +16,14 @@ const cleanOrg = module.exports.cleanOrg = function cleanOrg(doc, customerId) {
   // remove customer details if not viewing self
   if (doc._id.toString() !== customerId.toString()) { doc.customer = {}; }
 
-  doc.chairs = _.reject(doc.chairs, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
-  doc.customFields = _.reject(doc.customFields, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
-  doc.filters = _.reject(doc.filters, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
-  doc.lps = _.reject(doc.lps, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
-  doc.valuations = _.reject(doc.valuations, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
-  doc.documents = _.reject(doc.documents, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });  
-  doc.operating.acquired.private = _.find(doc.operating.acquired.private, function(item) { return item && item.customer && item.customer.toString() === customerId.toString(); });
-  doc.operating.closed.private = _.find(doc.operating.closed.private, function(item) { return item && item.customer && item.customer.toString() === customerId.toString(); });
+  if (doc.chairs) doc.chairs = _.reject(doc.chairs, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
+  if (doc.customFields) doc.customFields = _.reject(doc.customFields, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
+  if (doc.filters) doc.filters = _.reject(doc.filters, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
+  if (doc.lps) doc.lps = _.reject(doc.lps, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
+  if (doc.valuations) doc.valuations = _.reject(doc.valuations, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });
+  if (doc.documents) doc.documents = _.reject(doc.documents, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });  
+  if (doc.operating && doc.operating.acquired) doc.operating.acquired.private = _.find(doc.operating.acquired.private, function(item) { return item && item.customer && item.customer.toString() === customerId.toString(); });
+  if (doc.operating && doc.operating.closed) doc.operating.closed.private = _.find(doc.operating.closed.private, function(item) { return item && item.customer && item.customer.toString() === customerId.toString(); });
 
   return doc;
 
@@ -36,12 +36,34 @@ const cleanPerson = module.exports.cleanPerson = function cleanPerson(doc, custo
   if (!customerId) { return; }
   if (!mongoose.Types.ObjectId.isValid(customerId)) { return; }
 
-  doc.sources = _.reject(doc.sources, function(source) {
-    let sourceCustomerId = mongoose.Types.ObjectId.isValid(source.customer) ? source.customer : source.customer._id;
-    return sourceCustomerId.toString() !== customerId.toString();
-  });
+  if (doc.sources) {
+    doc.sources = _.reject(doc.sources, function(source) {
+      let sourceCustomerId = mongoose.Types.ObjectId.isValid(source.customer) ? source.customer : source.customer._id;
+      return sourceCustomerId.toString() !== customerId.toString();
+    });
+  }
+
+  if (doc.documents) doc.documents = _.reject(doc.documents, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });  
+
+  return doc;
+
+};
+
+const cleanRound = module.exports.cleanRound = function cleanRound(doc, fundIds, customerId) {
 
-  doc.documents = _.reject(doc.documents, function(item) { return !item || !item.customer || item.customer.toString() !== customerId.toString(); });  
+  if (!doc) { return; }
+  if (!doc._id) { return; }
+  if (!customerId) { return; }
+  if (!mongoose.Types.ObjectId.isValid(customerId)) { return; }
+
+  fundIds = _.map(fundIds, function(id) { return id.toString(); });
+
+  if (doc.vehicles) {
+    doc.vehicles = _.reject(doc.vehicles, function(item) {
+      var fundId = mongoose.Types.ObjectId.isValid(item.fund) ? item.fund : item.fund._id;
+      return !_.contains(fundIds, fundId.toString());
+    });
+  }
 
   return doc;
 
@@ -76,7 +98,6 @@ const getGeolocation = module.exports.getGeolocation = function getGeolocation(i
 
   });
 
-
 };
 
 const getPeopleSources = module.exports.getPeopleSources = function getPeopleSources(people) {

package/lib/Round.js

@@ -90,8 +90,6 @@ module.exports = function(mongoose, config) {
 
     var portfolio = [];
 
-    rounds = filterVehicles(rounds, fundIds);
-
     // we now have all the rounds the funds have participated in with other fund information removed from each round
 
     // Group rounds by org, for two reasons:
@@ -114,7 +112,6 @@ module.exports = function(mongoose, config) {
         logoUrl: rounds[0].organization.logoUrl,
         description: rounds[0].organization.description,
         status: rounds[0].organization.status,
-        filters: rounds[0].organization.filters,
         contact: rounds[0].organization.contact,
         websites: websites,
         rounds: rounds
@@ -158,24 +155,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  var filterVehicles = function filterVehicles(rounds, fundIds) {
-
-    // Given a collection of rounds, each with a collection of vehicles,
-    // remove all vehicles that aren't for the given fund ids
-
-    fundIds = _.map(fundIds, function(id) { return id.toString(); });
-
-    _.each(rounds, function(r) {
-      r.vehicles = _.filter(r.vehicles, function(v) {
-        var fundid = mongoose.Types.ObjectId.isValid(v.fund) ? v.fund : v.fund._id;
-        return fundIds.indexOf(fundid.toString()) >= 0;
-      });
-    });
-
-    return rounds;
-
-  };
-
   ///////////////////////////////////////////////////////////////////////////////////////
   // METHODS
   //
@@ -420,7 +399,7 @@ module.exports = function(mongoose, config) {
 
     let query = self.find({ 'vehicles.fund': fundId });
     query.select('organization roundName vehicles');
-    query.populate('organization', 'name logoUrl website websiteAliases');
+    query.populate('organization', 'name logoUrl website websiteAliases filters status');
 
     if (options.isWorkerProcess) {
       query.populate('vehicles.investments');
@@ -437,17 +416,21 @@ module.exports = function(mongoose, config) {
       if (err) return cb(err, null);
       if (!rounds) return cb(null, []);
 
-      let fundInvestments = [];
+      if (!options.isWorkerProcess) {
+        _.each(rounds, function(round) {
+          round = helpers.cleanRound(round, [fundId], options.CUSTOMER_ID);
+          round.organization = helpers.cleanOrg(round.organization, options.CUSTOMER_ID);
+        });
+      }
 
+      let fundInvestments = [];
       _.each(rounds, function(round) {
         _.each(round.vehicles, function(vehicle) {
-          if(vehicle.fund.toString() === fundId.toString()) {
-            _.each(vehicle.investments, function(investment) {
-              investment.organization = round.organization;
-              investment.roundName = round.roundName;
-              fundInvestments.push(investment);
-            });
-          }
+          _.each(vehicle.investments, function(investment) {
+            investment.organization = round.organization;
+            investment.roundName = round.roundName;
+            fundInvestments.push(investment);
+          });
         });
       });
 
@@ -487,7 +470,13 @@ module.exports = function(mongoose, config) {
       else if (!rounds) return cb(null, null);
       else if (rounds.length === 0) return cb(null, []);
 
-      rounds = filterVehicles(rounds, [fundId]);
+      if (!options.isWorkerProcess) {
+        _.each(rounds, function(round) {
+          round = helpers.cleanRound(round, [fundId], options.CUSTOMER_ID);
+          round.organization = helpers.cleanOrg(round.organization, options.CUSTOMER_ID);
+        });
+      }
+
       return cb(null, calculatePerformance(rounds));
 
     });
@@ -536,6 +525,7 @@ module.exports = function(mongoose, config) {
 
       if (!options.isWorkerProcess) {
         _.each(rounds, function(round) {
+          round = helpers.cleanRound(round, [fundId], options.CUSTOMER_ID);
           round.organization = helpers.cleanOrg(round.organization, options.CUSTOMER_ID);
         });
       }
@@ -599,6 +589,7 @@ module.exports = function(mongoose, config) {
 
       if (!options.isWorkerProcess) {
         _.each(rounds, function(round) {
+          round = helpers.cleanRound(round, fundIds, options.CUSTOMER_ID);
           round.organization = helpers.cleanOrg(round.organization, options.CUSTOMER_ID);
         });
       }
@@ -634,6 +625,13 @@ module.exports = function(mongoose, config) {
       if (err) return cb(err, null);
       if (!rounds || rounds.length === 0) return cb(null, []);
 
+      if (!options.isWorkerProcess) {
+        _.each(rounds, function(round) {
+          round = helpers.cleanRound(round, fundIds, options.CUSTOMER_ID);
+          round.organization = helpers.cleanOrg(round.organization, options.CUSTOMER_ID);
+        });
+      }
+
       let portfolio = [];
       const grouped = _.groupBy(rounds, function(r) { return r.organization._id; });
 

package/package.json

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