@dhyasama/totem-models 12.3.0 → 12.4.0

package/lib/News.js

@@ -42,9 +42,7 @@ module.exports = function(mongoose, config) {
 
     });
 
-  News.statics.getById = function getById(id, options, cb) {
-
-    const self = this;
+  News.statics.getById = async function getById(id, options, cb) {
 
     if (!cb) { throw new Error('cb is required'); }
     if (!id) { return cb(new Error('ids is required'), null); }
@@ -52,15 +50,16 @@ module.exports = function(mongoose, config) {
 
     options = helpers.getDefaultOptions(options);
 
-    self
-      .find({ org: id })
-      .populate('org')
-      .sort('-createdOn')
-      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+    try {
+      const result = await this.find({ org: id }).populate('org').sort('-createdOn');
+      return cb(null, result);
+    } catch(err) {
+      return cb(err);
+    }
 
   };
 
-  News.statics.getByIds = function getByIds(ids, options, cb) {
+  News.statics.getByIds = async function getByIds(ids, options, cb) {
 
     if (!cb) { throw new Error('cb is required'); }
     if (!ids) { return cb(new Error('ids is required'), null); }
@@ -68,9 +67,7 @@ module.exports = function(mongoose, config) {
 
     options = helpers.getDefaultOptions(options);
 
-    const self = this;
-
-    let query = self.find({ org: { $in : ids } })
+    let query = this.find({ org: { $in : ids } })
 
     if (options.startDate) {
       const startDate = options.startDate || moment().subtract(20, 'years').startOf('day').toISOString();
@@ -83,11 +80,17 @@ module.exports = function(mongoose, config) {
     }
 
     query.sort('-createdOn')
-    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+
+    try {
+      const result = await query;
+      return cb(null, result);
+    } catch(err) {
+      return cb(err);
+    }
 
   };
 
-  News.statics.modifyById = function(id, update, cb) {
+  News.statics.modifyById = async function(id, update, cb) {
 
     // VERY IMPORTANT NOTE
     // findByIdAndUpdate and findOneAndUpdate do not trigger pre-save hook so that code will not run here
@@ -96,18 +99,26 @@ 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); }
 
-    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 }).then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+    try {
+      const result = await this.findByIdAndUpdate(id, update, { upsert: false, new: true });
+      return cb(null, result);
+    } catch(err) {
+      return cb(err);
+    }
 
   };
 
-  News.statics.upsert = function (news, cb) {
-    news.save().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+  News.statics.upsert = async function (news, cb) {
+    try {
+      const result = await news.save();
+      return cb(null, result);
+    } catch(err) {
+      return cb(err);
+    }
   };
   News.set('autoIndex', false);
   News.on('index', function(err) { console.log('error building news indexes: ' + err); });

package/lib/Note.js

@@ -18,7 +18,7 @@ module.exports = function(mongoose, config) {
     title: { type: String, index: false, required: false, trim: true },
 
     text: { type: String, index: false, required: true, trim: true },
-    
+
     analysis: {
       insights: [{
         text: { type: String },
@@ -28,7 +28,7 @@ module.exports = function(mongoose, config) {
 
   });
 
-  Note.statics.delete = function(noteId, customerId, cb) {
+  Note.statics.delete = async function(noteId, customerId, cb) {
 
     if (!cb) { throw new Error('cb is required'); }
     if (!noteId) { throw new Error('noteId is required'); }
@@ -36,25 +36,26 @@ module.exports = function(mongoose, config) {
     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({
+    let query = this.findOne({
       '_id': noteId,
       'customer': customerId
     });
 
-    query.exec().then(function(note) {
+    try {
+      const note = await query;
       if (!note) return cb(null, null);
 
-      note.deleteOne().then(function() { cb(null, note); }).catch(function(err) { cb(err); });
-
-    }).catch(function(err) { cb(err); });
+      await note.deleteOne();
+      return cb(null, note);
+    } catch(err) {
+      return cb(err);
+    }
 
   };
 
-  Note.statics.createForModel = function(Model, modelId, note, cb) {
+  Note.statics.createForModel = async function(Model, modelId, note, cb) {
 
     if (!cb) { throw new Error('cb is required'); }
     if (!Model) { return cb(new Error('Model is required'), null); }
@@ -62,22 +63,17 @@ module.exports = function(mongoose, config) {
     if (!mongoose.Types.ObjectId.isValid(modelId)) { return cb(new Error('modelId is not a valid ObjectId'), null); }
     if (!note) { return cb(new Error('note is required'), 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 }).then(function(addedTo) {
-        return cb(null, createdNote);
-      }).catch(function(err) {
-        return cb(err);
-      });
-    };
-
-    self.create(note).then(function(created) { addToModel(null, created); }).catch(function(err) { addToModel(err); });
+    try {
+      const createdNote = await this.create(note);
+      await Model.findByIdAndUpdate(modelId, { $push: { notes: createdNote }}, { new: true, upsert: false });
+      return cb(null, createdNote);
+    } catch(err) {
+      return cb(err);
+    }
 
   };
 
-  Note.statics.getById = function(id, options, cb) {
+  Note.statics.getById = async function(id, options, cb) {
 
     if (!cb) { throw new Error('cb is required'); }
     if (!id) { throw new Error('id is required'); }
@@ -86,18 +82,21 @@ module.exports = function(mongoose, config) {
     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.findOne({
+    let query = this.findOne({
       '_id': id,
       'customer': options.CUSTOMER_ID
     });
 
-    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+    try {
+      const result = await query;
+      return cb(null, result);
+    } catch(err) {
+      return cb(err);
+    }
 
   };
 
-  Note.statics.modifyById = function(id, update, options, cb) {
+  Note.statics.modifyById = async function(id, update, options, cb) {
 
     // VERY IMPORTANT NOTE
     // findByIdAndUpdate and findOneAndUpdate do not trigger pre-save hook so that code will not run here
@@ -110,18 +109,26 @@ module.exports = function(mongoose, config) {
     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;
-
     // 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.findOneAndUpdate({ _id: id, customer: options.CUSTOMER_ID }, update, { upsert: false, new: true }).then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+    try {
+      const result = await this.findOneAndUpdate({ _id: id, customer: options.CUSTOMER_ID }, update, { upsert: false, new: true });
+      return cb(null, result);
+    } catch(err) {
+      return cb(err);
+    }
 
   };
 
-  Note.statics.upsert = function(note, cb) {
-    note.save().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+  Note.statics.upsert = async function(note, cb) {
+    try {
+      const result = await note.save();
+      return cb(null, result);
+    } catch(err) {
+      return cb(err);
+    }
   };
 
   Note.post('init', function(doc) {