@dhyasama/totem-models 1.22.3 → 1.23.1

package/lib/LimitedPartner.js

@@ -19,8 +19,8 @@ module.exports = function(mongoose, config) {
     async = require('async'),
     utils = require('@dhyasama/ffvc-utilities');
 
-  var getFundIdsForCustomer = function(cb) {
-    Organization.getById(CUSTOMER_ID, function(err, org) {
+  var getFundIdsForOrg = function(id, cb) {
+    Organization.getById(id, function(err, org) {
       if (err) return cb(err, null);
       else if (!org) return cb(null, null);
       var fundIds = _.map(org.funds, function(fund) {
@@ -36,6 +36,8 @@ module.exports = function(mongoose, config) {
 
     shortName: { type: String, default: '' },
 
+    customer: { type: Schema.ObjectId, ref: 'Organization' },
+
     start: { type: String, default: '' },
 
     people: [{
@@ -400,7 +402,7 @@ module.exports = function(mongoose, config) {
       getLp();
     }
     else {
-      getFundIdsForCustomer(function(err, fundIds) {
+      getFundIdsForOrg(CUSTOMER_ID, function(err, fundIds) {
         if (err) return cb(err, null);
         query = self.findOne({ '_id': id, 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
         getLp();
@@ -429,19 +431,13 @@ module.exports = function(mongoose, config) {
       getLps(query);
     }
     else {
-      getFundIdsForCustomer(function(err, fundIds) {
+      getFundIdsForOrg(CUSTOMER_ID, function(err, fundIds) {
         if (err) return cb(err, null);
         query = self.find({'people': personId, 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
         getLps(query);
       });
     }
 
-    // self
-    //   .find({'people': personId}, this.getReadFilterKeys(role))
-    //   .populate('fundsInvested.fund')
-    //   .populate('people', 'name')
-    //   .exec(cb);
-
   };
 
   LimitedPartner.statics.getFlags = function getFlags(lpid, cb) {
@@ -514,7 +510,7 @@ module.exports = function(mongoose, config) {
       getLps(query);
     }
     else {
-      getFundIdsForCustomer(function(err, fundIds) {
+      getFundIdsForOrg(CUSTOMER_ID, function(err, fundIds) {
         if (err) return cb(err, null);
         query = self.find({ 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
         getLps(query);
@@ -523,6 +519,31 @@ module.exports = function(mongoose, config) {
 
   };
 
+  LimitedPartner.statics.listForOrganization = function (orgid, role, cb) {
+
+    // sorted by name ascending
+    // sort is done post retrieval because query sort is done pre-decryption
+
+    var self = this;
+    var query;
+
+    var getLps = function(q) {
+      q.populate('fundsInvested.fund')
+      q.exec(function (err, lps) {
+        if (err) return cb(err, null);
+        lps = _.sortBy(lps, function(lp) { return lp.name ? lp.name.toLowerCase() : ''; });
+        return cb(null, lps);
+      });
+    };
+
+    getFundIdsForOrg(orgid, function(err, fundIds) {
+      if (err) return cb(err, null);
+      query = self.find({ 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
+      getLps(query);
+    });
+
+  };
+
   LimitedPartner.statics.listAllUnverifiedLps = function (role, cb) {
 
     if (role != 'admin') return cb(new Error('Unauthorized'), []);
@@ -617,7 +638,7 @@ module.exports = function(mongoose, config) {
       getLps();
     }
     else {
-      getFundIdsForCustomer(function(err, fundIds) {
+      getFundIdsForOrg(CUSTOMER_ID, function(err, fundIds) {
         if (err) return cb(err, null);
         query = self.find({ 'name': new RegExp(terms, "i"), 'fundsInvested.fund': { $in : fundIds }}, self.getReadFilterKeys(role));
         getLps();
@@ -643,6 +664,7 @@ module.exports = function(mongoose, config) {
 
   };
 
+  // Deprecated
   LimitedPartner.statics.flag = function(lpId, resolved, text, username, role, cb) {
 
     var context = this;
@@ -762,12 +784,16 @@ module.exports = function(mongoose, config) {
   LimitedPartner.post('init', function(doc, next) {
 
     if (CUSTOMER_ID != 'GLOBAL_PROCESS' && !LPS_ENABLED) {
-      doc = null;
-      return next();
+
+      // Don't return doc if lps aren't enabled or lp doesn't belong to current customer
+      if (!LPS_ENABLED || doc.customer != CUSTOMER_ID) {
+        doc = null;
+        return next();
+      }
+
     }
 
     // Decrypt sensitive data
-
     if (this.distributions && this.distributions.ach) {
       if (this.distributions.ach.accountType) {
         this.distributions.ach.accountType = crypto.decrypt(this.distributions.ach.accountType);
@@ -794,7 +820,6 @@ module.exports = function(mongoose, config) {
         this.distributions.ach.bankAccount.accountNumber = crypto.decrypt(this.distributions.ach.bankAccount.accountNumber);
       }
     }
-
     if (this.k1 && this.k1.EIN) { this.k1.EIN = crypto.decrypt(this.k1.EIN); }
 
     next();

package/lib/Organization.js

@@ -776,6 +776,9 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    var lpPopulateOptions = { path: 'lps' };
+    if (config.CUSTOMER_ID != 'GLOBAL_PROCESS') lpPopulateOptions.match = { customer: config.CUSTOMER_ID };
+
     self
       .findById(id)
       .populate('people.person', 'name avatarUrl title calendarEventSummaries sources')
@@ -785,7 +788,7 @@ module.exports = function(mongoose, config) {
       .populate('funds', 'name hexColorCode closeDate')
       .populate('operating.acquired.public.by', 'name logoUrl')
       .populate('operating.acquired.private.by', 'name logoUrl')
-      .populate('lps')
+      .populate(lpPopulateOptions)
       .deepPopulate([
         'people.person.sources.person',
         'people.person.calendarEventSummaries.attendees.internal',
@@ -941,7 +944,7 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Organization.statics.listCustomers = function getById(cb) {
+  Organization.statics.listCustomers = function listCustomers(cb) {
 
     var self = this;
 
@@ -1162,58 +1165,80 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
-    var thereCanOnlyBeOne = function thereCanOnlyBeOne(items) {
+    var cleanContactInfo = function cleanContactInfo() {
 
-      var primaryItems = _.filter(items, function(item) { return item.primary; });
+      var thereCanOnlyBeOne = function thereCanOnlyBeOne(items) {
 
-      if (primaryItems.length > 1) {
+        var primaryItems = _.filter(items, function(item) { return item.primary; });
 
-        _.each(primaryItems, function(item, index) {
-          // skip the first one (leave it primary) and mark the rest as not primary
-          if (index >= 1) item.primary = false;
-        });
+        if (primaryItems.length > 1) {
 
-      }
+          _.each(primaryItems, function(item, index) {
+            // skip the first one (leave it primary) and mark the rest as not primary
+            if (index >= 1) item.primary = false;
+          });
 
-      return items;
+        }
+
+        return items;
+
+      };
+
+      // must have something meaningful
+      self.contact.address = _.map(self.contact.address, function(address) {
+        if (!address.city && !address.state && !address.country) return null;
+        else return address;
+      });
+
+      self.contact.email = _.map(self.contact.email, function(item) {
+        if (!item.email) return null;
+        else return item;
+      });
+
+      self.contact.phone = _.map(self.contact.phone, function(item) {
+        if (!item.number) return null;
+        else return item;
+      });
+
+      // remove emptiness and dedupe
+      self.contact.address = _.uniq(_.compact(self.contact.address), function(item) { return item.city + item.state + item.country; });
+      self.contact.email = _.uniq(_.compact(self.contact.email), function(item) { return item.email; });
+      self.contact.phone = _.uniq(_.compact(self.contact.phone), function(item) { return item.number; });
+
+      // only one primary
+      self.contact.address = thereCanOnlyBeOne(self.contact.address);
+      self.contact.email = thereCanOnlyBeOne(self.contact.email);
+      self.contact.phone = thereCanOnlyBeOne(self.contact.phone);
 
     };
 
-    // must have something meaningful
-    self.contact.address = _.map(self.contact.address, function(address) {
-      if (!address.city && !address.state && !address.country) return null;
-      else return address;
-    });
+    var cleanPeople = function cleanPeople() {
 
-    self.contact.email = _.map(self.contact.email, function(item) {
-      if (!item.email) return null;
-      else return item;
-    });
+      // remove junk
+      self.people = _.reject(self.people, function(p) { return p.person == null; });
 
-    self.contact.phone = _.map(self.contact.phone, function(item) {
-      if (!item.number) return null;
-      else return item;
-    });
+      // dedupe
+      self.people = _.uniq(self.people, function(p) { return p.person._id ? p.person._id : p.person; });
 
-    // remove emptiness and dedupe
-    self.contact.address = _.uniq(_.compact(self.contact.address), function(item) { return item.city + item.state + item.country; });
-    self.contact.email = _.uniq(_.compact(self.contact.email), function(item) { return item.email; });
-    self.contact.phone = _.uniq(_.compact(self.contact.phone), function(item) { return item.number; });
+    };
 
-    // only one primary
-    self.contact.address = thereCanOnlyBeOne(self.contact.address);
-    self.contact.email = thereCanOnlyBeOne(self.contact.email);
-    self.contact.phone = thereCanOnlyBeOne(self.contact.phone);
+    var cleanWebsites = function cleanWebsites() {
 
-    // Format website
-    if (self.website) self.website = utils.getDomain(self.website);
+      // Format website
+      if (self.website) self.website = utils.getDomain(self.website);
 
-    // Format website aliases
-    if (self.websiteAliases && self.websiteAliases.length >= 1) {
-      self.websiteAliases = _.map(self.websiteAliases, function(alias) {
-        return utils.getDomain(alias);
-      });
-    }
+      // Format website aliases
+      if (self.websiteAliases && self.websiteAliases.length >= 1) {
+        self.websiteAliases = _.map(self.websiteAliases, function(alias) {
+          return utils.getDomain(alias);
+        });
+      }
+
+    };
+
+    cleanContactInfo();
+    cleanPeople();
+    cleanWebsites();
 
     return next();
 
@@ -1231,6 +1256,7 @@ module.exports = function(mongoose, config) {
     // remove customer details if not viewing self
     if (doc._id.toString() != CUSTOMER_ID) doc.customer = {};
 
+    doc.lps = _.reject(doc.lps, function(item) { return !item.customer || item.customer.toString() != CUSTOMER_ID; });
     doc.filters = _.reject(doc.filters, function(item) { return !item.customer || item.customer.toString() != CUSTOMER_ID; });
     doc.docs = _.reject(doc.docs, function(item) { return !item.customer || item.customer.toString() != CUSTOMER_ID; });
     doc.iLevel = _.reject(doc.iLevel, function(item) { return !item.customer || item.customer.toString() != CUSTOMER_ID; });
@@ -1250,20 +1276,6 @@ module.exports = function(mongoose, config) {
 
     });
 
-    // var customerFunds = doc.constructor.customerFunds;
-    // //console.log('customerFunds', customerFunds);
-    // doc.lps = _.filter(doc.lps, function(lp) {
-    //   var lpFunds = _.pluck(lp.fundsInvested, 'fund');
-    //   var intersection = _.intersection(lpFunds, customerFunds);
-    //   return intersection.length >= 1;
-    // });
-
-    // will there ever be a reason to show an org's lps?
-    // a customer should only be able to see their own lps, which are queried and viewable on /lps
-    // and if it's not used, why is it here?
-    // todo - research flipping ref onto lp model
-    doc.lps = [];
-
     return next();
 
   });

package/package.json

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

package/test/Organization.js

@@ -9,12 +9,16 @@ var
   clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
   Organization = mongoose.model('Organization'),
   Person = mongoose.model('Person'),
+  LimitedPartner = mongoose.model('LimitedPartner'),
+  Fund = mongoose.model('Fund'),
   Note = mongoose.model('Note');
 
 var person, person1, person2;
 var noteId;
 var eventNote;
 var flagId;
+var someOtherFund;
+var someOtherLp;
 
 describe('Organization', function() {
 
@@ -48,6 +52,15 @@ describe('Organization', function() {
     });
   });
 
+  before(function (done) {
+    Fund.collection.dropIndexes(function (err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      result.should.equal(true);
+      return done();
+    });
+  });
+
   before(function (done) {
 
     org2 = new Organization();
@@ -209,6 +222,45 @@ describe('Organization', function() {
 
   });
 
+  before(function(done) {
+
+    var f = new Fund();
+    f.name = 'FUND XYZ';
+    f.shortName = 'xyz';
+    f.slug = 'fund-xyz';
+
+    Fund.upsert(f, 'test', function(err, fundResult) {
+
+      should.not.exist(err);
+      should.exist(fundResult);
+
+      someOtherFund = fundResult;
+
+      done();
+
+    });
+
+  });
+
+  before(function(done) {
+
+    var lp = new LimitedPartner();
+    lp.name = 'SOME OTHER LP';
+    lp.fundsInvested.push({fund:someOtherFund});
+
+    LimitedPartner.upsert(lp, 'test', 'lp-full', function(err, lpResult) {
+
+      should.not.exist(err);
+      should.exist(lpResult);
+
+      someOtherLp = lpResult;
+
+      done();
+
+    });
+
+  });
+
   before(function(done) {
 
     var providerEventId = 'some_other_random_data';
@@ -801,6 +853,46 @@ describe('Organization', function() {
 
   });
 
+  it('gets lps', function(done) {
+
+      var lp = new LimitedPartner();
+      lp.name = 'LP';
+      lp.customer = config.CUSTOMER_ID;
+
+      LimitedPartner.upsert(lp, 'test', 'lp-full', function(err, lpResult) {
+
+        should.not.exist(err);
+        should.exist(lpResult);
+
+        var o = new Organization();
+        o.name = 'ORG';
+        o.slug = 'org';
+        o.website = 'org.org';
+        o.lps.push(lpResult);
+        o.lps.push(someOtherLp);
+
+        Organization.upsert(o, 'test-user', function(err, orgResult) {
+
+          should.not.exist(err);
+          should.exist(orgResult);
+
+          Organization.getById(orgResult._id, function(err, result) {
+
+            should.not.exist(err);
+            should.exist(result);
+            result.lps.length.should.equal(1);
+            result.lps[0]._id.toString().should.equal(lpResult._id.toString());
+
+            done();
+
+          });
+
+        });
+
+      });
+
+  });
+
   it('cleans contact info', function(done) {
 
     var o = new Organization();
@@ -905,6 +997,28 @@ describe('Organization', function() {
     });
   });
 
+  it('cleans people', function(done) {
+
+    var littleDirtyOrg = new Organization();
+    littleDirtyOrg.name = 'N00b';
+    littleDirtyOrg.slug = 'n00b';
+
+    var temp = new mongoose.Types.ObjectId();
+
+    littleDirtyOrg.addPerson({person: temp});
+    littleDirtyOrg.addPerson({person: temp});
+    littleDirtyOrg.addPerson({person: new mongoose.Types.ObjectId()});
+    littleDirtyOrg.addPerson({person: new mongoose.Types.ObjectId()});
+
+    Organization.upsert(littleDirtyOrg, 'test-user', function(err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      result.people.length.should.equal(3);
+      return done();
+    });
+
+  });
+
   describe('State', function() {
 
     it('gets ipo info', function(done) {