@dhyasama/totem-models 12.0.0 → 12.1.0

package/lib/Deal.js

@@ -843,9 +843,6 @@ module.exports = function(mongoose, config) {
   Deal.set('autoIndex', false);
   Deal.on('index', function(err) { console.log('error building deal indexes: ' + err); });
 
-  const deepPopulate = require('mongoose-deep-populate')(mongoose);
-  Deal.plugin(deepPopulate);
-
   mongoose.model('Deal', Deal);
 
 };

package/lib/Interaction.js

@@ -399,9 +399,6 @@ module.exports = function(mongoose, config) {
   Interaction.set('autoIndex', false);
   Interaction.on('index', function(err) { console.log('error building interaction indexes: ' + err); });
 
-  var deepPopulate = require('mongoose-deep-populate')(mongoose);
-  Interaction.plugin(deepPopulate);
-
   mongoose.model('Interaction', Interaction);
 
 };

package/lib/LimitedPartner.js

@@ -375,23 +375,17 @@ module.exports = function(mongoose, config) {
     }
 
     query.populate('transactions.fund');
-    query.populate('people');
+    query.populate({
+      path: 'people',
+      populate: { path: 'sources.person', select: 'name avatarUrl title' }
+    });
     query.populate({
       path: 'notes',
-      match: { customer: options.CUSTOMER_ID }
+      match: { customer: options.CUSTOMER_ID },
+      populate: { path: 'createdBy', select: 'name avatarUrl' }
     });
     query.populate('documents');
 
-    query.deepPopulate([
-      'people.sources.person',
-      'notes.createdBy'
-    ], {
-      populate: {
-        'people.sources.person': { select: 'name avatarUrl title' },
-        'notes.createdBy': { select: 'name avatarUrl' }
-      }
-    });
-
     query.exec().then(function(lp) {
       if (!lp) { return cb(null, null); }
 
@@ -526,14 +520,8 @@ module.exports = function(mongoose, config) {
     query.populate({
       path: 'notes',
       match: { customer: options.CUSTOMER_ID },
-      options: { sort: { createdOn: -1 } }
-    });
-    query.deepPopulate([
-      'notes.createdBy'
-    ], {
-      populate: {
-        'notes.createdBy': { select: 'name avatarUrl title' }
-      }
+      options: { sort: { createdOn: -1 } },
+      populate: { path: 'createdBy', select: 'name avatarUrl title' }
     });
 
     query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
@@ -553,13 +541,10 @@ module.exports = function(mongoose, config) {
 
     let query = self.findById(lpid);
 
-    query.populate('people', 'name avatarUrl title doNotDisplay sources');
-    query.deepPopulate([
-      'people.sources.person'
-    ], {
-      populate: {
-        'people.sources.person': { select: 'name avatarUrl title doNotDisplay' }
-      }
+    query.populate({
+      path: 'people',
+      select: 'name avatarUrl title doNotDisplay sources',
+      populate: { path: 'sources.person', select: 'name avatarUrl title doNotDisplay' }
     });
 
     query.exec().then(function(lp) {if (!lp) { return cb(null, null); }
@@ -888,9 +873,6 @@ module.exports = function(mongoose, config) {
 
   LimitedPartner.set('toJSON', { virtuals: true });
 
-  let deepPopulate = require('mongoose-deep-populate')(mongoose);
-  LimitedPartner.plugin(deepPopulate);
-
   mongoose.model('LimitedPartner', LimitedPartner);
 
 };

package/lib/Message.js

@@ -96,14 +96,8 @@ module.exports = function(mongoose, config) {
     query.where({'attendees.external': { $in : personIds }});
     query.populate({
       path: 'documents',
-      match: { customer: options.CUSTOMER_ID }
-    });
-    query.deepPopulate([
-      'documents.createdBy'
-    ], {
-      populate: {
-        'documents.createdBy': { select: 'name avatarUrl title' }
-      }
+      match: { customer: options.CUSTOMER_ID },
+      populate: { path: 'createdBy', select: 'name avatarUrl title' }
     });
 
     query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
@@ -181,14 +175,8 @@ module.exports = function(mongoose, config) {
     query.populate('recipients.external', 'name title avatarUrl doNotDisplay');
     query.populate({
       path: 'documents',
-      match: { customer: options.CUSTOMER_ID }
-    });
-    query.deepPopulate([
-      'documents.createdBy'
-    ], {
-      populate: {
-        'documents.createdBy': { select: 'name avatarUrl title' }
-      }
+      match: { customer: options.CUSTOMER_ID },
+      populate: { path: 'createdBy', select: 'name avatarUrl title' }
     });
 
     query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
@@ -312,14 +300,8 @@ module.exports = function(mongoose, config) {
     query.populate('recipients.external', 'name title avatarUrl doNotDisplay');
     query.populate({
       path: 'documents',
-      match: { customer: options.CUSTOMER_ID }
-    });
-    query.deepPopulate([
-      'documents.createdBy'
-    ], {
-      populate: {
-        'documents.createdBy': { select: 'name avatarUrl title' }
-      }
+      match: { customer: options.CUSTOMER_ID },
+      populate: { path: 'createdBy', select: 'name avatarUrl title' }
     });
 
     query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
@@ -418,9 +400,6 @@ module.exports = function(mongoose, config) {
   Message.set('autoIndex', false);
   Message.set('toJSON', { virtuals: true });
 
-  let deepPopulate = require('mongoose-deep-populate')(mongoose);
-  Message.plugin(deepPopulate);
-
   mongoose.model('Message', Message);
 
 };

package/lib/Organization.js

@@ -1168,24 +1168,20 @@ module.exports = function(mongoose, config) {
 
     self
       .find({ '_id': { $in : ids }})
-      .populate('people.person', 'name avatarUrl title doNotDisplay calendarEventSummaries sources')
+      .populate({
+        path: 'people.person',
+        select: 'name avatarUrl title doNotDisplay calendarEventSummaries sources',
+        populate: [
+          { path: 'sources.person', select: 'name avatarUrl title doNotDisplay' },
+          { path: 'calendarEventSummaries.attendees.internal', select: 'name avatarUrl title doNotDisplay' },
+          { path: 'calendarEventSummaries.attendees.external', select: 'name avatarUrl title doNotDisplay' },
+          { path: 'calendarEventSummaries.notes', populate: { path: 'createdBy', select: 'name avatarUrl title doNotDisplay' } }
+        ]
+      })
       .populate('related', 'name logoUrl')
       .populate('chairs.first', 'name avatarUrl title')
       .populate('chairs.second', 'name avatarUrl title')
       .populate('funds', 'name hexColorCode abbreviation')
-      .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().then(function(orgs) {
       if (!orgs) { return cb(null, []); }
 
@@ -1502,27 +1498,16 @@ module.exports = function(mongoose, config) {
     query.populate('operating.acquired.private.by', 'name logoUrl');
     query.populate('operating.merged.public.with', 'name logoUrl');
     query.populate('operating.merged.private.with', 'name logoUrl');
+    dealPopulateOptions.populate = [
+      { path: 'source.person' },
+      { path: 'history.account' }
+    ];
     query.populate(dealPopulateOptions);
+    query.populate('documents');
 
     if (options.role !== 'none') {
+      lpPopulateOptions.populate = { path: 'transactions.fund', select: 'shortName' };
       query.populate(lpPopulateOptions);
-      query.deepPopulate([
-        'deals.sources.person',
-        'documents',
-        'history.account',
-        'lps.fundsInvested.fund'
-      ], {
-        populate: {
-          'lps.fundsInvested.fund': { select: 'shortName' }
-        }
-      })
-    }
-    else {
-      query.deepPopulate([
-        'deals.sources.person',
-        'documents',
-        'history.account'
-      ]);
     }
 
     query.exec().then(function(result) {if (options.isWorkerProcess) { return cb(null, result); }
@@ -1783,20 +1768,19 @@ module.exports = function(mongoose, config) {
     let query = self.findById(orgid);
 
     query.select('notes people.person');
-    query.populate('people.person', 'name avatarUrl title calendarEventSummaries');
     query.populate({
-      path: 'notes',
-      match: { customer: options.CUSTOMER_ID }
-    });
-    query.deepPopulate([
-      'notes.createdBy',
-      'people.person.calendarEventSummaries.notes.createdBy'
-    ], {
+      path: 'people.person',
+      select: 'name avatarUrl title calendarEventSummaries',
       populate: {
-        'notes.createdBy': { select: 'name avatarUrl title' },
-        'people.person.calendarEventSummaries.notes.createdBy': { select: 'name avatarUrl title' }
+        path: 'calendarEventSummaries.notes',
+        populate: { path: 'createdBy', select: 'name avatarUrl title' }
       }
     });
+    query.populate({
+      path: 'notes',
+      match: { customer: options.CUSTOMER_ID },
+      populate: { path: 'createdBy', select: 'name avatarUrl title' }
+    });
     query.sort({'createdOn':-1});
 
     query.exec().then(function(org) {
@@ -1823,13 +1807,10 @@ module.exports = function(mongoose, config) {
 
     let query = self.findById(id);
     query.select('people');
-    query.populate('people.person', 'name avatarUrl title doNotDisplay sources');
-    query.deepPopulate([
-      'people.person.sources.person'
-    ], {
-      populate: {
-        'people.person.sources.person': { select: 'name avatarUrl title doNotDisplay' }
-      }
+    query.populate({
+      path: 'people.person',
+      select: 'name avatarUrl title doNotDisplay sources',
+      populate: { path: 'sources.person', select: 'name avatarUrl title doNotDisplay' }
     });
 
     // get the org requested
@@ -2449,9 +2430,6 @@ module.exports = function(mongoose, config) {
   Organization.index({ website: 1,  websiteAliases: 1 }, { unique: true, partialFilterExpression : { type :"string" } });
   Organization.on('index', function(err) { console.log('error building organization_new indexes: ' + err); });
 
-  var deepPopulate = require('mongoose-deep-populate')(mongoose);
-  Organization.plugin(deepPopulate);
-
   mongoose.model('Organization', Organization, 'organizations');
 
 };

package/lib/Person.js

@@ -505,14 +505,8 @@ module.exports = function(mongoose, config) {
     query.select('notes');
     query.populate({
       path: 'notes',
-      match: { customer: options.CUSTOMER_ID }
-    });
-    query.deepPopulate([
-      'notes.createdBy'
-    ], {
-      populate: {
-        'notes.createdBy': { select: 'name avatarUrl title' }
-      }
+      match: { customer: options.CUSTOMER_ID },
+      populate: { path: 'createdBy', select: 'name avatarUrl title' }
     });
     query.sort({'createdOn':-1});
 
@@ -1167,9 +1161,6 @@ module.exports = function(mongoose, config) {
 
   });
 
-  let deepPopulate = require('mongoose-deep-populate')(mongoose);
-  Person.plugin(deepPopulate);
-
   Person.set('autoIndex', false);
   Person.on('index', function(err) { console.log('error building person indexes: ' + err); });
   Person.set('toJSON', { virtuals: true });

package/lib/Round.js

@@ -643,15 +643,13 @@ module.exports = function(mongoose, config) {
     let query = self.find({ 'vehicles.fund': { $in: fundIds } });
 
     query.select('organization vehicles');
-    query.populate('organization', 'name aliases slug logoUrl description contact chairs filters status ipo closed acquired operating website websiteAliases');
-    query.deepPopulate([
-      'organization.chairs.first',
-      'organization.chairs.second',
-    ], {
-      populate: {
-        'organization.chairs.first': { select: 'name avatarUrl title doNotDisplay' },
-        'organization.chairs.second': { select: 'name avatarUrl title doNotDisplay' },
-      }
+    query.populate({
+      path: 'organization',
+      select: 'name aliases slug logoUrl description contact chairs filters status ipo closed acquired operating website websiteAliases',
+      populate: [
+        { path: 'chairs.first', select: 'name avatarUrl title doNotDisplay' },
+        { path: 'chairs.second', select: 'name avatarUrl title doNotDisplay' }
+      ]
     });
     query.populate('vehicles.fund');
 
@@ -970,9 +968,6 @@ module.exports = function(mongoose, config) {
   Round.index({ organization: 1,  roundName: 1 }, { unique: true, partialFilterExpression : { type :"string" } });
   Round.on('index', function(err) { console.log('error building Round indexes: ' + err); });
 
-  var deepPopulate = require('mongoose-deep-populate')(mongoose);
-  Round.plugin(deepPopulate);
-
   mongoose.model('Round', Round);
 
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "12.0.0",
+  "version": "12.1.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -21,7 +21,6 @@
     "awesome-phonenumber": "^1.0.14",
     "escape-string-regexp": "^1.0.5",
     "moment": "^2.30.1",
-    "mongoose-deep-populate": "^3.2.0",
     "range_check": "^1.4.0",
     "underscore": "^1.13.6",
     "validator": "^13.11.0"