@dhyasama/totem-models 1.17.0 → 1.17.2

package/lib/LimitedPartner.js

@@ -409,12 +409,29 @@ module.exports = function(mongoose, config) {
   LimitedPartner.statics.getByPersonId = function(personId, role, cb) {
 
     var self = this;
+    var query;
 
-    self
-      .find({'people': personId}, this.getReadFilterKeys(role))
-      .populate('fundsInvested.fund')
-      .populate('people', 'name')
-      .exec(cb);
+    var getLps = function(q) {
+      q.populate('fundsInvested.fund')
+      q.populate('people', 'name')
+      q.exec(function (err, lps) {
+        if (err) return cb(err, null);
+        lps = _.sortBy(lps, function(lp) { return lp.name ? lp.name.toLowerCase() : ''; });
+        return cb(null, lps);
+      });
+    };
+
+    if (CUSTOMER_ID == 'GLOBAL_PROCESS') {
+      query = self.find({'people': personId}, this.getReadFilterKeys(role))
+      getLps(query);
+    }
+    else {
+      getFundIdsForCustomer(function(err, fundIds) {
+        if (err) return cb(err, null);
+        query = self.find({'people': personId, 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
+        getLps(query);
+      });
+    }
 
   };
 
@@ -426,29 +443,25 @@ module.exports = function(mongoose, config) {
 
     var self = this;
     var query;
-    var getLps = function() {
-      query.populate('fundsInvested.fund')
-      query.exec(function (err, lps) {
 
+    var getLps = function(q) {
+      q.populate('fundsInvested.fund')
+      q.exec(function (err, lps) {
         if (err) return cb(err, null);
-
-        lps = _.sortBy(lps, function(lp) {
-          return lp.name ? lp.name.toLowerCase() : '';
-        });
-
+        lps = _.sortBy(lps, function(lp) { return lp.name ? lp.name.toLowerCase() : ''; });
         return cb(null, lps);
       });
     };
 
     if (CUSTOMER_ID == 'GLOBAL_PROCESS') {
       query = self.find({}, self.getReadFilterKeys(role));
-      getLps();
+      getLps(query);
     }
     else {
       getFundIdsForCustomer(function(err, fundIds) {
         if (err) return cb(err, null);
         query = self.find({ 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
-        getLps();
+        getLps(query);
       });
     }
 

package/lib/Round.js

@@ -400,43 +400,49 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
-    self
-      .find({
-        'deleted': { $ne: true },
-        'organization': orgId
-      })
-      .populate('organization', 'name logoUrl')
-      .populate('people.person', 'name avatarUrl title')
-      .populate('vehicles.fund', 'name shortName')
-      .populate({
+    var query = self.find({
+      'deleted': { $ne: true },
+      'organization': orgId
+    });
+    query.populate('organization', 'name logoUrl');
+    query.populate('people.person', 'name avatarUrl title');
+    query.populate('vehicles.fund', 'name shortName');
+
+    if (config.CUSTOMER_ID == 'GLOBAL_PROCESS') {
+      query.populate('vehicles.investments');
+    }
+    else {
+      query.populate({
         path: 'vehicles.investments',
         match: { customer: config.CUSTOMER_ID }
-      })
-      .exec(function(err, rounds) {
+      });
+    }
 
-        if (err) return cb(err, null);
-        if (!rounds || rounds.length == 0) return cb(null, []);
+    query.exec(function(err, rounds) {
 
-        var error = checkForUnpopulatedData(rounds, 'Round.getByOrg');
-        if (error) return cb(error, null);
+      if (err) return cb(err, null);
+      if (!rounds || rounds.length == 0) return cb(null, []);
 
-        // reverse chronological
-        rounds = _.sortBy(rounds, function(r) {
+      var error = checkForUnpopulatedData(rounds, 'Round.getByOrg');
+      if (error) return cb(error, null);
 
-          var date = r.closingDate;
+      // reverse chronological
+      rounds = _.sortBy(rounds, function(r) {
 
-          // use investment date in absence of closing date
-          if (!date && r.vehicles.length && r.vehicles[0].investments.length) {
-            date = r.vehicles[0].investments[0].investmentDate;
-          }
+        var date = r.closingDate;
 
-          return date;
+        // use investment date in absence of closing date
+        if (!date && r.vehicles.length && r.vehicles[0].investments.length) {
+          date = r.vehicles[0].investments[0].investmentDate;
+        }
 
-        }).reverse();
+        return date;
 
-        return cb(null, rounds);
+      }).reverse();
 
-      });
+      return cb(null, rounds);
+
+    });
 
   };
 
@@ -444,43 +450,49 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
-    self
-      .find({
-        'deleted': { $ne: true },
-        'organization': { $in: orgIds }
-      })
-      .populate('organization', 'name logoUrl')
-      .populate('people.person', 'name avatarUrl')
-      .populate('vehicles.fund')
-      .populate({
+    var query = self.find({
+      'deleted': { $ne: true },
+      'organization': { $in: orgIds }
+    });
+    query.populate('organization', 'name logoUrl');
+    query.populate('people.person', 'name avatarUrl');
+    query.populate('vehicles.fund');
+
+    if (config.CUSTOMER_ID == 'GLOBAL_PROCESS') {
+      query.populate('vehicles.investments');
+    }
+    else {
+      query.populate({
         path: 'vehicles.investments',
         match: { customer: config.CUSTOMER_ID }
-      })
-      .exec(function(err, rounds) {
+      });
+    }
 
-        if (err) return cb(err, null);
-        if (!rounds || rounds.length == 0) return cb(null, []);
+    query.exec(function(err, rounds) {
 
-        var error = checkForUnpopulatedData(rounds, 'Round.getByOrgs');
-        if (error) return cb(error, null);
+      if (err) return cb(err, null);
+      if (!rounds || rounds.length == 0) return cb(null, []);
 
-        // reverse chronological
-        rounds = _.sortBy(rounds, function(r) {
+      var error = checkForUnpopulatedData(rounds, 'Round.getByOrgs');
+      if (error) return cb(error, null);
 
-          var date = r.closingDate;
+      // reverse chronological
+      rounds = _.sortBy(rounds, function(r) {
 
-          // use investment date in absence of closing date
-          if (!date && r.vehicles.length && r.vehicles[0].investments.length) {
-            date = r.vehicles[0].investments[0].investmentDate;
-          }
+        var date = r.closingDate;
 
-          return date;
+        // use investment date in absence of closing date
+        if (!date && r.vehicles.length && r.vehicles[0].investments.length) {
+          date = r.vehicles[0].investments[0].investmentDate;
+        }
 
-        }).reverse();
+        return date;
 
-        return cb(null, rounds);
+      }).reverse();
 
-      });
+      return cb(null, rounds);
+
+    });
 
   };
 
@@ -530,26 +542,32 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
-    self
-      .find({ 'vehicles.fund': fundId })
-      .select('organization vehicles preMoneyValuation')
-      .populate('organization', 'name logoUrl description contact industries status ipo closed acquired operating')
-      .populate('vehicles.fund')
-      .populate({
+    var query = self.find({ 'vehicles.fund': fundId });
+    query.select('organization vehicles preMoneyValuation');
+    query.populate('organization', 'name logoUrl description contact industries status ipo closed acquired operating');
+    query.populate('vehicles.fund');
+
+    if (config.CUSTOMER_ID == 'GLOBAL_PROCESS') {
+      query.populate('vehicles.investments');
+    }
+    else {
+      query.populate({
         path: 'vehicles.investments',
         match: { customer: config.CUSTOMER_ID }
-      })
-      .exec(function(err, rounds) {
+      });
+    }
 
-        if (err) return cb(err, null);
-        if (!rounds || rounds.length == 0) return cb(null, []);
+    query.exec(function(err, rounds) {
 
-        var error = checkForUnpopulatedData(rounds, 'Round.getPortfolioByFund');
-        if (error) return cb(error, null);
+      if (err) return cb(err, null);
+      if (!rounds || rounds.length == 0) return cb(null, []);
 
-        return cb(null, buildPortfolio(rounds, [fundId]));
+      var error = checkForUnpopulatedData(rounds, 'Round.getPortfolioByFund');
+      if (error) return cb(error, null);
 
-      });
+      return cb(null, buildPortfolio(rounds, [fundId]));
+
+    });
 
   };
 
@@ -560,26 +578,32 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
-    self
-      .find({ 'vehicles.fund': { $in: fundIds } })
-      .select('organization vehicles preMoneyValuation')
-      .populate('organization', 'name logoUrl description contact industries status ipo closed acquired operating')
-      .populate('vehicles.fund')
-      .populate({
+    var query = self.find({ 'vehicles.fund': { $in: fundIds } });
+    query.select('organization vehicles preMoneyValuation');
+    query.populate('organization', 'name logoUrl description contact industries status ipo closed acquired operating');
+    query.populate('vehicles.fund');
+
+    if (config.CUSTOMER_ID == 'GLOBAL_PROCESS') {
+      query.populate('vehicles.investments');
+    }
+    else {
+      query.populate({
         path: 'vehicles.investments',
         match: { customer: config.CUSTOMER_ID }
-      })
-      .exec(function(err, rounds) {
+      });
+    }
 
-        if (err) return cb(err, null);
-        if (!rounds || rounds.length == 0) return cb(null, []);
+    query.exec(function(err, rounds) {
 
-        var error = checkForUnpopulatedData(rounds, 'Round.getPortfolioByFunds');
-        if (error) return cb(error, null);
+      if (err) return cb(err, null);
+      if (!rounds || rounds.length == 0) return cb(null, []);
 
-        return cb(null, buildPortfolio(rounds, fundIds));
+      var error = checkForUnpopulatedData(rounds, 'Round.getPortfolioByFunds');
+      if (error) return cb(error, null);
 
-      });
+      return cb(null, buildPortfolio(rounds, fundIds));
+
+    });
 
   };
 

package/package.json

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