@dhyasama/totem-models 9.50.0 → 9.52.0

package/lib/Organization.js

@@ -249,7 +249,7 @@ module.exports = function(mongoose, config) {
             filters: [{
               _id: false,
               key: { type: String, trim: true },
-              condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan']},
+              condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan', 'isEmpty', 'isNotEmpty']},
               values: [{ type: String, trim: true }]
             }],
             sort: { 
@@ -367,7 +367,7 @@ module.exports = function(mongoose, config) {
             filters: [{
               _id: false,
               key: { type: String, trim: true },
-              condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan']},
+              condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan', 'isEmpty', 'isNotEmpty']},
               values: [{ type: String, trim: true }]
             }],
             sort: {
@@ -430,7 +430,7 @@ module.exports = function(mongoose, config) {
             filters: [{
               _id: false,
               key: { type: String, trim: true },
-              condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan']},
+              condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan', 'isEmpty', 'isNotEmpty']},
               values: [{ type: String, trim: true }]
             }],
             sort: { 
@@ -495,7 +495,7 @@ module.exports = function(mongoose, config) {
             filters: [{
               _id: false,
               key: { type: String, trim: true },
-              condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan']},
+              condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan', 'isEmpty', 'isNotEmpty']},
               values: [{ type: String, trim: true }]
             }],
             sort: { 

package/lib/Round.js

@@ -29,14 +29,6 @@ module.exports = function(mongoose, config) {
 
     roundName: { type: String, trim: true, required: true },
 
-    // People that participated in this round
-    // This is a public list of people that invested
-    // Use the addPerson method and removePerson static
-    people: [{
-      person: { type: Schema.ObjectId, ref: 'Person', index: true },
-      _id: false
-    }],
-
     // Investment vehicles that participated in this round
     // Currently only funds. May expand to SPVs.
     // Recall that a fund belongs to an organization
@@ -146,15 +138,11 @@ module.exports = function(mongoose, config) {
     // Fuck shit up so it gets taken care of
 
     var vehicles = _.compact(_.flatten(_.pluck(rounds, 'vehicles')));
-    var people = _.compact(_.flatten(_.pluck(rounds, 'people')));
     var badData = null;
 
     badData = _.find(rounds, function(item) { return !item.organization; });
     if (badData) return new Error(fnName + ' has one or more orgs that is not populated which means there is bad data');
 
-    badData = _.find(people, function(p) { return !p.person; });
-    if (badData) return new Error(fnName + ' has one or more people that is not populated which means there is bad data');
-
     badData = _.find(vehicles, function(item) { return !item.fund; });
     if (badData) return new Error(fnName + ' has one or more funds that is not populated which means there is bad data');
 
@@ -244,34 +232,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Round.methods.addPerson = function addPerson(person) {
-
-    // Add a reference to a person that participated in this round
-
-    var self = this;
-
-    if (!person) throw new Error('Must supply person to add');
-
-    // Do our best to accept an object or an objectid
-    if (!mongoose.Types.ObjectId.isValid(person)) {
-      person = person._id;
-      if (!mongoose.Types.ObjectId.isValid(person)) throw new Error('Need a valid objectid!');
-    }
-
-    // Check if person is already added
-    var match = _.find(self.people, function(existingPerson) {
-      var p = existingPerson.person || existingPerson;
-      var id = mongoose.Types.ObjectId.isValid(p) ? p : p._id;
-      return id.toString() === person.toString();
-    });
-
-    // If not, add it
-    if (!match) self.people.push({
-      person: person
-    });
-
-  };
-
   Round.methods.addVehicle = function addVehicle(fund) {
 
     // Add a vehicle, which is a fund
@@ -338,7 +298,6 @@ module.exports = function(mongoose, config) {
     });
 
     query.populate('organization', 'name logoUrl website websiteAliases');
-    query.populate('people.person', 'name avatarUrl title');
     query.populate('vehicles.fund', 'name shortName');
 
     if (options.isWorkerProcess) {
@@ -399,7 +358,6 @@ module.exports = function(mongoose, config) {
     });
 
     query.populate('organization', 'name logoUrl website websiteAliases');
-    query.populate('people.person', 'name avatarUrl');
     query.populate('vehicles.fund');
 
     if (options.isWorkerProcess) {
@@ -646,40 +604,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Round.statics.getPortfolioByPerson = function getPortfolioByPerson(personId, options, cb) {
-
-    // Returns a list of orgs that have rounds participated in by the given person id
-
-    if (!cb) { throw new Error('cb is required'); }
-    if (!personId) { throw new Error('personId is required'); }
-    if (!mongoose.Types.ObjectId.isValid(personId)) { return cb(new Error('personId is not a valid ObjectId'), null); }
-
-    const self = this;
-
-    let query = self.find({ 'people.person': personId });
-
-    query.select('organization');
-    query.populate('organization', 'name logoUrl description website websiteAliases');
-
-    query.exec(function(err, rounds) {
-
-      if (err) return cb(err, null);
-      if (!rounds || rounds.length === 0) return cb(null, []);
-
-      let error = checkForUnpopulatedData(rounds, 'Round.getPortfolioByPerson');
-      if (error) return cb(error, null);
-
-      // Return a list of orgs, not a list of rounds
-      let portfolio = _.pluck(rounds, 'organization');
-      portfolio = _.uniq(portfolio, function(org) { return org.name; });
-      portfolio = _.sortBy(portfolio, 'name');
-
-      return cb(null, portfolio);
-
-    });
-
-  };
-
   Round.statics.removeInvestment = function(investmentId, cb) {
 
     // Do not call this directly. It will leave an orphaned investment document.
@@ -714,20 +638,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Round.statics.removePerson = function(roundId, personId, cb) {
-
-    const self = this;
-
-    self
-      .findOneAndUpdate(
-        { '_id': roundId },
-        { $pull : { 'people': { 'person': personId } } },
-        { multi : false }
-      )
-      .exec(cb);
-
-  };
-
   Round.statics.removeVehicle = function(roundId, fundId, cb) {
 
     const self = this;

package/package.json

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