@dhyasama/totem-models 7.57.0 → 8.0.0

package/lib/Document.js

@@ -1,14 +1,11 @@
-"use strict";
+'use strict';
 
 module.exports = function(mongoose, config) {
 
   var
 
     Schema = mongoose.Schema,
-    env = process.env.NODE_ENV || 'development',
-    s3 = require('@dhyasama/ffvc-s3'),
-    utils = require('@dhyasama/ffvc-utilities'),
-    postFind = require('mongoose-post-find'),
+    utilities = require('@dhyasama/ffvc-utilities'),
     _ = require('underscore');
 
   var Document = new Schema({
@@ -50,14 +47,14 @@ module.exports = function(mongoose, config) {
 
     // Probably an Exchange file
     // Exchange creates files such as ATT00001.htm and ATT00002.txt, one for each attachment
-    if (name.indexOf('ATT00') == 0) return true;
+    if (name.indexOf('ATT00') === 0) return true;
 
     // Google Calendar invitation
     // No need to show since it's in-lined
-    else if (name == 'INVITE.ICS' || name == 'INVITATION.ICS') return true;
+    else if (name === 'INVITE.ICS' || name === 'INVITATION.ICS') return true;
 
     // Probably a signature logo
-    else if (name.indexOf('IMAGE0') == 0 && contentLength < 3000) return true;
+    else if (name.indexOf('IMAGE0') === 0 && contentLength < 3000) return true;
 
     else return false;
 
@@ -79,7 +76,7 @@ module.exports = function(mongoose, config) {
   ///////////////////////////////////////////////////////////////////////////////////////
 
   Document.methods.friendlyFilesize = function() {
-    return utils.humanizeFilesize(this.contentLength);
+    return utilities.humanizeFilesize(this.contentLength);
   };
 
 
@@ -91,6 +88,8 @@ module.exports = function(mongoose, config) {
 
   Document.statics.createForModel = function(doc, Model, modelId, cb) {
 
+    // No population so no need to scrub
+
     var addToModel = function(err, createdDoc) {
       if (err) return cb(err, null);
       Model.findByIdAndUpdate(modelId, { $push: { documents: createdDoc }}, { new: true, upsert: false }, function(err, addedTo) {
@@ -107,52 +106,83 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Document.statics.delete = function(id, cb) {
+  Document.statics.delete = function(id, options, cb) {
 
-    var self = this;
+    let self = this;
+
+    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); }
 
     // Not strictly necessary but provides verification that the document being deleted belongs to the customer doing the deleting
-    self.findOne({
+
+    let query = self.findOne({
       '_id': id,
-      'customer': config.CUSTOMER_ID
-    }, function(err, doc) {
+      'customer': options.CUSTOMER_ID
+    });
+
+    query.exec(function(err, doc) {
 
       if (err) return cb(err, null);
       else if (!doc) return cb(null, null);
 
+      // No population so no need to scrub
+
       doc.remove(cb);
 
     });
 
   };
 
-  Document.statics.getById = function (id, cb) {
+  Document.statics.getById = function (id, options, cb) {
 
-    var self = this;
+    let self = this;
 
-    self.findOne({
+    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); }
+
+    let query = self.findOne({
       '_id': id,
-      'customer': config.CUSTOMER_ID
-    }).exec(cb);
-  
+      'customer': options.CUSTOMER_ID
+    });
+
+    // No population so no need to scrub
+
+    query.exec(cb);
+
   };
 
-  Document.statics.modifyById = function(id, update, cb) {
+  Document.statics.modifyById = function(id, update, options, cb) {
+
+    let self = this;
 
     // 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); }
-
-    var self = this;
+    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); }
 
     // 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);
+    let query = self.findOneAndUpdate({ _id: id, customer: options.CUSTOMER_ID }, update, { upsert: false, new: true });
+
+    // No population so no need to scrub
+
+    query.exec(cb);
 
   };
 
@@ -160,40 +190,12 @@ module.exports = function(mongoose, config) {
 
     if (!doc) { return cb(new Error('doc is required'), null); }
 
+    // No population so no need to scrub
+
     doc.save(cb);
 
   };
 
-  Document.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);
-
-    }
-
-  });
-
 
 
   ///////////////////////////////////////////////////////////////////////////////////////
@@ -202,7 +204,6 @@ module.exports = function(mongoose, config) {
 
   Document.set('toJSON', { virtuals: true });
   Document.set('autoIndex', false);
-  Document.set('usePushEach', true);
   Document.on('index', function(err) { console.log('error building document indexes: ' + err); });
 
   mongoose.model('Document', Document);