@dhyasama/totem-models 1.16.0 → 1.17.1

package/lib/Investment.js

@@ -77,6 +77,26 @@ module.exports = function(mongoose, config) {
 
 
 
+  ///////////////////////////////////////////////////////////////////////////////////////
+  // VIRTUALS
+  // Properties that are not persisted to the database
+  ///////////////////////////////////////////////////////////////////////////////////////
+
+  Investment.virtual('month').get(function () {
+    var self = this;
+    var monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+    if (!self.investmentDate) return 'Unknown';
+    else return monthNames[self.investmentDate.getMonth()];
+  });
+
+  Investment.virtual('year').get(function () {
+    var self = this;
+    if (!self.investmentDate) return 'Unknown';
+    else return self.investmentDate.getFullYear();
+  });
+
+
+
   //////////////////////////////////////////////////////
   // STATICS
   // Statics operate on the entire collection

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

@@ -408,7 +408,6 @@ module.exports = function(mongoose, config) {
       .populate('organization', 'name logoUrl')
       .populate('people.person', 'name avatarUrl title')
       .populate('vehicles.fund', 'name shortName')
-      .populate('vehicles.investments')
       .populate({
         path: 'vehicles.investments',
         match: { customer: config.CUSTOMER_ID }
@@ -453,7 +452,10 @@ module.exports = function(mongoose, config) {
       .populate('organization', 'name logoUrl')
       .populate('people.person', 'name avatarUrl')
       .populate('vehicles.fund')
-      .populate('vehicles.investments')
+      .populate({
+        path: 'vehicles.investments',
+        match: { customer: config.CUSTOMER_ID }
+      })
       .exec(function(err, rounds) {
 
         if (err) return cb(err, null);
@@ -533,7 +535,10 @@ module.exports = function(mongoose, config) {
       .select('organization vehicles preMoneyValuation')
       .populate('organization', 'name logoUrl description contact industries status ipo closed acquired operating')
       .populate('vehicles.fund')
-      .populate('vehicles.investments')
+      .populate({
+        path: 'vehicles.investments',
+        match: { customer: config.CUSTOMER_ID }
+      })
       .exec(function(err, rounds) {
 
         if (err) return cb(err, null);
@@ -560,7 +565,10 @@ module.exports = function(mongoose, config) {
       .select('organization vehicles preMoneyValuation')
       .populate('organization', 'name logoUrl description contact industries status ipo closed acquired operating')
       .populate('vehicles.fund')
-      .populate('vehicles.investments')
+      .populate({
+        path: 'vehicles.investments',
+        match: { customer: config.CUSTOMER_ID }
+      })
       .exec(function(err, rounds) {
 
         if (err) return cb(err, null);

package/package.json

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