@dhyasama/totem-models 2.7.0 → 3.0.0

package/lib/LimitedPartner.js

@@ -617,6 +617,8 @@ module.exports = function(mongoose, config) {
       });
     };
 
+    if (role == 'none') return cb(null, []);
+
     if (CUSTOMER_ID == 'GLOBAL_PROCESS') {
       query = self.find({'name': new RegExp(terms, "i")}, self.getReadFilterKeys(role));
       getLps();
@@ -816,21 +818,21 @@ module.exports = function(mongoose, config) {
 //////////////////////////////
 
   LimitedPartner.plugin(filter, {
-    readFilter: {
-      'admin': ['name', 'shortName', 'start', 'people', 'documentSlugs', 'fundsInvested', 'contact', 'distributions', 'k1', 'entered', 'status', 'flagged', 'flags', 'notes'],
-      'lp-full': ['name', 'shortName', 'start', 'people', 'documentSlugs', 'fundsInvested', 'contact', 'distributions', 'k1', 'entered', 'status', 'flagged', 'flags', 'notes'],
-      'lp-names': ['name', 'shortName', 'flagged', 'flags'],
-      'none': []
+    "readFilter": {
+      "admin": ["name", "shortName", "start", "people", "documentSlugs", "fundsInvested", "contact", "distributions", "k1", "entered", "status", "flagged", "flags", "notes"],
+      "lp-full": ["name", "shortName", "start", "people", "documentSlugs", "fundsInvested", "contact", "distributions", "k1", "entered", "status", "flagged", "flags", "notes"],
+      "lp-names": ["name", "shortName", "flagged", "flags"],
+      "none": []
     },
-    writeFilter: {
-      'admin': ['name', 'shortName', 'start', 'people', 'documentSlugs', 'fundsInvested', 'contact', 'distributions', 'k1', 'entered', 'status', 'flagged', 'flags', 'notes'],
-      'lp-full': ['name', 'shortName', 'start', 'people', 'documentSlugs', 'fundsInvested', 'contact', 'distributions', 'k1', 'entered', 'status', 'flagged', 'flags', 'notes'],
-      'lp-names': ['flagged', 'flags'],
-      'none': []
+    "writeFilter": {
+      "admin": ["name", "shortName", "start", "people", "documentSlugs", "fundsInvested", "contact", "distributions", "k1", "entered", "status", "flagged", "flags", "notes"],
+      "lp-full": ["name", "shortName", "start", "people", "documentSlugs", "fundsInvested", "contact", "distributions", "k1", "entered", "status", "flagged", "flags", "notes"],
+      "lp-names": ["flagged", "flags"],
+      "none": []
     },
-    defaultFilterRole: 'none', // default to no read or write
-    sanitize: false, // Escape HTML in strings
-    compat: false // Enable compatibility for Mongoose versions prior to 3.6
+    "defaultFilterRole": "none",
+    "sanitize": false,
+    "compat": false
   });
 
 //////////////////////////////

package/lib/Organization.js

@@ -10,7 +10,6 @@ module.exports = function(mongoose, config) {
     Schema = mongoose.Schema,
     Flag = mongoose.model('Flag'),
     Note = mongoose.model('Note'),
-
     customerFunds = [],
     customerPortfolio = [],
 
@@ -685,12 +684,20 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Organization.statics.findByLimitedPartner = function findByLimitedPartner(lpid, cb) {
+  Organization.statics.findByLimitedPartner = function findByLimitedPartner(lpid, options, cb) {
+
     var self = this;
+
+    options = options || {};
+    options.role = options.role || 'none';
+
+    if (options.role == 'none') return cb(new Error('Access denied'), null);
+
     self
       .find({ 'lps': lpid, 'deleted': {$ne: true} })
       .select('name logoUrl')
       .exec(cb);
+
   };
 
   Organization.statics.findByPerson = function findByPerson(personId, cb) {
@@ -797,24 +804,28 @@ module.exports = function(mongoose, config) {
       .exec(cb);
   };
 
-  Organization.statics.getById = function getById(id, cb) {
+  Organization.statics.getById = function getById(id, options, cb) {
 
     var self = this;
 
+    options = options || {};
+    options.role = options.role || 'none';
+
     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 doNotDisplay')
-      .populate('related', 'name logoUrl')
-      .populate('chairs.first', 'name avatarUrl title')
-      .populate('chairs.second', 'name avatarUrl title')
-      .populate('funds', 'name hexColorCode abbreviation closeDate')
-      .populate('operating.acquired.public.by', 'name logoUrl')
-      .populate('operating.acquired.private.by', 'name logoUrl')
-      .populate(lpPopulateOptions)
-      .exec(cb);
+    var query = self.findById(id);
+    query.populate('people.person', 'name avatarUrl title doNotDisplay');
+    query.populate('related', 'name logoUrl');
+    query.populate('chairs.first', 'name avatarUrl title');
+    query.populate('chairs.second', 'name avatarUrl title');
+    query.populate('funds', 'name hexColorCode abbreviation closeDate');
+    query.populate('operating.acquired.public.by', 'name logoUrl');
+    query.populate('operating.acquired.private.by', 'name logoUrl');
+
+    if (options.role != 'none') query.populate(lpPopulateOptions);
+
+    query.exec(cb);
 
   };
 
@@ -1146,7 +1157,7 @@ module.exports = function(mongoose, config) {
       if (data.domain) {
         data.domain = data.domain.toLowerCase();
         var domainRegExp = options.fuzzy ? new RegExp(data.domain, 'i') : new RegExp('^' + data.domain + '$', 'i');
-        query['$or'].push({ 'website': domainRegExp });
+        query['$or'].push({ 'website': domainRegExp }, {'websiteAliases': domainRegExp});
       }
 
       // remove if unused

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "2.7.0",
+  "version": "3.0.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -15,7 +15,7 @@
     "@dhyasama/ffvc-crypto": "^1.0.0",
     "@dhyasama/ffvc-geoip": "^1.0.0",
     "@dhyasama/ffvc-s3": "^1.0.0",
-    "@dhyasama/ffvc-utilities": "^2.0.0",
+    "@dhyasama/ffvc-utilities": "^2.2.0",
     "async": "^2.6.0",
     "awesome-phonenumber": "^1.0.14",
     "bcrypt": "^0.8.0",

package/test/Interaction.js

@@ -15,7 +15,7 @@ var totemCustomerId2 = new mongoose.Types.ObjectId();
 var externalAttendee1 = new mongoose.Types.ObjectId();
 var externalAttendee2 = new mongoose.Types.ObjectId();
 
-describe.only('Interaction', function() {
+describe('Interaction', function() {
 
   before(function(done) {
     if (mongoose.connection.db) return done();

package/test/Organization.js

@@ -20,7 +20,7 @@ var flagId;
 var someOtherFund;
 var someOtherLp;
 
-describe('Organization', function() {
+describe.only('Organization', function() {
 
   var org1, org2, org3, org4, org5;
   var mergeId = new mongoose.Types.ObjectId();
@@ -488,7 +488,7 @@ describe('Organization', function() {
 
   it('gets an org by id', function(done) {
 
-     Organization.getById(org1.id, function(err, org) {
+     Organization.getById(org1.id, { role: 'lp-full' }, function(err, org) {
        should.not.exist(err);
        should.exist(org);
        org1 = org;
@@ -582,7 +582,7 @@ describe('Organization', function() {
 
   it('gets the board of a company', function(done) {
 
-    Organization.getById(org3.id, function(err, result) {
+    Organization.getById(org3.id, { role: 'lp-full' }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       var board = result.board;
@@ -615,7 +615,7 @@ describe('Organization', function() {
       updatedOrg.people.length.should.equal(1);
 
       // get populated org
-      Organization.getById(org1.id, function(err, org) {
+      Organization.getById(org1.id, { role: 'lp-full' }, function(err, org) {
 
         should.not.exist(err);
         should.exist(org);
@@ -793,7 +793,7 @@ describe('Organization', function() {
       result.websiteAliases.indexOf('abc.subdomain.com').should.not.equal(-1);
       result.websiteAliases.indexOf('trailingslash.edu').should.not.equal(-1);
 
-      Organization.getById(temp._id, function(err, result) {
+      Organization.getById(temp._id, { role: 'lp-full' }, function(err, result) {
 
         should.not.exist(err);
         should.exist(result);
@@ -832,14 +832,21 @@ describe('Organization', function() {
           should.not.exist(err);
           should.exist(orgResult);
 
-          Organization.getById(orgResult._id, function(err, result) {
+          Organization.getById(orgResult._id, { role: 'lp-full' }, 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();
+            Organization.getById(orgResult._id, { role: 'none' }, function(err, result) {
+
+              should.not.exist(err);
+              should.exist(result);
+              result.lps.length.should.equal(0);
+              done();
+
+            });
 
           });
 

package/.npmignore

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