@dhyasama/totem-models 1.0.0 → 1.0.1

package/lib/Account.js

@@ -53,14 +53,6 @@ module.exports = function(mongoose, config) {
       required: true
     },
 
-    // todo - change to org
-    customer: {
-      type: Schema.ObjectId,
-      ref: 'Investor',
-      required: false
-    },
-
-    // todo - port from customer
     org: {
       type: Schema.ObjectId,
       ref: 'Organization',

package/lib/LimitedPartner.js

@@ -584,28 +584,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  //TODO: this is same as Person & Portfolio Company Function
-  //Helper function that multiple models can use...
-  LimitedPartner.statics.verify = function(lpId, verified, username, role, cb) {
-
-    this
-      .findById(lpId, this.getReadFilterKeys(role))
-      .exec(function(err, lp) {
-
-      lp.status.verified = verified;
-      lp.status.verifiedBy = username;
-      lp.status.verifiedOn = Date.now();
-
-      if(verified) {
-        lp.flagged.resolved = true;
-      }
-
-      return this.upsert(lp, username, role, cb);
-
-    });
-
-  };
-
   LimitedPartner.statics.flag = function(lpId, resolved, text, username, role, cb) {
 
     var context = this;
@@ -685,24 +663,6 @@ module.exports = function(mongoose, config) {
       return next();
     });
 
-    // var takeSnapshot = function(cb) {
-    //
-    //   var LimitedPartnerHistory = mongoose.model('LimitedPartnerHistory');
-    //   var snapshot = new LimitedPartnerHistory();
-    //   snapshot.create(self, 'jason', function(err, result) {
-    //     if (err) {} // todo: alert admin to fix; ok to proceed;
-    //     return cb();
-    //   });
-    //
-    // };
-    //
-    // encryptSensitiveData(function() {
-    //   takeSnapshot(function() {
-    //     return next();
-    //   })
-    // });
-
-
   });
 
   LimitedPartner.pre('init', function(next) {

package/lib/List.js

@@ -24,13 +24,12 @@ module.exports = function(mongoose, config) {
 
     // Keeping these separate to facilitate population
 
-    // todo - how to update these with company consolidation?
-
     limitedPartners: [{ type: Schema.ObjectId, ref: 'LimitedPartner', index: false, required: false }],
 
     organizations: [{ type: Schema.ObjectId, ref: 'Organization', index: false, required: false }],
 
     people: [{ type: Schema.ObjectId, ref: 'Person', index: false, required: false }]
+
   });
 
   // Items are kept separate to facilitate population

package/lib/News.js

@@ -22,24 +22,6 @@ module.exports = function(mongoose, config) {
 
       publication: { type: String },
 
-      fundsInvolved: [{
-        type: Schema.ObjectId,
-        ref: 'Fund'
-      }],
-
-      // TODO - make all news about port cos
-      // required: true
-      // remove internal
-      // update admin to reflect these changes
-
-      // todo - put new org id in org field
-      portfolioCompany: {
-        type: Schema.ObjectId,
-        ref: 'PortfolioCompany',
-        required: false,
-        default: null
-      },
-
       org: {
         type: Schema.ObjectId,
         ref: 'Organization',
@@ -49,13 +31,6 @@ module.exports = function(mongoose, config) {
 
       internal: { type: Boolean, default: false },
 
-      // TODO - this will be going away
-      discourse: {
-        id: { type: String },
-        firstPostId: { type: String },
-        slug: { type: String }
-      },
-
       extracted: { type: Schema.Types.Mixed }
 
     });
@@ -64,7 +39,7 @@ module.exports = function(mongoose, config) {
 
     this
       .findById(id)
-      .populate('org fundsInvolved')
+      .populate('org')
       .exec(cb);
 
   };
@@ -73,7 +48,7 @@ module.exports = function(mongoose, config) {
 
     this
       .find()
-      .populate('org fundsInvolved')
+      .populate('org')
       .sort('-createdOn')
       .exec(cb);
 
@@ -83,7 +58,7 @@ module.exports = function(mongoose, config) {
 
     this
       .find({ org: id })
-      .populate('org fundsInvolved')
+      .populate('org')
       .sort('-createdOn')
       .exec(cb);
 
@@ -93,7 +68,7 @@ module.exports = function(mongoose, config) {
 
     this
       .find()
-      .populate('org fundsInvolved')
+      .populate('org')
       .sort('-createdOn')
       .exec(function (err, news) {
 
@@ -109,38 +84,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  News.statics.listInternal = function (cb) {
-
-    this
-      .find({ internal: true })
-      .populate('org fundsInvolved')
-      .sort('-createdOn')
-      .exec(cb);
-
-  };
-
-  News.statics.listForFunds = function (fundIds, cb) {
-
-    if (!fundIds || fundIds.length == 0) return cb(null, null);
-
-    this
-      .find({ fundsInvolved: { $in : fundIds } })
-      .populate('org fundsInvolved')
-      .sort('-createdOn')
-      .exec(function(err, result) {
-
-        if (err) return cb(err, null);
-
-        _.each(result, function(newsItem) {
-          newsItem.fundsInvolved = _.filter(newsItem.fundsInvolved, function(fund) { return fundIds.indexOf(fund._id.toString()) >= 0; });
-        });
-
-        return cb(null, result);
-
-      });
-
-  };
-
   News.statics.upsert = function (news, cb) {
     news.markModified('extracted');
     news.save(cb);

package/lib/Organization.js

@@ -182,7 +182,7 @@ module.exports = function(mongoose, config) {
         fullyDiluted: { type: Number, default: 0 },
         asOfDate: { type: Date },
 
-        // todo - ???
+        // todo - ??? - clarify how to handle this
         optionsAndWarrants: {
           unissued: { type: Number },
           issuedToUnspecified: { type: Number }
@@ -338,54 +338,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  // todo - what are "basic" fields and how are they used?
-  Organization.methods.newBasic = function(field, value) {
-
-    var compoundField = false;
-    if(field.split(".").length > 1) {
-      compoundField = true;
-    }
-
-    if(!compoundField) {
-      this[field] = value;
-    } else {
-      var parentField = field.split('.')[0];
-      var childField = field.split('.')[1];
-
-      this[parentField][childField] = value;
-    }
-
-  };
-
-  Organization.methods.updateBasic = function(field, value) {
-
-    var compoundField = false;
-    if(field.split(".").length > 1) {
-      compoundField = true;
-    }
-
-    if(!compoundField) {
-      var currentVal = this[field];
-      this[field] = value;
-    } else {
-      var parentField = field.split('.')[0];
-      var childField = field.split('.')[1];
-
-      var currentVal = this[parentField][childField];
-      this[parentField][childField] = value;
-    }
-
-  };
-
-  Organization.methods.updateContact = function(field, value) {
-
-    var parentField = field.split('.')[0];
-    var childField = field.split('.')[1];
-
-    this[parentField][childField] = value;
-
-  };
-
   Organization.methods.addPerson = function(personToAdd) {
 
     var self = this;
@@ -415,125 +367,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Organization.methods.updateFunds = function(funds) {
-
-    var self = this;
-
-    // todo - ??? - funds invested into this org or funds this org invests from?
-
-    if (!self.portfolioCompany) return;
-
-    // wipe funds and start fresh
-    self.portfolioCompany.fundsInvested = funds;
-
-    // Checking if it's a valid object id is a shortcut
-    // TODO: The alternative is to get a list of funds and verify against that
-    // TODO: also would be good to check for dupes
-    // This is used internally, in admin, so let's punt for now
-
-    //_.each(fundIds, function(fundId) {
-    //  if (utilities.isValidObjectId(fundId.id)) {
-    //    self.fundsInvested.push(fundId);
-    //  };
-    //});
-
-  };
-
-  Organization.methods.updateChair = function(chairObj) {
-
-    var self = this;
-
-    if (!self.portfolioCompany) return;
-
-    // todo - needs customer id
-
-    switch(chairObj.num) {
-      case 'chair1':
-        if(chairObj.val && chairObj.val != "") {
-          self.portfolioCompany.chairs.first = chairObj.val;
-        } else {
-          self.portfolioCompany.chairs.first = {};
-        }
-        break;
-
-      case 'chair2':
-        if(chairObj.val && chairObj.val != "") {
-          self.portfolioCompany.chairs.second = chairObj.val;
-        } else {
-          self.portfolioCompany.chairs.second = {}
-        }
-        break;
-    }
-
-  };
-
-  // todo - change this to exit (with acquisition or ipo)
-  Organization.methods.updateAcquisition = function(aObj) {
-
-    var self = this;
-
-    if (!self.portfolioCompany) return;
-
-    self.portfolioCompany.acquisition = aObj;
-
-  };
-
-  Organization.methods.removeInvestmentsAndDebtsByCustomer = function(investor) {
-
-    var self = this;
-
-    // todo - change to round.funds and capTable.customer
-
-    if (!self.portfolioCompany) return;
-
-    if(self.portfolioCompany.investments.length > 0) {
-      self.portfolioCompany.investments = _.reject(self.portfolioCompany.investments, function(i) {
-        return String(i.source) == String(investor._id);
-      });
-    }
-
-    if(self.portfolioCompany.debts.length > 0) {
-      self.portfolioCompany.debts = _.reject(self.portfolioCompany.debts, function(d) {
-        return String(d.source) == String(investor._id);
-      });
-    }
-
-    if(self.portfolioCompany.fundsInvested.length > 0) {
-      self.portfolioCompany.fundsInvested = _.reject(self.portfolioCompany.fundsInvested, function(f) {
-        return String(f.investor._id || f.investor) == String(investor._id);
-      });
-    }
-
-  };
-
-  Organization.methods.addCompanyToInvestor = function(idOfCompanyToAdd) {
-
-    var self = this;
-    if (!self.investor) return;
-
-    var match = _.find(self.investor.companies, function(company) {
-      var companyId = utils.isValidObjectId(company) ? company : company.id;
-      return companyId.toString() == idOfCompanyToAdd.toString();
-    });
-
-    if (!match) self.investor.companies.push(idOfCompanyToAdd);
-
-  };
-
-  Organization.methods.addFundToInvestor = function(idOfFundToAdd) {
-
-    var self = this;
-    if (!self.investor) return;
-
-    var match = _.find(self.investor.funds, function(fund) {
-      var fundId = utils.isValidObjectId(fund) ? fund : fund.id;
-      return fundId.toString() == idOfFundToAdd.toString();
-    });
-
-    if (!match) self.investor.funds.push(idOfFundToAdd);
-
-  };
-
 ///////////////////////
 
   // search for orgs based on fields provided
@@ -715,11 +548,12 @@ module.exports = function(mongoose, config) {
   };
 
   Organization.statics.findByPerson = function findByPerson(personId, cb) {
+    // Given a person id, get all organizations with that person
     this.find({ 'people.person': personId, 'deleted': {$ne: true} }).exec(cb);
   };
 
   Organization.statics.findBySlug = function findBySlug(slug, cb) {
-    this.find({ slug: slug, 'deleted': {$ne: true} }).exec(cb);
+    this.findOne({ slug: slug, 'deleted': {$ne: true} }).exec(cb);
   };
 
   Organization.statics.findBySlugs = function findBySlugs(slugs, cb) {
@@ -801,6 +635,8 @@ module.exports = function(mongoose, config) {
 
   Organization.statics.getPortfolio = function getPortfolio(orgId, cb) {
 
+    // Get all organizations invested in by the given org id
+
     var self = this;
 
     self
@@ -930,7 +766,8 @@ module.exports = function(mongoose, config) {
 
   Organization.post('init', function() {
 
-    // Protect private data and merge public and private data
+    // Protect private data
+    // Merge public and private data
 
     var self = this;
     var CUSTOMER_ID = config.CUSTOMER_ID;

package/lib/Person.js

@@ -787,27 +787,6 @@ module.exports = function(mongoose, config) {
       .exec(cb);
   };
 
-  // TODO - make dynamic
-  Person.statics.getPartners = function (cb) {
-
-    var partnerEmails = [
-      'john@ffvc.com',
-      'adam@ffvc.com',
-      'alex@ffvc.com',
-      'david@ffvc.com',
-      'michael@ffvc.com',
-      'ryan@ffvc.com',
-      'herb@ffvc.com',
-      'paul@ffvc.com'
-    ];
-
-    this
-      .find({ 'contact.email.email': { $in: partnerEmails }, 'deleted': { $ne: true } } )
-      .populate('account boards.company chairs.first.company chairs.second.company')
-      .exec(cb);
-
-  };
-
   Person.statics.findByProviderEventId = function (id, cb) {
     this
       .find({ 'calendarEventSummaries.providerEventId': id })
@@ -829,7 +808,8 @@ module.exports = function(mongoose, config) {
   Person.statics.findByUniqueInfo = function (email, cb) {
 
     // useful for not inserting dupes
-    // todo: expand this to check other fields
+    // could expand this to check other fields
+    // but really should be replaced by search
 
     this.findOne({
       $or: [
@@ -1042,16 +1022,6 @@ module.exports = function(mongoose, config) {
 
 ///////////////
 
-  // Person.pre('save', function(next) {
-  //   var self = this;
-  //   var PersonHistory = mongoose.model('PersonHistory');
-  //   var snapshot = new PersonHistory();
-  //   snapshot.create(self, 'jason', function(err, result) {
-  //     if (err) {} // todo: alert admin to fix; ok to proceed;
-  //     return next();
-  //   });
-  // });
-
   Person.post('remove', function(doc) {
     // Account.person
     // Investor.people

package/package.json

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

package/test/News.js

@@ -31,16 +31,11 @@ describe('News', function() {
     news.createdOn = Date.now();
     news.title = 'Google';
     news.link = 'http://google.com';
-    news.fundsInvolved.push(fund._id);
     news.internal = false;
-    news.discourse.id = '1';
-    news.discourse.slug = 'google';
-    news.discourse.firstPostId = '1';
 
     News.upsert(news, function(err, item) {
       should.not.exist(err);
       should.exist(item);
-      item.fundsInvolved.length.should.equal(1);
       news = item;
       done();
     });
@@ -60,50 +55,29 @@ describe('News', function() {
 
   });
 
-it('gets a news item by id', function(done) {
-   News.getById(news.id, function(err, item) {
-     should.not.exist(err);
-     should.exist(item);
-     item.id.should.equal(news.id);
-     done();
-   });
-});
-
-it('lists all news items', function(done) {
-   News.list(function(err, items) {
-     should.not.exist(err);
-     should.exist(items);
-     items.length.should.equal(1);
-     done();
-   });
-});
-
-  it('lists news items for a fund', function(done) {
-    News.listForFunds([fund._id], function(err, items) {
-      should.not.exist(err);
-      should.exist(items);
-      items.length.should.equal(1);
-      done();
-    });
+  it('gets a news item by id', function(done) {
+     News.getById(news.id, function(err, item) {
+       should.not.exist(err);
+       should.exist(item);
+       item.id.should.equal(news.id);
+       done();
+     });
   });
 
-
-  it('lists news items for funds', function(done) {
-    News.listForFunds([fund._id, new mongoose.Types.ObjectId()], function(err, items) {
-      should.not.exist(err);
-      should.exist(items);
-      items.length.should.equal(1);
-      done();
-    });
+  it('lists all news items', function(done) {
+     News.list(function(err, items) {
+       should.not.exist(err);
+       should.exist(items);
+       items.length.should.equal(1);
+       done();
+     });
   });
 
-it('deletes a news item', function(done) {
-   News.delete(news.id, function(err, item) {
-     should.not.exist(err);
-     done();
-   });
-});
-
-// todo - listforcompany
+  it('deletes a news item', function(done) {
+     News.delete(news.id, function(err, item) {
+       should.not.exist(err);
+       done();
+     });
+  });
 
 });

package/test/Organization.js

@@ -262,32 +262,6 @@ describe('Organization', function() {
     });
   }); // end adds an org
 
-  it('adds a basic field to org', function(done) {
-
-    org1.newBasic('slug', 'org1-slug');
-
-    Organization.upsert(org1, 'test-user', function(err, org) {
-     should.not.exist(err);
-     should.exist(org);
-     org.slug.should.equal('org1-slug');
-     org1 = org;
-     done();
-    });
-  }); // end adds a basic field
-
-  it('updates a basic field on org', function(done) {
-
-    org1.updateBasic('website', 'updatedorg1.com');
-
-    Organization.upsert(org1, 'test-user', function(err, org) {
-     should.not.exist(err);
-     should.exist(org);
-     org.website.should.equal('updatedorg1.com');
-     org1 = org;
-     done();
-    });
-  }); // end update a basic field
-
   it('finds a fuzzy match by name', function(done) {
 
     Organization.search({
@@ -436,7 +410,6 @@ describe('Organization', function() {
      Organization.findBySlug('org2-slug', function(err, org) {
        should.not.exist(err);
        should.exist(org);
-       org.length.should.equal(1);
        done();
      });
 
@@ -444,7 +417,7 @@ describe('Organization', function() {
 
   it('finds org by slugs', function(done) {
 
-     Organization.findBySlugs(['org1-slug', 'org2-slug'], function(err, orgs) {
+     Organization.findBySlugs(['fudge-3', 'org2-slug'], function(err, orgs) {
        should.not.exist(err);
        should.exist(orgs);
        orgs.length.should.equal(2);