@dhyasama/totem-models 6.33.2 → 6.34.0

package/lib/Account.js

@@ -127,6 +127,12 @@ module.exports = function(mongoose, config) {
       .exec(cb);
   };
 
+  Account.statics.getForCustomer = function (customerId, cb) {
+    this
+      .find({ 'org': customerId })
+      .exec(cb);
+  };
+
   Account.statics.listGoogleAccounts = function(cb) {
 
     this

package/lib/Deal.js

@@ -147,7 +147,7 @@ module.exports = function(mongoose, config) {
         '_id': id,
         'customer': config.CUSTOMER_ID
       })
-      .populate('organization', 'name logoUrl website websiteAliases')
+      .populate('organization', 'name description logoUrl website websiteAliases chairs')
       .populate('messages')
       .populate('source.person', 'name avatarUrl title')
       .populate('referrer.person', 'name avatarUrl title')
@@ -157,7 +157,6 @@ module.exports = function(mongoose, config) {
       })
       .populate('history.account', 'person')
       .exec(cb);
-
   };
 
   Deal.statics.getByIds = function (ids, cb) {
@@ -171,25 +170,7 @@ module.exports = function(mongoose, config) {
         path: 'documents',
         match: { customer: config.CUSTOMER_ID }
       })
-      .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) {
-          var func = function(callback) {
-            deal.deepPopulate('organization.chairs.first', {
-              populate: { 'organization.chairs.first': { select: 'name avatarUrl title doNotDisplay' } }
-            }, callback);
-          };
-          calls.push(func);
-        });
-
-        async.parallel(calls, cb);
-
-      });
+      .exec(cb);
   };
 
   // Get all deals belonging to a customer
@@ -218,33 +199,7 @@ module.exports = function(mongoose, config) {
       .populate({
         path: 'documents',
         match: { customer: customerId }
-      })
-      // .deepPopulate([
-      //   'organization.chairs.first'
-      // ], {
-      //   populate: {
-      //     'organization.chairs.first': { select: 'name avatarUrl title doNotDisplay' }
-      //   }
-      // })
-      .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) {
-          var func = function(callback) {
-            deal.deepPopulate('organization.chairs.first', {
-              populate: { 'organization.chairs.first': { select: 'name avatarUrl title doNotDisplay' } }
-            }, callback);
-          };
-          calls.push(func);
-        });
-
-        async.parallel(calls, cb);
-
-      });
+      }).exec(cb);
 
   };
 
@@ -280,14 +235,7 @@ module.exports = function(mongoose, config) {
         path: 'documents',
         match: { customer: config.CUSTOMER_ID }
       })
-      .exec(function(err, deal) {
-        if(deal && deal.history) {
-          deal.deepPopulate('history.account.person', {
-            populate: { 'history.account.person': { select: 'name avatarUrl title doNotDisplay' } }
-          }, cb);
-        }
-        else cb(err, deal);
-      });
+      .exec(cb);
   };
 
   Deal.statics.modifyById = function(id, update, cb) {

package/package.json

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

package/test/Account.js

@@ -10,11 +10,12 @@ var
   Crypto = require('@dhyasama/ffvc-crypto'),
   crypto = new Crypto({'key': config.crypto.key}),
   Account = mongoose.model('Account'),
+  Organization = mongoose.model('Organization'),
   Person = mongoose.model('Person'),
   person = new Person();
 
 var accountid;
-
+var customer;
 
 describe('Account', function() {
 
@@ -27,6 +28,23 @@ describe('Account', function() {
     clearDB(done);
   });
 
+  before(function(done) {
+
+    customer = new Organization();
+    customer.name = 'Fudgesicle';
+    customer.slug = 'fudgesicle';
+    customer.website = 'yum.io';
+    customer.deleted = false;
+    customer.aliases.push('sicle');
+    customer.crunchbase.uuid = 'jkl';
+    customer.crunchbase.url = 'jkl';
+
+    Organization.upsert(customer, 'test-user', function (err, no5) {
+      done();
+    });
+
+  });
+
   it('creates an account', function(done) {
 
     person.name.first = 'George';
@@ -48,6 +66,7 @@ describe('Account', function() {
         account.email = 'test@totemvc.com';
         account.person = newPerson;
         account.active = true;
+        account.customer = customer;
 
         Account.upsert(account, function(err, updatedAccount) {
           should.not.exist(err);
@@ -113,4 +132,14 @@ describe('Account', function() {
 
   });
 
+  it('lists accounts for customer', function(done) {
+
+    Account.getForCustomer(customer._id, function(err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      done();
+    });
+
+  });
+
 });