@dhyasama/totem-models 7.48.0 → 7.50.1

package/lib/Deal.js

@@ -386,6 +386,7 @@ module.exports = function(mongoose, config) {
   // CONFIG
   ///////////////////////////////////////////////////////////////////////////////////////
 
+  Deal.set('usePushEach', true);
   Deal.set('toJSON', { virtuals: true });
   Deal.set('autoIndex', false);
   Deal.set('usePushEach', true);

package/lib/Financials.js

@@ -28,8 +28,6 @@ module.exports = function(mongoose, config) {
 
       uuid: { type: String },
 
-      campaignId: { type: String },
-
       managedServices: { type: Boolean, default: false, required: true },
 
       status: { type: String },
@@ -116,7 +114,9 @@ module.exports = function(mongoose, config) {
 
       submittedOn: { type: Date, index: false },
       submittedBy: { type: String, trim: true },
+
       reviewedOn: { type: Date, index: false },
+      rejection: { type: String, trim: true },
 
       notifications: {
 
@@ -127,25 +127,27 @@ module.exports = function(mongoose, config) {
             name: { type: String, trim: true }
           }],
 
-          initial: {
+          sendOn: [{
             sendOn: { type: Date, required: false },
             sentOn: { type: Date, required: false },
             postmarkMessageId: { type: String, trim: true },
             status: { type: String, enum: [null, 'Sent', 'Bounced', 'Delivered', 'Opened', 'Clicked']}
-          },
+          }],
 
-          reminder: {
+          // INITIAL AND REMINDER BEING DELETED
+          initial: {
             sendOn: { type: Date, required: false },
             sentOn: { type: Date, required: false },
             postmarkMessageId: { type: String, trim: true },
             status: { type: String, enum: [null, 'Sent', 'Bounced', 'Delivered', 'Opened', 'Clicked']}
           },
 
-          history: [{
-            email: { type: String, trim: true },
+          reminder: {
+            sendOn: { type: Date, required: false },
+            sentOn: { type: Date, required: false },
             postmarkMessageId: { type: String, trim: true },
             status: { type: String, enum: [null, 'Sent', 'Bounced', 'Delivered', 'Opened', 'Clicked']}
-          }]
+          },
 
         },
 
@@ -181,8 +183,6 @@ module.exports = function(mongoose, config) {
 
   });
 
-
-
   ///////////////////////////////////////////////////////////////////////////////////////
   // METHODS
   // Methods operate on a single document
@@ -211,21 +211,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Financials.statics.getByPostmarkMessageId = function getByPostmarkMessageId(postmarkMessageId, cb) {
-
-    var self = this;
-
-    var query = self.findOne({
-      $or: [
-        { 'snapshots.notifications.company.initial.postmarkMessageId': postmarkMessageId },
-        { 'snapshots.notifications.company.reminder.postmarkMessageId': postmarkMessageId }
-      ]
-    });
-
-    query.exec(cb);
-
-  };
-
   Financials.statics.getByUUID = function getByUUID(customerId, uuid, cb) {
 
     var self = this;
@@ -246,20 +231,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Financials.statics.getForCampaign = function getForCampaign(customerId, cb) {
-
-    var self = this;
-
-    var query = self.find({
-      'customer': customerId,
-      'notification.contact.exclude': { $ne: true }, // null, false, or non-existing field
-      'notification.contact.email': { $ne: null } // field exists and has a value
-    });
-
-    query.exec(cb);
-
-  };
-
   Financials.statics.getForCustomer = function getForCustomer(customerId, cb) {
 
     var self = this;
@@ -332,86 +303,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Financials.statics.getUUIDsToSendInitial = function getUUIDsToSendInitial(cb) {
-
-    var self = this;
-    var now = new Date();
-
-    var query = self.find({
-      'snapshots': {
-        $elemMatch: {
-          'notifications.company.sendTo': { $gt: [] },
-          'notifications.company.initial.sendOn': { $lte: now },
-          'notifications.company.initial.sentOn': null,
-          'submittedOn': null
-        }
-      }
-    });
-
-    query.exec(function(err, result) {
-
-      if (err) { return cb(err, null); }
-
-      var snapshots = _.pluck(result || [], 'snapshots');
-
-      snapshots = _.flatten(snapshots);
-
-      snapshots = _.filter(snapshots, function(snapshot) {
-
-        var bool = !!snapshot.notifications.company.sendTo.length > 0;
-        bool = bool && snapshot.notifications.company.initial.sendOn < now;
-        bool = bool && !snapshot.notifications.company.initial.sentOn;
-
-        return bool;
-
-      });
-
-      return cb(null, _.pluck(snapshots, 'uuid'));
-
-    });
-
-  };
-
-  Financials.statics.getUUIDsToSendReminder = function getUUIDsToSendReminder(cb) {
-
-    var self = this;
-    var now = new Date();
-
-    var query = self.find({
-      'snapshots': {
-        $elemMatch: {
-          'notifications.company.sendTo': { $gt: [] },
-          'notifications.company.reminder.sendOn': { $lte: now },
-          'notifications.company.reminder.sentOn': null,
-          'submittedOn': null
-        }
-      }
-    });
-
-    query.exec(function(err, result) {
-
-      if (err) { return cb(err, null); }
-
-      var snapshots = _.pluck(result || [], 'snapshots');
-
-      snapshots = _.flatten(snapshots);
-
-      snapshots = _.filter(snapshots, function(snapshot) {
-
-        var bool = !!snapshot.notifications.company.sendTo.length > 0;
-        bool = bool && snapshot.notifications.company.reminder.sendOn < now;
-        bool = bool && !snapshot.notifications.company.reminder.sentOn;
-
-        return bool;
-
-      });
-
-      return cb(null, _.pluck(snapshots, 'uuid'));
-
-    });
-
-  };
-
   Financials.statics.removeCustomerFinancials = function removeCustomerFinancials(customerId, cb) {
 
     // this is only used to wipe out financials created by the google sheet import process
@@ -466,17 +357,26 @@ module.exports = function(mongoose, config) {
 
       if(!snapshot) return;
 
+      var isManagedServices = snapshot.managedServices;
+      var isSubmitted = !_.isEmpty(snapshot.submittedOn);
+      var isReviewed = !_.isEmpty(snapshot.reviewedOn);
+      var isRejected = !_.isEmpty(snapshot.rejection);
+
       // no uuid means the data was captured from the google sheet
-      if((!snapshot.uuid) || (!snapshot.managedServices && snapshot.submittedOn) || (snapshot.managedServices && snapshot.reviewedOn)) {
+      if((!snapshot.uuid) || (!isManagedServices && isSubmitted) || (isManagedServices && isReviewed)) {
         snapshot.status = 'Completed';
         snapshot.action = null;
       }
       
-      else if(snapshot.notifications.company.initial.sendOn) {
+      else if(!_.isEmpty(snapshot.notifications.company.sendOn)) {
+
+        var earliestSendOn = _.min(snapshot.notifications.company.sendOn, function(s) { return new Date(s.sendOn); }); 
+        var latestSendOn = _.max(snapshot.notifications.company.sendOn, function(s) { return new Date(s.sendOn); });
+        var latestSentOn = _.max(snapshot.notifications.company.sentOn, function(s) { return new Date(s.sentOn); })
+
+        var isScheduled = earliestSendOn.sendOn && moment().isBefore(moment(earliestSendOn.sendOn));
+        var isOverdue = latestSendOn.sendOn && moment().subtract(14, 'd').isAfter(moment(latestSendOn.sendOn));
 
-        var isScheduled = moment().isBefore(moment(snapshot.notifications.company.initial.sendOn));
-        var isOverdue = moment().subtract(30, 'd').isAfter(moment(snapshot.notifications.company.reminder.sendOn || snapshot.notifications.company.initial.sendOn));
-        
         if(isScheduled) {
           snapshot.status = 'Scheduled';
           snapshot.action = null;
@@ -489,9 +389,9 @@ module.exports = function(mongoose, config) {
 
         else {
           snapshot.status = 'In Progress';
-          if(snapshot.managedServices && snapshot.submittedOn) snapshot.action = 'Review';
-          else if(snapshot.notifications.company.reminder.status) snapshot.action = snapshot.notifications.company.reminder.status;
-          else if (snapshot.notifications.company.initial.status) snapshot.action = snapshot.notifications.company.initial.status;
+          if(isManagedServices && isSubmitted && !isRejected) snapshot.action = 'Review';
+          else if(isManagedServices && isSubmitted && isRejected) snapshot.action = 'Rejected';
+          else if(latestSentOn.status) snapshot.action = latestSentOn.status;
         }
 
       }

package/lib/Organization.js

@@ -2209,6 +2209,7 @@ module.exports = function(mongoose, config) {
   Organization.set('toJSON', { virtuals: true });
   Organization.set('usePushEach', true);
   Organization.set('autoIndex', false);
+  Organization.set('usePushEach', true);
 
   Organization.index({ website: 1,  websiteAliases: 1 }, { unique: true, partialFilterExpression : { type :"string" } });
   Organization.on('index', function(err) { console.log('error building organization_new indexes: ' + err); });

package/lib/Person.js

@@ -884,7 +884,7 @@ module.exports = function(mongoose, config) {
 
     this
       .find({ 'contact.email.email': { $in : emails }, 'deleted': {$ne: true}})
-      .select('name avatarUrl title doNotDisplay')
+      .select('name avatarUrl title doNotDisplay contact')
       .exec(function (err, people) {
         cb(err, _.sortBy(people, function(person) { return person.name.full; }));
       });

package/package.json

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

package/test/Financials.js

@@ -88,13 +88,10 @@ describe('Financials', function() {
   });
 
   // getByOrg
-  // getByPostmarkMessageId
   // getByUUID
   // getForCampaign
   // getForCustomer
   // getToSend
-  // getUUIDsToSendInitial
-  // getUUIDsToSendReminder
   // removeCustomerFinancials
   // upsert