@dhyasama/totem-models 11.15.0 → 11.17.0

package/lib/Investment.js

@@ -62,15 +62,18 @@ module.exports = function(mongoose, config) {
   // Statics operate on the entire collection
   //////////////////////////////////////////////////////
 
-  Investment.statics.getByCustomer = function(customerId, options, cb) {
+  Investment.statics.getOrgIds = function(options, cb) {
 
     if (!cb) { throw new Error('cb is required'); }
     if (!options) { return cb(new Error('options is required'), null); }
-    if (!customerId) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(customerId)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+    
+    if (!options.isWorkerProcess) {
+      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 self = this;
-    var query = self.find({ customer: customerId });
+    var query = self.find({ customer: options.CUSTOMER_ID });
 
     if (options.startDate) {
       var startDate = options.startDate || moment().subtract(20, 'years').startOf('day').toISOString();
@@ -83,7 +86,7 @@ module.exports = function(mongoose, config) {
     }
 
     query.exec(function(err, investments) {
-    
+      
       if (err) return cb(err, null);
 
       Round.find({
@@ -93,41 +96,28 @@ module.exports = function(mongoose, config) {
       
         if (err) return cb(err, null);
 
-        var investmentWithRoundDetails = _.map(investments, function(inv) {
-
-          var fund = null;
+        var organizationIds = _.compact(_.map(investments, function(inv) {
           var organization = null;
-          var roundName = null;
 
           var round = _.find(rounds, function(r) {
-
             return _.some(r.vehicles, function(v) {
-
               var investmentFound = _.some(v.investments, function(investmentId) {
                 return investmentId.toString() === inv._id.toString();
               });
 
               if (investmentFound) {
-                fund = v.fund;
                 organization = r.organization;
-                roundName = r.roundName;
               }
 
               return investmentFound;
-              
             });
-
           });
 
-          return _.extend({}, inv.toObject(), {
-            organization: organization,
-            round: roundName,
-            fund: fund
-          });
-
-        });
+          return organization;
+        
+        }));
 
-        cb(null, investmentWithRoundDetails);
+        cb(null, organizationIds);
       
       });
     

package/lib/Round.js

@@ -391,6 +391,44 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Round.statics.getByOrgs2 = function getByOrg2(orgIds, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!orgIds) { throw new Error('orgIds is required'); }
+    if (!options) { return cb(new Error('options is required'), null); }
+
+    options = helpers.getDefaultOptions(options);
+
+    if (!options.isWorkerProcess) {
+      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); }
+    }
+
+    let query = self.find({
+      'organization': { $in: orgIds }
+    });
+
+    if (options.isWorkerProcess) {
+      query.populate('vehicles.investments');
+    }
+    else {
+      query.populate({
+        path: 'vehicles.investments',
+        match: { customer: options.CUSTOMER_ID }
+      });
+    }
+
+    query.exec(function(err, rounds) {
+
+      if (err) return cb(err, null);
+      return cb(null, rounds);
+
+    });
+
+  };
+
   Round.statics.getFundInvestments = function getFundInvestments(fundId, options, cb) {
 
     const self = this;

package/package.json

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