@dhyasama/totem-models 9.6.0 → 9.9.0

package/lib/CapTable.js

@@ -134,129 +134,178 @@ module.exports = function(mongoose, config) {
   // Statics operate on the entire collection
   //////////////////////////////////////////////////////
 
-  CapTable.statics.getForCustomer = function getForCustomer(options, cb) {
+  CapTable.statics.getForCustomer = function getForCustomer(customerid, options, cb) {
 
     var self = this;
 
     if (!cb) { throw new Error('cb is required'); }
+    if (!customerid) { return cb(new Error('customerid is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(customerid)) { return cb(new Error('customerid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
-
+    
     var query;
 
     query = self.find({
-      customer: options.CUSTOMER_ID,
+      customer: customerid,
     });
 
     query.populate('organization', 'name logoUrl');
-
-    if(options.populateStakeholders) {
-      query.populate('stakeholders.lp', 'name')
-      query.populate('stakeholders.org', 'name logoUrl')
-      query.populate('stakeholders.person', 'name avatarUrl title')
-    }
+    query.populate('stakeholders.lp', 'name')
+    query.populate('stakeholders.org', 'name logoUrl')
+    query.populate('stakeholders.person', 'name avatarUrl title')
     
     query.exec(cb);
 
   };
 
-  CapTable.statics.deleteForCustomer = function deleteForCustomer(options, cb) {
+  CapTable.statics.deleteForCustomer = function deleteForCustomer(customerid, options, cb) {
 
     var self = this;
 
     if (!cb) { throw new Error('cb is required'); }
+    if (!customerid) { return cb(new Error('customerid is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(customerid)) { return cb(new Error('customerid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
-
-    self.remove({ customer: options.CUSTOMER_ID, 'entered.by': { $ne: 'carta-parser' } }, cb);
+    
+    self.remove({ customer: customerid, 'entered.by': { $ne: 'carta-parser' } }, cb);
 
   };
 
-  CapTable.statics.getForOrg = function getForOrg(options, cb) {
+  CapTable.statics.getForOrg = function getForOrg(orgid, options, cb) {
 
     var self = this;
 
     if (!cb) { throw new Error('cb is required'); }
+    if (!orgid) { return cb(new Error('orgid is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(orgid)) { return cb(new Error('orgid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
-
+    
     var query;
 
-    query = self.find({
-      customer: options.CUSTOMER_ID,
-      organization: options.orgId
-    });
+    if (options.isWorkerProcess) {
+      query = self.find({
+        organization: orgid
+      });
+    }
 
-    query.populate('organization', 'name logoUrl');
+    else {
+    
+      if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+      if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+    
+      query = self.findOne({
+        customer: options.CUSTOMER_ID,
+        organization: orgid
+      });
 
-    if(options.populateStakeholders) {
-      query.populate('stakeholders.lp', 'name')
-      query.populate('stakeholders.org', 'name logoUrl')
-      query.populate('stakeholders.person', 'name avatarUrl title')
     }
 
+    query.populate('organization', 'name logoUrl');
+    query.populate('stakeholders.lp', 'name')
+    query.populate('stakeholders.org', 'name logoUrl')
+    query.populate('stakeholders.person', 'name avatarUrl title')
+
+    query.exec(cb);
+
   };
 
-  CapTable.statics.getByLP = function getByLP(options, cb) {
+  CapTable.statics.getByLP = function getByLP(lpid, options, cb) {
 
     var self = this;
 
     if (!cb) { throw new Error('cb is required'); }
+    if (!lpid) { return cb(new Error('lpid is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(lpid)) { return cb(new Error('lpid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+    
+    if (options.isWorkerProcess) {
+      query = self.find({
+        'stakeholders.lp': lpid
+      });
+    }
 
-    query = self.find({
-      customer: options.CUSTOMER_ID,
-      'stakeholders.lp': options.lpId
-    });
+    else {
+
+      if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+      if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+    
+      query = self.find({
+        customer: options.CUSTOMER_ID,
+        'stakeholders.lp': lpid
+      });
 
-    self
-      .populate('organization', 'name logoUrl')
-      .exec(cb);
+    }
+
+    query.populate('organization', 'name logoUrl')
+    query.exec(cb);
 
   };
 
-  CapTable.statics.getByOrg = function getByOrg(options, cb) {
+  CapTable.statics.getByOrg = function getByOrg(orgid, options, cb) {
 
     var self = this;
 
     if (!cb) { throw new Error('cb is required'); }
+    if (!orgid) { return cb(new Error('orgid is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(orgid)) { return cb(new Error('orgid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+    
+    var query;
 
-    query = self.find({
-      customer: options.CUSTOMER_ID,
-      'stakeholders.org': options.orgId
-    });
+    if (options.isWorkerProcess) {
+      query = self.find({
+        'stakeholders.org': orgid
+      });
+    }
+
+    else {
 
-    self
-      .populate('organization', 'name logoUrl')
-      .exec(cb);
+      if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+      if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+    
+      query = self.find({
+        customer: options.CUSTOMER_ID,
+        'stakeholders.org': orgid
+      });
+
+    }
+
+    query.populate('organization', 'name logoUrl')
+    query.exec(cb);
 
   };
 
-  CapTable.statics.getByPerson = function getByPerson(options, cb) {
+  CapTable.statics.getByPerson = function getByPerson(personid, options, cb) {
 
     var self = this;
 
     if (!cb) { throw new Error('cb is required'); }
+    if (!personid) { return cb(new Error('personid is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(personid)) { return cb(new Error('personid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+    
+    var query;
 
-    query = self.find({
-      customer: options.CUSTOMER_ID,
-      'stakeholders.person': options.personId
-    });
+    if (options.isWorkerProcess) {
+      query = self.find({
+        'stakeholders.person': personid
+      });
+    }
+
+    else {
 
-    self
-      .populate('organization', 'name logoUrl')
-      .exec(cb);
+      if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+      if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+    
+      query = self.find({
+        customer: options.CUSTOMER_ID,
+        'stakeholders.person': personid
+      });
+
+    }
+
+    query.populate('organization', 'name logoUrl')
+    query.exec(cb);
 
   };
 
@@ -267,7 +316,7 @@ module.exports = function(mongoose, config) {
     if (!capTable) { return cb(new Error('capTable is required'), null); }
     if (!username) { return cb(new Error('username is required'), null); }
 
-    capTable.constructor.getForCustomer(capTable.organization, capTable.customer, function(err, result) {
+    capTable.constructor.getForOrg(capTable.organization, { CUSTOMER_ID: capTable.customer }, function(err, result) {
 
       if (err) return cb(err, null);
       if (result) return cb(new Error('A cap table already exists for this customer/org combo'), null);

package/package.json

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