@dhyasama/totem-models 12.5.0 → 12.7.0

package/lib/Account.js

@@ -110,7 +110,7 @@ module.exports = function(mongoose, config) {
         const account = await this.findOne(query).populate('person').lean({ virtuals: true });
         if (!account) { return null; }
 
-        if (account.populated('person')) {
+        if (account.person && typeof account.person === 'object') {
 
           if (account.org) { helpers.cleanPerson(account.person, account.org); }
           else { account.person.sources = []; }
@@ -147,7 +147,7 @@ module.exports = function(mongoose, config) {
 
       _.each(accounts, function(account) {
 
-        if (account.populated('person')) {
+        if (account.person && typeof account.person === 'object') {
 
           if (account.org) { helpers.cleanPerson(account.person, account.org); }
           else { account.person.sources = []; }
@@ -176,15 +176,15 @@ module.exports = function(mongoose, config) {
       query.populate('org');
 
       const account = await query.lean({ virtuals: true });
-      if (account && account.populated('person') && account.populated('org')) {
+      if (account && account.person && typeof account.person === 'object' && account.org && typeof account.org === 'object') {
 
         // Scrub customer info before returning
 
-        let customerId = account.populated('org');
+        let customerId = account.org._id;
 
-        if (account.populated('org')) { helpers.cleanOrg(account.org, customerId); }
+        if (account.org && typeof account.org === 'object') { helpers.cleanOrg(account.org, customerId); }
 
-        if (account.populated('person')) { helpers.cleanPerson(account.person, customerId); }
+        if (account.person && typeof account.person === 'object') { helpers.cleanPerson(account.person, customerId); }
 
         return account;
 
@@ -391,7 +391,11 @@ module.exports = function(mongoose, config) {
     // No population so no need to scrub
 
     const run = async () => {
-      const result = await account.save();
+      if (typeof account.save === 'function') {
+        return await account.save();
+      }
+      const { _id, ...update } = account;
+      const result = await this.findByIdAndUpdate(_id, update, { new: true });
       return result;
     };
 

package/lib/Activity.js

@@ -78,7 +78,7 @@ module.exports = function(mongoose, config) {
       }
     };
 
-    if (typeof callback === 'function') { run().then(result => callback(null, result)).catch(callback); }
+    if (typeof callback === 'function') { run().then(result => callback(null, result)).catch(callback); return; }
     else { return run(); }
 
   };

package/lib/CalendarEvent.js

@@ -218,6 +218,10 @@ module.exports = function(mongoose, config) {
   CalendarEvent.statics.upsert = function(calendarEvent, cb) {
 
     const run = async () => {
+      if (typeof calendarEvent.save === 'function') {
+        return await calendarEvent.save();
+      }
+
       // Prevent dupe events
 
       var query = { 'email': calendarEvent.email, 'eventId': calendarEvent.eventId };

package/lib/CapTable.js

@@ -503,8 +503,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!capTable) { throw new Error('cap table is required'); }
 
-      const result = await capTable.save();
-      return result;
+      if (typeof capTable.save === 'function') {
+        return await capTable.save();
+      }
+      const { _id, ...update } = capTable;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Deal.js

@@ -829,10 +829,15 @@ module.exports = function(mongoose, config) {
       }
 
       // Required for mixed types
-      deal.markModified('customFields');
+      if (typeof deal.markModified === 'function') {
+        deal.markModified('customFields');
+      }
 
-      const result = await deal.save();
-      return result;
+      if (typeof deal.save === 'function') {
+        return await deal.save();
+      }
+      const { _id, ...update } = deal;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/DiffbotArticle.js

@@ -61,9 +61,12 @@ module.exports = function(mongoose, config) {
 
     const run = async () => {
       doc.updatedOn = new Date();
-      doc.markModified('entity');
-      const result = await doc.save();
-      return result;
+      if (typeof doc.save === 'function') {
+        doc.markModified('entity');
+        return await doc.save();
+      }
+      const { _id, ...update } = doc;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/DiffbotOrganization.js

@@ -60,9 +60,12 @@ module.exports = function(mongoose, config) {
 
     const run = async () => {
       doc.updatedOn = new Date();
-      doc.markModified('entity');
-      const result = await doc.save();
-      return result;
+      if (typeof doc.save === 'function') {
+        doc.markModified('entity');
+        return await doc.save();
+      }
+      const { _id, ...update } = doc;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Document.js

@@ -275,8 +275,11 @@ module.exports = function(mongoose, config) {
 
       // No population so no need to scrub
 
-      const result = await doc.save();
-      return result;
+      if (typeof doc.save === 'function') {
+        return await doc.save();
+      }
+      const { _id, ...update } = doc;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Event.js

@@ -148,8 +148,11 @@ module.exports = function(mongoose, config) {
       if (!event) throw new Error('event is required');
       if (!options) { throw new Error('options is required'); }
 
-      const result = await event.save();
-      return result;
+      if (typeof event.save === 'function') {
+        return await event.save();
+      }
+      const { _id, ...update } = event;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/EventAttendee.js

@@ -134,8 +134,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!eventAttendee) throw new Error('eventAttendee is required');
 
-      const result = await eventAttendee.save();
-      return result;
+      if (typeof eventAttendee.save === 'function') {
+        return await eventAttendee.save();
+      }
+      const { _id, ...update } = eventAttendee;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Financials.js

@@ -1230,8 +1230,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!financials) { throw new Error('financials is required'); }
 
-      const result = await financials.save();
-      return result;
+      if (typeof financials.save === 'function') {
+        return await financials.save();
+      }
+      const { _id, ...update } = financials;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/FinancialsAnalysis.js

@@ -108,8 +108,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!doc) { throw new Error('doc is required'); }
 
-      const result = await doc.save();
-      return result;
+      if (typeof doc.save === 'function') {
+        return await doc.save();
+      }
+      const { _id, ...update } = doc;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Flag.js

@@ -114,8 +114,11 @@ module.exports = function(mongoose, config) {
   Flag.statics.upsert = function(flag, cb) {
 
     const run = async () => {
-      const result = await flag.save();
-      return result;
+      if (typeof flag.save === 'function') {
+        return await flag.save();
+      }
+      const { _id, ...update } = flag;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Folder.js

@@ -67,8 +67,11 @@ module.exports = function(mongoose, config) {
   Folder.statics.upsert = function (folder, cb) {
 
     const run = async () => {
-      const result = await folder.save();
-      return result;
+      if (typeof folder.save === 'function') {
+        return await folder.save();
+      }
+      const { _id, ...update } = folder;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Fund.js

@@ -212,11 +212,13 @@ module.exports = function(mongoose, config) {
       if (!fund) { throw new Error('Fund is required'); }
       if (!username) { throw new Error('Username is required'); }
 
-      // Required for mixed types
-      fund.markModified('customFields');
-
-      const result = await fund.save();
-      return result;
+      if (typeof fund.save === 'function') {
+        // Required for mixed types
+        fund.markModified('customFields');
+        return await fund.save();
+      }
+      const { _id, ...update } = fund;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Interaction.js

@@ -429,8 +429,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!interaction) { throw new Error('Interaction is required'); }
 
-      const result = await interaction.save();
-      return result;
+      if (typeof interaction.save === 'function') {
+        return await interaction.save();
+      }
+      const { _id, ...update } = interaction;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Investment.js

@@ -146,13 +146,15 @@ module.exports = function(mongoose, config) {
   Investment.statics.upsert = function upsert(investment, cb) {
 
     const run = async () => {
-      // Required for mixed types
-      investment.markModified('details');
-
       if (!investment) { throw new Error('investment is required'); }
 
-      const result = await investment.save();
-      return result;
+      if (typeof investment.save === 'function') {
+        // Required for mixed types
+        investment.markModified('details');
+        return await investment.save();
+      }
+      const { _id, ...update } = investment;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/LimitedPartner.js

@@ -889,15 +889,18 @@ module.exports = function(mongoose, config) {
       if (!options.role) { throw new Error('options.role is required'); }
       if (options.role !== 'admin' && options.role !== 'lp-full') { throw new Error('options.role is not valid'); }
 
+      lp.entered = lp.entered || {};
       lp.entered.by = username;
       lp.entered.on = new Date();
 
-      // Required for mixed types
-      lp.markModified('details');
-      lp.markModified('customFields');
-
-      const result = await lp.save();
-      return result;
+      if (typeof lp.save === 'function') {
+        // Required for mixed types
+        lp.markModified('details');
+        lp.markModified('customFields');
+        return await lp.save();
+      }
+      const { _id, ...update } = lp;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/LimitedPartnerCampaign.js

@@ -167,8 +167,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!doc) { throw new Error('doc is required'); }
 
-      const result = await doc.save();
-      return result;
+      if (typeof doc.save === 'function') {
+        return await doc.save();
+      }
+      const { _id, ...update } = doc;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/LimitedPartnerCommunication.js

@@ -260,8 +260,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!doc) { throw new Error('doc is required'); }
 
-      const result = await doc.save();
-      return result;
+      if (typeof doc.save === 'function') {
+        return await doc.save();
+      }
+      const { _id, ...update } = doc;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/LimitedPartnerContactGroup.js

@@ -94,8 +94,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!doc) { throw new Error('doc is required'); }
 
-      const result = await doc.save();
-      return result;
+      if (typeof doc.save === 'function') {
+        return await doc.save();
+      }
+      const { _id, ...update } = doc;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/LimitedPartnerReportGenerator.js

@@ -73,8 +73,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!doc) { throw new Error('doc is required'); }
 
-      const result = await doc.save();
-      return result;
+      if (typeof doc.save === 'function') {
+        return await doc.save();
+      }
+      const { _id, ...update } = doc;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/List.js

@@ -245,8 +245,11 @@ module.exports = function(mongoose, config) {
   List.statics.upsert = function (list, cb) {
 
     const run = async () => {
-      const result = await list.save();
-      return result;
+      if (typeof list.save === 'function') {
+        return await list.save();
+      }
+      const { _id, ...update } = list;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Meeting.js

@@ -178,8 +178,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!meeting) { throw new Error('Meeting is required'); }
 
-      const result = await meeting.save();
-      return result;
+      if (typeof meeting.save === 'function') {
+        return await meeting.save();
+      }
+      const { _id, ...update } = meeting;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Message.js

@@ -452,8 +452,11 @@ module.exports = function(mongoose, config) {
       // 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;
 
-      const result = await message.save();
-      return result;
+      if (typeof message.save === 'function') {
+        return await message.save();
+      }
+      const { _id, ...update } = message;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/MessageRecipient.js

@@ -88,8 +88,11 @@ module.exports = function(mongoose, config) {
   MessageRecipient.statics.upsert = function(message, cb) {
 
     const run = async () => {
-      const result = await message.save();
-      return result;
+      if (typeof message.save === 'function') {
+        return await message.save();
+      }
+      const { _id, ...update } = message;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/News.js

@@ -115,8 +115,11 @@ module.exports = function(mongoose, config) {
   News.statics.upsert = function (news, cb) {
 
     const run = async () => {
-      const result = await news.save();
-      return result;
+      if (typeof news.save === 'function') {
+        return await news.save();
+      }
+      const { _id, ...update } = news;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Note.js

@@ -125,8 +125,11 @@ module.exports = function(mongoose, config) {
   Note.statics.upsert = function(note, cb) {
 
     const run = async () => {
-      const result = await note.save();
-      return result;
+      if (typeof note.save === 'function') {
+        return await note.save();
+      }
+      const { _id, ...update } = note;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Organization.js

@@ -2282,8 +2282,11 @@ module.exports = function(mongoose, config) {
       // Clean up missing references
       //org.people = _.reject(org.people, function(item) { return !item.person; });
 
-      const result = await org.save();
-      return result;
+      if (typeof org.save === 'function') {
+        return await org.save();
+      }
+      const { _id, ...update } = org;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Person.js

@@ -1072,8 +1072,11 @@ module.exports = function(mongoose, config) {
         on: new Date()
       };
 
-      const result = await currentPerson.save();
-      return result;
+      if (typeof currentPerson.save === 'function') {
+        return await currentPerson.save();
+      }
+      const { _id, ...update } = currentPerson;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Rate.js

@@ -52,8 +52,11 @@ module.exports = function(mongoose, config) {
   Rate.statics.upsert = function (rate, cb) {
 
     const run = async () => {
-      const result = await rate.save();
-      return result;
+      if (typeof rate.save === 'function') {
+        return await rate.save();
+      }
+      const { _id, ...update } = rate;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Round.js

@@ -955,8 +955,11 @@ module.exports = function(mongoose, config) {
     const run = async () => {
       if (!round) { throw new Error('round is required'); }
 
-      const result = await round.save();
-      return result;
+      if (typeof round.save === 'function') {
+        return await round.save();
+      }
+      const { _id, ...update } = round;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Snapshot.js

@@ -28,8 +28,11 @@ module.exports = function(mongoose, config) {
   Snapshot.statics.upsert = function(snapshot, cb) {
 
     const run = async () => {
-      const result = await snapshot.save();
-      return result;
+      if (typeof snapshot.save === 'function') {
+        return await snapshot.save();
+      }
+      const { _id, ...update } = snapshot;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Sync.js

@@ -43,8 +43,11 @@ module.exports = function(mongoose, config) {
 
     const run = async () => {
       sync.syncedOn = new Date();
-      const result = await sync.save();
-      return result;
+      if (typeof sync.save === 'function') {
+        return await sync.save();
+      }
+      const { _id, ...update } = sync;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/lib/Webhook.js

@@ -20,8 +20,11 @@ module.exports = function(mongoose, config) {
 
     const run = async () => {
       webhook.createdOn = new Date();
-      const result = await webhook.save();
-      return result;
+      if (typeof webhook.save === 'function') {
+        return await webhook.save();
+      }
+      const { _id, ...update } = webhook;
+      return await this.findByIdAndUpdate(_id, update, { new: true });
     };
 
     if (typeof cb === 'function') { run().then(result => cb(null, result)).catch(cb); return; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "12.5.0",
+  "version": "12.7.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",