@dhyasama/totem-models 5.3.1 → 5.3.3

package/.npmignore

@@ -0,0 +1,14 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+npm-debug.log
+node_modules
+
+.DS_Store
+.idea

package/lib/Deal.js

@@ -19,12 +19,12 @@ module.exports = function(mongoose, config) {
 
     sources: [{
       person: { type: Schema.ObjectId, ref: 'Person', required: true },
-      type: { type: String, enum: ['inbound', 'outbound', 'event', 'referral', 'other'], required: true }
+      type: { type: String, enum: ['Inbound', 'Outbound', 'Event', 'Referral', 'Other'], required: true }
     }],
 
     referrers: [{
       person: { type: Schema.ObjectId, ref: 'Person', required: true },
-      type: { type: String, enum: ['founder', 'investor', 'service-provider', 'friends-and-family', 'limited-partner', 'other'], required: true }
+      type: { type: String, enum: ['Founder', 'Investor', 'Service Provider', 'Friends & Family', 'Limited Partner', 'Other'], required: true }
     }],
 
     documents: [ { type: Schema.ObjectId, ref: 'Document' } ],
@@ -118,16 +118,21 @@ module.exports = function(mongoose, config) {
   };
 
   // Get all deals belonging to a customer
-  Deal.statics.getForCustomer = function (customerId, activeCustomerStages, cb) {
-
-    var self = this;
+  Deal.statics.getForCustomer = function (customerId, options, cb) {
 
     // todo - fix deep population
     // not sure why chained deepPopulate isn't working (it throws an error)
     // it works to deepPopulate each result instance in parallel
 
+    var self = this;
+
+    options = options || {};
+
+    var terms = { 'customer': customerId };
+    if (options.stage) terms['stage'] = { $in: options.stage };
+
     self
-      .find({ 'customer': customerId,  'stage': { $in: activeCustomerStages } })
+      .find(terms)
       .populate('organization', 'name description logoUrl website websiteAliases chairs')
       .populate('messages')
       .populate('sources.person', 'name avatarUrl title')
@@ -145,6 +150,9 @@ module.exports = function(mongoose, config) {
       // })
       .exec(function(err, deals) {
 
+        if (err) return cb(err, null);
+        else if (!deals || deals.length == 0) return cb(null, []);
+
         var calls = [];
 
         _.each(deals, function(deal) {

package/lib/Organization.js

@@ -1084,6 +1084,9 @@ module.exports = function(mongoose, config) {
     var lpPopulateOptions = { path: 'lps' };
     if (config.CUSTOMER_ID != 'GLOBAL_PROCESS') lpPopulateOptions.match = { customer: config.CUSTOMER_ID };
 
+    var dealPopulateOptions = { path: 'deals' };
+    if (config.CUSTOMER_ID != 'GLOBAL_PROCESS') dealPopulateOptions.match = { customer: config.CUSTOMER_ID };
+
     var query = self.findById(id);
 
     query.populate('people.person', 'name avatarUrl title contact doNotDisplay');
@@ -1093,11 +1096,7 @@ module.exports = function(mongoose, config) {
     query.populate('funds', 'name hexColorCode abbreviation closeDate');
     query.populate('operating.acquired.public.by', 'name logoUrl');
     query.populate('operating.acquired.private.by', 'name logoUrl');
-
-    query.populate({
-      path: 'deals',
-      match: { customer: config.CUSTOMER_ID }
-    });
+    query.populate(dealPopulateOptions);
 
     if (options.role != 'none') {
       query.populate(lpPopulateOptions);