@dhyasama/totem-models 9.51.0 → 9.53.0

package/index.js

@@ -57,6 +57,7 @@ var bootstrap = function(mongoose, config) {
   require('./lib/Investment.js')(mongoose, config);
   require('./lib/List.js')(mongoose, config);
   require('./lib/Message.js')(mongoose, config);
+  require('./lib/MessageRecipient.js')(mongoose, config);
   require('./lib/News.js')(mongoose, config);
   require('./lib/Snapshot.js')(mongoose, config);
   require('./lib/Sync.js')(mongoose, config);

package/lib/Deal.js

@@ -59,7 +59,11 @@ module.exports = function(mongoose, config) {
       description: { type: String, trim: true, required: true }
     }],
 
-    customFields: { type: Schema.Types.Mixed }
+    customFields: { type: Schema.Types.Mixed },
+
+    latestInteraction: { type: Schema.ObjectId, ref: 'Interaction', required: false },
+
+    latestMessage: { type: Schema.ObjectId, ref: 'Message', required: false }
 
   });
 
@@ -210,6 +214,16 @@ module.exports = function(mongoose, config) {
     };
 
     let query = self.find(terms);
+
+    if (options.populate) {
+      query.populate({ path: 'documents', match: { customer: options.CUSTOMER_ID } });
+      query.populate({ path: 'messages', match: { customer: options.CUSTOMER_ID }, select: '-raw' });
+      query.populate('organization', 'name aliases description logoUrl website websiteAliases chairs contact people');
+      query.populate('referrer.person', 'name avatarUrl title');
+      query.populate('latestInteraction');
+      query.populate('latestMessage');
+    }
+
     query.exec(cb);
 
   };

package/lib/Financials.js

@@ -84,6 +84,7 @@ module.exports = function(mongoose, config) {
         type: { type: String, enum: [null, 'header', 'block', 'document', 'metric', 'question']}
       }],
 
+      // health block
       cash: {
         amount: { type: Number, default: 0 },
       },
@@ -99,7 +100,7 @@ module.exports = function(mongoose, config) {
         period: { type: String, enum: [null, 'monthly', 'quarterly', 'yearly']},
       },
 
-      // income statement
+      // income statement block
       revenue: {
         amount: { type: Number, default: 0 },
         projected: { type: Number, default: 0 },
@@ -121,7 +122,7 @@ module.exports = function(mongoose, config) {
         breakdown: { type: Schema.Types.Mixed }
       },
 
-      // balance sheet
+      // balance sheet block
       assets: {
         amount: { type: Number, default: 0 },
         breakdown: { type: Schema.Types.Mixed }
@@ -135,7 +136,7 @@ module.exports = function(mongoose, config) {
         breakdown: { type: Schema.Types.Mixed }
       },
 
-      // cash flow
+      // cash flow block
       operatingActivities: {
         amount: { type: Number, default: 0 },
         breakdown: { type: Schema.Types.Mixed }

package/lib/Message.js

@@ -30,21 +30,8 @@ module.exports = function(mongoose, config) {
     },
     notes: [ { type: Schema.ObjectId, ref: 'Note' } ],
     documents: [ { type: Schema.ObjectId, ref: 'Document' } ],
-    raw: { type: Schema.Types.Mixed, required: true }
-
-  });
-
-  ///////////////////////////////////////
-
-  Message.virtual('messageDate').get(function () {
-
-    // A little helper to get the message date since
-    // the original message date isn't always contained
-    // in the email. In its absence, use created on.
-
-    const self = this;
-
-    return self.originalMessageDate || self.createdOn;
+    raw: { type: Schema.Types.Mixed, required: true },
+    messageDate: { type: Date, required: true },
 
   });
 
@@ -242,28 +229,23 @@ module.exports = function(mongoose, config) {
 
     const self = this;
 
+    // Must match customer
     let query = self.find({ customer: options.CUSTOMER_ID });
 
+    // Match either the org or a list of people
     query.where({ $or: [{organization: orgId}, {'recipients.external': { $in : personIds }}] });
 
-    query.exec(function (err, messages) {
+    // Optionally limit search space to message newer than some timestamp
+    if (options.timestamp) query.where({'messageDate': { $gte: options.timestamp }});
 
-      if (err) {
-        return cb(err, null);
-      }
-      else if (!messages) {
-        return cb(null, null);
-      }
-
-      messages = _.sortBy(messages, function(message) {
-        return message.originalMessageDate || message.createdOn;
-      });
-
-      var message = _.last(messages);
+    // Don't need the full raw message
+    query.select({ 'raw': -1 });
 
-      return cb(null, message);
+    // Only need one
+    query.sort({ 'messageDate': -1 });
+    query.limit(1);
 
-    });
+    query.exec(cb);
 
   };
 
@@ -409,9 +391,15 @@ module.exports = function(mongoose, config) {
 
     const timestamp = new Date();
 
+    // Use now if created on is empty
     message.createdOn = message.createdOn || timestamp;
+
+    // Updated on is always now
     message.updatedOn = timestamp;
 
+    // The original message date isn't always contained in the email. In its absence, use created on.
+    message.messageDate = message.messageDate || message.originalMessageDate || message.createdOn;
+
     message.save(cb);
 
   };

package/lib/MessageRecipient.js

@@ -0,0 +1,90 @@
+"use strict";
+
+module.exports = function(mongoose, config) {
+
+  let Schema = mongoose.Schema;
+
+  let MessageRecipient = new Schema({
+
+    message: { type: Schema.ObjectId, ref: 'Message', required: true },
+    customer: { type: Schema.ObjectId, ref: 'Organization', required: true },
+    organization: { type: Schema.ObjectId, ref: 'Organization', required: true },
+    recipient: { type: Schema.ObjectId,  ref: 'Person', required: true },
+    messageDate: { type: Date, required: true },
+
+  });
+
+  ///////////////////////////////////////
+
+  MessageRecipient.statics.getMostRecent = function getMostRecent(orgId, customerId, personId, options, cb) {
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!orgId) { return cb(new Error('orgId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(orgId)) { return cb(new Error('orgId is not a valid ObjectId'), null); }
+    if (!customerId) { return cb(new Error('customerId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(customerId)) { return cb(new Error('customerId is not a valid ObjectId'), null); }
+    if (!personId) { return cb(new Error('personId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(personId)) { return cb(new Error('personId is not a valid ObjectId'), null); }
+
+    const self = this;
+
+    options = options || {};
+
+    let query = self.find({
+      customer: options.CUSTOMER_ID,
+      organization: orgId,
+      recipient: personId
+    });
+
+    // Optionally limit search space to message newer than some timestamp
+    if (options.timestamp) query.where({'messageDate': { $gte: options.timestamp }});
+
+    // Only need one
+    query.sort({ 'messageDate': -1 });
+    query.limit(1);
+
+    query.exec(cb);
+
+  };
+
+  MessageRecipient.statics.getMostRecentBatch = function getMostRecentBatch(orgId, customerId, personIds, options, cb) {
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!orgId) { return cb(new Error('orgId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(orgId)) { return cb(new Error('orgId is not a valid ObjectId'), null); }
+    if (!customerId) { return cb(new Error('customerId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(customerId)) { return cb(new Error('customerId is not a valid ObjectId'), null); }
+    if (!personIds) { return cb(new Error('personIds is required'), null); }
+    if (!Array.isArray(personIds)) { return cb(new Error('personIds must be an array'), null); }
+
+    const self = this;
+
+    options = options || {};
+
+    let query = self.find({
+      customer: options.CUSTOMER_ID,
+      organization: orgId
+    });
+
+    query.where({ 'recipient': { $in : personIds }});
+
+    // Optionally limit search space to message newer than some timestamp
+    if (options.timestamp) query.where({'messageDate': { $gte: options.timestamp }});
+
+    // Only need one
+    query.sort({ 'messageDate': -1 });
+    query.limit(1);
+
+    query.exec(cb);
+
+  };
+
+  MessageRecipient.statics.upsert = function(message, cb) {
+    message.save(cb);
+  };
+
+  ///////////////////////////////////////
+
+  mongoose.model('MessageRecipient', MessageRecipient);
+
+};

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.51.0",
+  "version": "9.53.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "@dhyasama/totem-utilities": "^3.0.0",
+    "algoliasearch": "^4.13.0",
     "async": "^2.6.3",
     "awesome-phonenumber": "^1.0.14",
     "bluebird": "^3.7.2",