@dhyasama/totem-models 1.27.0 → 1.28.0

package/lib/LimitedPartner.js

@@ -19,16 +19,7 @@ module.exports = function(mongoose, config) {
     async = require('async'),
     utils = require('@dhyasama/ffvc-utilities');
 
-  var getFundIdsForOrg = function(id, cb) {
-    Organization.getById(id, function(err, org) {
-      if (err) return cb(err, null);
-      else if (!org) return cb(null, null);
-      var fundIds = _.map(org.funds, function(fund) {
-        return mongoose.Types.ObjectId.isValid(fund) || fund._id;
-      });
-      return cb(null, fundIds);
-    });
-  };
+  var customerFunds = [];
 
   var LimitedPartner = new Schema({
 
@@ -407,11 +398,8 @@ module.exports = function(mongoose, config) {
       getLp();
     }
     else {
-      getFundIdsForOrg(CUSTOMER_ID, function(err, fundIds) {
-        if (err) return cb(err, null);
-        query = self.findOne({ '_id': id, 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
-        getLp();
-      });
+      query = self.findOne({ '_id': id, 'fundsInvested.fund': { $in : self.customerFunds }}, self.getReadFilterKeys(role));
+      getLp();
     }
 
   };
@@ -422,11 +410,13 @@ module.exports = function(mongoose, config) {
     var query;
 
     var getLps = function(q) {
+      console.time('getLps');
       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() : ''; });
+        console.timeEnd('getLps');
         return cb(null, lps);
       });
     };
@@ -436,11 +426,8 @@ module.exports = function(mongoose, config) {
       getLps(query);
     }
     else {
-      getFundIdsForOrg(CUSTOMER_ID, function(err, fundIds) {
-        if (err) return cb(err, null);
-        query = self.find({'people': personId, 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
-        getLps(query);
-      });
+      query = self.find({'people': personId, 'fundsInvested.fund': { $in : self.customerFunds }}, self.getReadFilterKeys(role));
+      getLps(query);
     }
 
   };
@@ -515,11 +502,8 @@ module.exports = function(mongoose, config) {
       getLps(query);
     }
     else {
-      getFundIdsForOrg(CUSTOMER_ID, function(err, fundIds) {
-        if (err) return cb(err, null);
-        query = self.find({ 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
-        getLps(query);
-      });
+      query = self.find({ 'fundsInvested.fund': { $in : self.customerFunds }}, self.getReadFilterKeys(role));
+      getLps(query);
     }
 
   };
@@ -541,11 +525,8 @@ module.exports = function(mongoose, config) {
       });
     };
 
-    getFundIdsForOrg(orgid, function(err, fundIds) {
-      if (err) return cb(err, null);
-      query = self.find({ 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
-      getLps(query);
-    });
+    query = self.find({ 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
+    getLps(query);
 
   };
 
@@ -643,15 +624,18 @@ module.exports = function(mongoose, config) {
       getLps();
     }
     else {
-      getFundIdsForOrg(CUSTOMER_ID, function(err, fundIds) {
-        if (err) return cb(err, null);
-        query = self.find({ 'name': new RegExp(terms, "i"), 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
-        getLps();
-      });
+      query = self.find({ 'name': new RegExp(terms, "i"), 'fundsInvested.fund': { $in : self.customerFunds }}, self.getReadFilterKeys(role));
+      getLps();
     }
 
   };
 
+  LimitedPartner.statics.setCustomerFunds = function setCustomerFunds(fundids) {
+    var self = this;
+    self.customerFunds = fundids;
+    return self.customerFunds;
+  };
+
   LimitedPartner.statics.upsert = function(lp, username, role, cb) {
 
     if (!lp) { return cb(new Error('lp is required'), null); }

package/lib/Organization.js

@@ -804,7 +804,7 @@ module.exports = function(mongoose, config) {
 
     self
       .findById(id)
-      .populate('people.person', 'name avatarUrl title doNotDisplay calendarEventSummaries sources')
+      .populate('people.person', 'name avatarUrl title doNotDisplay')
       .populate('related', 'name logoUrl')
       .populate('chairs.first', 'name avatarUrl title')
       .populate('chairs.second', 'name avatarUrl title')
@@ -812,19 +812,6 @@ module.exports = function(mongoose, config) {
       .populate('operating.acquired.public.by', 'name logoUrl')
       .populate('operating.acquired.private.by', 'name logoUrl')
       .populate(lpPopulateOptions)
-      .deepPopulate([
-        'people.person.sources.person',
-        'people.person.calendarEventSummaries.attendees.internal',
-        'people.person.calendarEventSummaries.attendees.external',
-        'people.person.calendarEventSummaries.notes.createdBy'
-      ], {
-        populate: {
-          'people.person.sources.person': { select: 'name avatarUrl title doNotDisplay' },
-          'people.person.calendarEventSummaries.attendees.internal': { select: 'name avatarUrl title doNotDisplay' },
-          'people.person.calendarEventSummaries.attendees.external': { select: 'name avatarUrl title doNotDisplay' },
-          'people.person.calendarEventSummaries.notes.createdBy': { select: 'name avatarUrl title doNotDisplay' }
-        }
-      })
       .exec(cb);
 
   };
@@ -867,6 +854,40 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Organization.statics.getInteractions = function getInteractions(orgid, cb) {
+
+    var self = this;
+
+    self
+      .findById(orgid)
+      .populate('people.person', 'name avatarUrl title doNotDisplay calendarEventSummaries')
+      .deepPopulate([
+        'people.person.calendarEventSummaries.attendees.internal',
+        'people.person.calendarEventSummaries.attendees.external',
+        'people.person.calendarEventSummaries.notes.createdBy'
+      ], {
+        populate: {
+          'people.person.calendarEventSummaries.attendees.internal': { select: 'name avatarUrl title doNotDisplay' },
+          'people.person.calendarEventSummaries.attendees.external': { select: 'name avatarUrl title doNotDisplay' },
+          'people.person.calendarEventSummaries.notes.createdBy': { select: 'name avatarUrl title doNotDisplay' }
+        }
+      })
+      .exec(cb);
+
+  };
+
+  Organization.statics.getList = function getList(cb) {
+
+    var self = this;
+
+    self
+      .find()
+      .select('name website websiteAliases')
+      .lean()
+      .exec(cb);
+
+  };
+
   Organization.statics.getLpOrgs = function getLpOrgs(lpids, cb) {
     var self = this;
     self
@@ -907,7 +928,8 @@ module.exports = function(mongoose, config) {
 
     self
       .findById(id)
-      .populate('people.person', 'name avatarUrl title doNotDisplay calendarEventSummaries sources')
+      .select('people')
+      .populate('people.person', 'name avatarUrl title doNotDisplay sources')
       .deepPopulate([
         'people.person.sources.person'
       ], {

package/package.json

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