@dhyasama/totem-models 7.58.0 → 8.0.1

package/lib/Interaction.js

@@ -2,16 +2,14 @@
 
 module.exports = function(mongoose, config) {
 
-  var Schema = mongoose.Schema;
-  var env = process.env.NODE_ENV || 'development';
-  var CalendarEvent = mongoose.model('CalendarEvent');
-  var Note = mongoose.model('Note');
-  var Organization = mongoose.model('Organization');
-  var Person = mongoose.model('Person');
-  var utilities = require('@dhyasama/ffvc-utilities');
-  var moment = require('moment');
+  let Schema = mongoose.Schema;
+  let async = require('async');
+  let Note = mongoose.model('Note');
+  let utilities = require('@dhyasama/ffvc-utilities');
+  let moment = require('moment');
+  let helpers = require('../helpers');
 
-  var Interaction = new Schema({
+  let Interaction = new Schema({
 
     calendarEventId: { type: Schema.ObjectId, ref: 'CalendarEvent', required: true }, // the event from the original pull
     providerEventId: { type: String, required: true, index: true, trim: true }, // unique id from the calendar provider
@@ -32,6 +30,13 @@ module.exports = function(mongoose, config) {
 
   Interaction.statics.addNote = function(interactionId, creatorPersonId, text, isPrivate, cb) {
 
+    if (!cb) { throw new Error('cb is required'); }
+    if (!interactionId) { return cb(new Error('interactionId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(interactionId)) { return cb(new Error('interactionId is not a valid ObjectId'), null); }
+    if (!creatorPersonId) { return cb(new Error('creatorPersonId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(creatorPersonId)) { return cb(new Error('creatorPersonId is not a valid ObjectId'), null); }
+    if (!text) { return cb(new Error('text is required'), null); }
+
     Note.createForModel({
       createdBy: creatorPersonId,
       text: text,
@@ -42,6 +47,12 @@ module.exports = function(mongoose, config) {
 
   Interaction.statics.delete = function(providerEventId, totemCustomerId, cb) {
 
+    if (!cb) { throw new Error('cb is required'); }
+    if (!providerEventId) { return cb(new Error('personIds is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(providerEventId)) { return cb(new Error('providerEventId is not a valid ObjectId'), null); }
+    if (!totemCustomerId) { return cb(new Error('totemCustomerId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(totemCustomerId)) { return cb(new Error('totemCustomerId is not a valid ObjectId'), null); }
+
     var self = this;
 
     self.findOneAndRemove({
@@ -55,6 +66,10 @@ module.exports = function(mongoose, config) {
 
     // Delete the note itself along with any references
 
+    if (!cb) { throw new Error('cb is required'); }
+    if (!noteId) { return cb(new Error('noteId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(noteId)) { return cb(new Error('noteId is not a valid ObjectId'), null); }
+
     var self = this;
 
     var removeReferences = function removeReferences(callback) {
@@ -74,8 +89,13 @@ module.exports = function(mongoose, config) {
 
   Interaction.statics.getForCustomer = function getForCustomer(customerId, since, cb) {
 
-    since = since || moment().subtract(20, 'years').startOf('day').toString()
+    if (!cb) { throw new Error('cb is required'); }
+    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); }
+
+    since = since || moment().subtract(20, 'years').startOf('day').toString();
     var sinceObjectId = utilities.convertTimestampToObjectId(since);
+    if (!mongoose.Types.ObjectId.isValid(sinceObjectId)) { return cb(new Error('sinceObjectId is not a valid ObjectId'), null); }
 
     var self = this;
     var query = self.find({ totemCustomerId: customerId, _id: { $gt: sinceObjectId } });
@@ -86,8 +106,14 @@ module.exports = function(mongoose, config) {
 
   Interaction.statics.getForCustomerSkinny = function getForCustomer(customerId, since, cb) {
 
-    since = since || moment().subtract(20, 'years').startOf('day').toString()
+    if (!cb) { throw new Error('cb is required'); }
+    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 (!since) { return cb(new Error('since is required'), null); }
+
+    since = since || moment().subtract(20, 'years').startOf('day').toString();
     var sinceObjectId = utilities.convertTimestampToObjectId(since);
+    if (!mongoose.Types.ObjectId.isValid(sinceObjectId)) { return cb(new Error('sinceObjectId is not a valid ObjectId'), null); }
 
     var self = this;
     var query = self.find({ totemCustomerId: customerId, _id: { $gt: sinceObjectId } });
@@ -97,10 +123,15 @@ module.exports = function(mongoose, config) {
 
   Interaction.statics.getForPeople = function getForPeople(personIds, options, cb) {
 
-    // This filters by customer so is NOT usable by admin tools
-    if (config.CUSTOMER_ID == 'GLOBAL_PROCESS') return cb(new Error('Access denied. Use getForPeopleLite.'), null);
+    if (!cb) { throw new Error('cb is required'); }
+    if (!personIds) { return cb(new Error('personIds is required'), null); }
+    if (!options) { return cb(new Error('options is required'), null); }
+    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
 
-    var self = this;
+    // NOTE: This is not for global process workers. Use getForPeopleLite instead.
+
+    let self = this;
 
     options.limit = options.limit || -1;
     options.skip = options.skip || -1;
@@ -112,24 +143,24 @@ module.exports = function(mongoose, config) {
     options.before = options.before || moment().toISOString();
     options.after = options.after || moment().subtract(20, 'year').toISOString();
 
-    var query = self.find({ totemCustomerId: config.CUSTOMER_ID });
+    let query = self.find({ totemCustomerId: options.CUSTOMER_ID });
 
     query.where({'attendees.external': { $in : personIds }});
     query.where({ startTime: { $gte: options.after }});
     query.where({ startTime: { $lte: options.before }});
+
     query.populate('attendees.internal', 'name title avatarUrl doNotDisplay');
     query.populate('attendees.external', 'name title avatarUrl doNotDisplay');
-    query.populate({
-      path: 'notes',
-      match: { customer: config.CUSTOMER_ID }
-    });
+    query.populate({ path: 'notes', match: { customer: options.CUSTOMER_ID } });
+
     query.deepPopulate([
       'notes.createdBy'
     ], {
       populate: {
         'notes.createdBy': { select: 'name avatarUrl title' }
       }
-    })
+    });
+
     query.sort(options.sort);
 
     if (options.attendee) { query.where({'attendees.internal': options.attendee}); }
@@ -138,19 +169,24 @@ module.exports = function(mongoose, config) {
 
     query.exec(cb);
 
-    // todo
-    //options.includeRecurring = options.includeRecurring || true;
-    //query.where({ recurring: options.recurring });
-
   };
 
-  Interaction.statics.getForPeopleLite = function getForPeopleLite(personIds, cb) {
+  Interaction.statics.getForPeopleLite = function getForPeopleLite(personIds, options, cb) {
 
     // This doesn't filter by customer so is only usable by admin tools
-    if (config.CUSTOMER_ID != 'GLOBAL_PROCESS') return cb(new Error('Access denied'), null);
 
-    var self = this;
-    var query = self.find({'attendees.external': { $in : personIds }});
+    let self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!personIds) { return cb(new Error('personIds is required'), null); }
+    if (!options) { return cb(new Error('options is required'), null); }
+
+    options = helpers.getDefaultOptions(options);
+
+    if (!options.isWorkerProcess) { return cb(null, []); }
+
+    let query = self.find({'attendees.external': { $in : personIds }});
+
     query.exec(cb);
 
   };
@@ -161,6 +197,11 @@ module.exports = function(mongoose, config) {
     // Typically used to get the last interaction the firm had with an org
     // So you'd pass in the id of the customer and a list of the people at an org and get back the most recent interaction
 
+    if (!cb) { throw new Error('cb is required'); }
+    if (!personIds) { return cb(new Error('personIds is required'), 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); }
+
     var self = this;
 
     var query = self
@@ -174,13 +215,19 @@ module.exports = function(mongoose, config) {
 
   Interaction.statics.getNotes = function getNotes(personIds, options, cb) {
 
+    if (!cb) { throw new Error('cb is required'); }
+    if (!personIds) { return cb(new Error('personIds is required'), null); }
+    if (!options) { return cb(new Error('options is required'), null); }
+    if (!options.CUSTOMER_ID) { return cb(new Error('CUSTOMER_ID is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('CUSTOMER_ID is not a valid ObjectId'), null); }
+
     var self = this;
-    var query = self.find({ totemCustomerId: config.CUSTOMER_ID });
+    var query = self.find({ totemCustomerId: options.CUSTOMER_ID });
 
     query.where({'attendees.external': { $in : personIds }});
     query.populate({
       path: 'notes',
-      match: { customer: config.CUSTOMER_ID }
+      match: { customer: options.CUSTOMER_ID }
     });
     query.deepPopulate([
       'notes.createdBy'
@@ -201,11 +248,11 @@ module.exports = function(mongoose, config) {
 
     if (!cb) throw new Error('cb is required');
     if (!id) { return cb(new Error('id is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(id)) { return cb(new Error('id is not a valid ObjectId'), null); }
     if (!update) { return cb(new Error('update is required'), null); }
 
     var self = this;
 
-    // https://mongoosejs.com/docs/api.html#model_Model.findOneAndUpdate
     // options runValidators defaults false which is ok since we have upsert false
     // new returns the updated document
 
@@ -215,6 +262,7 @@ module.exports = function(mongoose, config) {
 
   Interaction.statics.upsert = function upsert(interaction, cb) {
 
+    if (!cb) { throw new Error('cb is required'); }
     if (!interaction) { return cb(new Error('Interaction is required'), null); }
 
     interaction.save(cb);
@@ -222,7 +270,6 @@ module.exports = function(mongoose, config) {
   };
 
   Interaction.set('autoIndex', false);
-  Interaction.set('usePushEach', true);
   Interaction.on('index', function(err) { console.log('error building interaction indexes: ' + err); });
 
   var deepPopulate = require('mongoose-deep-populate')(mongoose);

package/lib/Investment.js

@@ -63,8 +63,7 @@ module.exports = function(mongoose, config) {
     // Catch-all for customer specific key-value pairs from sheet that aren't supported by our schema
     details: [{
       key: { type: String, trim: true, required: true },
-      value: { type: Schema.Types.Mixed, required: true },
-      format: { type: String, enum: [null, 'number', 'decimal', 'money', 'percentage', 'date']},
+      value: { type: String, trim: true, required: true },
       _id: false
     }],
 
@@ -110,14 +109,14 @@ module.exports = function(mongoose, config) {
     // post-remove hooks only fire on document.remove not schema.remove, hence the loop below to call
     // remove on each matching investment.
 
-    var self = this;
+    let self = this;
 
     self
-      .find({customer: customerId})
+      .find({ customer: customerId })
       .select('_id')
       .exec(function(err, investments) {
 
-        if (err) return cb(err, null);
+        if (err) { return cb(err, null); }
 
         async.each(investments, function(investment, callback) {
           investment.remove(callback);
@@ -130,10 +129,6 @@ module.exports = function(mongoose, config) {
   };
 
   Investment.statics.upsert = function upsert(investment, cb) {
-
-    // Required for mixed types
-    investment.markModified('details');
-
     if (!investment) { return cb(new Error('investment is required'), null); }
     investment.save(cb);
   };
@@ -171,7 +166,6 @@ module.exports = function(mongoose, config) {
   ///////////////////////////////////////////////////////////////////////////////////////
 
   Investment.set('toJSON', { virtuals: true });
-  Investment.set('usePushEach', true);
   Investment.set('autoIndex', false);
 
   Investment.on('index', function(err) { console.log('error building Investment indexes: ' + err); });