@dhyasama/totem-models 7.58.0 → 8.0.1

package/lib/Message.js

@@ -2,17 +2,15 @@
 
 module.exports = function(mongoose, config) {
 
-  var
+  let
 
     Schema = mongoose.Schema,
-    env = process.env.NODE_ENV || 'development',
-    _ = require('underscore'),
     async = require('async'),
-    moment = require('moment'),
+    helpers = require('../helpers'),
     Document = mongoose.model('Document'),
     Note = mongoose.model('Note');
 
-  var Message = new Schema({
+  let Message = new Schema({
 
     createdOn: { type: Date, required: true },
     updatedOn: { type: Date, required: true },
@@ -42,7 +40,7 @@ module.exports = function(mongoose, config) {
     // the original message date isn't always contained
     // in the email. In its absence, use created on.
 
-    var self = this;
+    const self = this;
 
     return self.originalMessageDate || self.createdOn;
 
@@ -68,7 +66,7 @@ module.exports = function(mongoose, config) {
 
   Message.statics.delete = function(messageId, customerId, cb) {
 
-    var self = this;
+    const self = this;
 
     self.findOneAndRemove({
       '_id': messageId,
@@ -81,9 +79,9 @@ module.exports = function(mongoose, config) {
 
     // Delete the doc itself along with any references
 
-    var self = this;
+    const self = this;
 
-    var removeReferences = function removeReferences(callback) {
+    let removeReferences = function removeReferences(callback) {
       self.update({}, {
         $pull: { 'documents' : [docId] }
       }, callback);
@@ -102,9 +100,9 @@ module.exports = function(mongoose, config) {
 
     // Delete the note itself along with any references
 
-    var self = this;
+    const self = this;
 
-    var removeReferences = function removeReferences(callback) {
+    let removeReferences = function removeReferences(callback) {
       self.update({}, {
         $pull: { 'notes' : [noteId] }
       }, callback);
@@ -121,13 +119,19 @@ module.exports = function(mongoose, config) {
 
   Message.statics.getDocuments = function getDocuments(personIds, options, cb) {
 
-    var self = this;
-    var query = self.find({ customer: config.CUSTOMER_ID });
+    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); }
+
+    const self = this;
+    let query = self.find({ customer: options.CUSTOMER_ID });
 
     query.where({'attendees.external': { $in : personIds }});
     query.populate({
       path: 'documents',
-      match: { customer: config.CUSTOMER_ID }
+      match: { customer: options.CUSTOMER_ID }
     });
     query.deepPopulate([
       'documents.createdBy'
@@ -136,56 +140,78 @@ module.exports = function(mongoose, config) {
         'documents.createdBy': { select: 'name avatarUrl title' }
       }
     });
+
     query.exec(cb);
 
   };
 
-  Message.statics.getById = function getById(id, cb) {
+  Message.statics.getById = function getById(id, options, cb) {
+
+    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 (!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;
-    var query = self.findOne({
+    const self = this;
+    let query = self.findOne({
       _id: id,
-      customer: config.CUSTOMER_ID
+      customer: options.CUSTOMER_ID
     });
     query.populate('organization', 'name logoUrl');
     query.populate('recipients.internal', 'name avatarUrl title doNotDisplay');
     query.populate('recipients.external', 'name avatarUrl title doNotDisplay');
     query.populate({
       path: 'notes',
-      match: { customer: config.CUSTOMER_ID }
+      match: { customer: options.CUSTOMER_ID }
     });
     query.populate({
       path: 'documents',
-      match: { customer: config.CUSTOMER_ID }
+      match: { customer: options.CUSTOMER_ID }
     });
+
     query.exec(cb);
 
   };
 
   Message.statics.getForCustomer = function getForCustomer(customerId, cb) {
 
-    var self = this;
-    var query = self.find({ customer: customerId });
+    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); }
+
+    const self = this;
+    let query = self.find({ customer: customerId });
+
     query.exec(cb);
 
   };
 
   Message.statics.getForOrg = function getForOrg(orgId, 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 (!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 (!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); }
+
+    // Note - This filters by customer so is NOT usable by admin tools
+
+    const self = this;
+
+    let query = self.find({ customer: options.CUSTOMER_ID, organization: orgId });
 
-    var self = this;
-    var query = self.find({ customer: config.CUSTOMER_ID, organization: orgId });
     query.populate('recipients.internal', 'name title avatarUrl doNotDisplay');
     query.populate('recipients.external', 'name title avatarUrl doNotDisplay');
     query.populate({
       path: 'notes',
-      match: { customer: config.CUSTOMER_ID }
+      match: { customer: options.CUSTOMER_ID }
     });
     query.populate({
       path: 'documents',
-      match: { customer: config.CUSTOMER_ID }
+      match: { customer: options.CUSTOMER_ID }
     });
     query.deepPopulate([
       'notes.createdBy',
@@ -196,28 +222,35 @@ module.exports = function(mongoose, config) {
         'documents.createdBy': { select: 'name avatarUrl title' }
       }
     });
+
     query.exec(cb);
 
   };
 
   Message.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); }
+
+    // Note: This filters by customer so is NOT usable by admin tools
 
-    var self = this;
-    var query = self.find({ customer: config.CUSTOMER_ID });
+    const self = this;
+
+    let query = self.find({ customer: options.CUSTOMER_ID });
 
     query.where({'recipients.external': { $in : personIds }});
     query.populate('recipients.internal', 'name title avatarUrl doNotDisplay');
     query.populate('recipients.external', 'name title avatarUrl doNotDisplay');
     query.populate({
       path: 'notes',
-      match: { customer: config.CUSTOMER_ID }
+      match: { customer: options.CUSTOMER_ID }
     });
     query.populate({
       path: 'documents',
-      match: { customer: config.CUSTOMER_ID }
+      match: { customer: options.CUSTOMER_ID }
     });
     query.deepPopulate([
       'notes.createdBy',
@@ -228,30 +261,45 @@ module.exports = function(mongoose, config) {
         'documents.createdBy': { select: 'name avatarUrl title' }
       }
     });
+
     query.exec(cb);
 
   };
 
-  Message.statics.getForPeopleLite = function getForPeopleLite(personIds, cb) {
+  Message.statics.getForPeopleLite = function getForPeopleLite(personIds, options, cb) {
+
+    // Note - This doesn't filter by customer so is only usable by admin tools
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!personIds) { return cb(new Error('personIds is required'), null); }
+
+    options = helpers.getDefaultOptions(options);
+
+    if (!options.isWorkerProcess) { return cb(null, []); }
 
-    // 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);
+    const self = this;
+
+    let query = self.find({'recipients.external': { $in : personIds }});
 
-    var self = this;
-    var query = self.find({'recipients.external': { $in : personIds }});
     query.exec(cb);
 
   };
 
   Message.statics.getNotes = function getNotes(personIds, options, cb) {
 
-    var self = this;
-    var query = self.find({ customer: config.CUSTOMER_ID });
+    if (!cb) { throw new Error('cb is required'); }
+    if (!personIds) { return cb(new Error('fundId 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); }
+
+    const self = this;
+    let query = self.find({ customer: 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'
@@ -260,14 +308,15 @@ module.exports = function(mongoose, config) {
         'notes.createdBy': { select: 'name avatarUrl title' }
       }
     });
+
     query.exec(cb);
 
   };
 
   Message.statics.getUnprocessedDeals = function getUnprocessedDeals(customerId, cb) {
 
-    var self = this;
-    var query = self.find({
+    const self = this;
+    let query = self.find({
       customer: customerId,
       subtype: 'deals',
       organization: null
@@ -276,14 +325,15 @@ module.exports = function(mongoose, config) {
       path: 'documents',
       match: { customer: customerId }
     });
+
     query.exec(cb);
 
   };
 
   Message.statics.getUnprocessedPortfolio = function getUnprocessedPortfolio(customerId, cb) {
 
-    var self = this;
-    var query = self.find({
+    const self = this;
+    let query = self.find({
       customer: customerId,
       subtype: 'portfolio',
       organization: { $exists: false }
@@ -292,6 +342,7 @@ module.exports = function(mongoose, config) {
       path: 'documents',
       match: { customer: customerId }
     });
+
     query.exec(cb);
 
   };
@@ -305,9 +356,8 @@ module.exports = function(mongoose, config) {
     if (!id) { return cb(new Error('id is required'), null); }
     if (!update) { return cb(new Error('update is required'), null); }
 
-    var self = this;
+    const 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
 
@@ -317,7 +367,7 @@ module.exports = function(mongoose, config) {
 
   Message.statics.upsert = function(message, cb) {
 
-    var timestamp = new Date();
+    const timestamp = new Date();
 
     message.createdOn = message.createdOn || timestamp;
     message.updatedOn = timestamp;
@@ -329,10 +379,9 @@ module.exports = function(mongoose, config) {
   ///////////////////////////////////////
 
   Message.set('autoIndex', false);
-  Message.set('usePushEach', true);
   Message.set('toJSON', { virtuals: true });
 
-  var deepPopulate = require('mongoose-deep-populate')(mongoose);
+  let deepPopulate = require('mongoose-deep-populate')(mongoose);
   Message.plugin(deepPopulate);
 
   mongoose.model('Message', Message);

package/lib/News.js

@@ -2,10 +2,9 @@
 
 module.exports = function(mongoose, config) {
 
-  var
+  let
 
     Schema = mongoose.Schema,
-    env = process.env.NODE_ENV || 'development',
     _ = require('underscore'),
 
     News = new Schema({
@@ -35,29 +34,6 @@ module.exports = function(mongoose, config) {
 
     });
 
-  News.statics.getById = function (id, cb) {
-
-    this
-      .findById(id)
-      .populate('org')
-      .exec(cb);
-
-  };
-
-  News.statics.list = function (cb) {
-
-    this
-      .find()
-      .populate('org')
-      .sort('-createdOn')
-      .exec(cb);
-
-  };
-
-  News.statics.listForCompanies = function listForCompanies(orgids, cb) {
-    this.find({ 'org': { $in : orgids }, 'deleted': {$ne: true} }).exec(cb);
-  };
-
   News.statics.listForCompany = function (id, cb) {
 
     this
@@ -68,26 +44,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  News.statics.listForCompanyBySlug = function (slug, cb) {
-
-    this
-      .find()
-      .populate('org')
-      .sort('-createdOn')
-      .exec(function (err, news) {
-
-        if (err) { return cb(err, null); }
-
-        var filtered = _.filter(news, function(item) {
-          return item.org && item.org.slug == slug;
-        });
-
-        return cb(null, filtered);
-
-      });
-
-  };
-
   News.statics.modifyById = function(id, update, cb) {
 
     // VERY IMPORTANT NOTE
@@ -112,15 +68,7 @@ module.exports = function(mongoose, config) {
     news.save(cb);
   };
 
-  News.statics.delete = function(id, cb) {
-    this.getById(id, function(err, item) {
-      if (err) return cb(err, null);
-      item.remove(cb);
-    });
-  };
-
   News.set('autoIndex', false);
-  News.set('usePushEach', true);
   News.on('index', function(err) { console.log('error building news indexes: ' + err); });
 
   mongoose.model('News', News);

package/lib/Note.js

@@ -2,16 +2,12 @@
 
 module.exports = function(mongoose, config) {
 
-  var
+  let
 
     Schema = mongoose.Schema,
-    env = process.env.NODE_ENV || 'development',
-    async = require('async'),
-    _ = require('underscore'),
-    postFind = require('mongoose-post-find'),
     querystring = require('querystring');
 
-  var Note = new Schema({
+  let Note = new Schema({
 
     customer: { type: Schema.ObjectId, ref: 'Organization', index: true, required: true },
 
@@ -25,8 +21,44 @@ module.exports = function(mongoose, config) {
 
   });
 
+  Note.statics.delete = function(noteId, customerId, cb) {
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!noteId) { throw new Error('noteId is required'); }
+    if (!mongoose.Types.ObjectId.isValid(noteId)) { return cb(new Error('noteId 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); }
+
+    const self = this;
+
+    // Not strictly necessary but provides verification that the note being deleted belongs to the customer doing the deleting
+
+    let query = self.findOne({
+      '_id': noteId,
+      'customer': customerId
+    });
+
+    query.exec(function(err, note) {
+
+      if (err) return cb(err, null);
+      else if (!note) return cb(null, null);
+
+      note.remove(cb);
+
+    });
+
+  };
+
   Note.statics.createForModel = function(note, Model, modelId, cb) {
 
+    if (!cb) { throw new Error('cb is required'); }
+    if (!note) { return cb(new Error('note is required'), null); }
+    if (!Model) { return cb(new Error('Model is required'), null); }
+    if (!modelId) { return cb(new Error('modelId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(modelId)) { return cb(new Error('modelId is not a valid ObjectId'), null); }
+
+    const self = this;
+
     var addToModel = function(err, createdNote) {
       if (err) return cb(err, null);
       Model.findByIdAndUpdate(modelId, { $push: { notes: createdNote }}, { new: true, upsert: false }, function(err, addedTo) {
@@ -38,58 +70,51 @@ module.exports = function(mongoose, config) {
     };
 
     note.createdOn = new Date();
-    note.customer = config.CUSTOMER_ID;
 
-    this.create(note, addToModel);
+    self.create(note, addToModel);
 
   };
 
-  // Note.statics.getByCreator = function(personId, cb) {
-  //   this.find({ 'createdBy': personId }).exec(cb);
-  // };
-
-  Note.statics.getById = function(id, cb) {
-    this.findOne({
-      '_id': id,
-      'customer': config.CUSTOMER_ID
-    }).exec(cb);
-  };
+  Note.statics.getById = function(id, options, cb) {
 
-  Note.statics.delete = function(noteId, cb) {
+    if (!cb) { throw new Error('cb is required'); }
+    if (!id) { throw new Error('id is required'); }
+    if (!mongoose.Types.ObjectId.isValid(id)) { return cb(new Error('id is not a valid ObjectId'), 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;
-
-    // Not strictly necessary but provides verification that the note being deleted belongs to the customer doing the deleting
-    self.findOne({
-      '_id': noteId,
-      'customer': config.CUSTOMER_ID
-    }, function(err, note) {
-
-      if (err) return cb(err, null);
-      else if (!note) return cb(null, null);
-
-      note.remove(cb);
+    const self = this;
 
+    let query = self.findOne({
+      '_id': id,
+      'customer': options.CUSTOMER_ID
     });
 
+    query.exec(cb);
+
   };
 
-  Note.statics.modifyById = function(id, update, cb) {
+  Note.statics.modifyById = function(id, update, options, cb) {
 
     // VERY IMPORTANT NOTE
     // findByIdAndUpdate and findOneAndUpdate do not trigger pre-save hook so that code will not run here
 
-    if (!cb) throw new Error('cb is required');
+    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); }
+    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;
+    const 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
 
-    self.findByIdAndUpdate(id, update, { upsert: false, new: true }, cb);
+    self.findOneAndUpdate({ _id: id, customer: options.CUSTOMER_ID }, update, { upsert: false, new: true }, cb);
 
   };
 
@@ -102,38 +127,7 @@ module.exports = function(mongoose, config) {
     self.text = querystring.unescape(self.text);
   });
 
-  Note.plugin(postFind, {
-
-    find: function(results, done) {
-
-      var CUSTOMER_ID = config.CUSTOMER_ID;
-
-      if (CUSTOMER_ID == 'GLOBAL_PROCESS') return done(null, results);
-
-      // Reject any item that is for a different customer
-      results = _.reject(results, function(item) {
-        return item.customer.toString() != CUSTOMER_ID;
-      });
-
-      return done(null, results);
-
-    },
-
-    findOne: function(result, done) {
-
-      var CUSTOMER_ID = config.CUSTOMER_ID;
-
-      if (!result) return done(null, null);
-      else if (CUSTOMER_ID == 'GLOBAL_PROCESS') return done(null, result);
-      else if (result.customer.toString() == CUSTOMER_ID) return done(null, result);
-      else return done(null, null);
-
-    }
-
-  });
-
   Note.set('autoIndex', false);
-  Note.set('usePushEach', true);
   Note.on('index', function(err) { console.log('error building note indexes: ' + err); });
 
   mongoose.model('Note', Note);