@dhyasama/totem-models 7.51.0 → 7.52.1

package/lib/Financials.js

@@ -127,27 +127,26 @@ module.exports = function(mongoose, config) {
             name: { type: String, trim: true }
           }],
 
-          sendOn: [{
+          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']}
-          }],
+          },
 
-          // INITIAL AND REMINDER BEING DELETED
-          initial: {
+          reminders: [{
             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: {
+          rejections: [{
             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']}
-          },
+            status: { type: String, enum: [null, 'Sent', 'Bounced', 'Delivered', 'Opened', 'Clicked']}            
+          }]
 
         },
 
@@ -231,7 +230,89 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Financials.statics.getUUIDsToSend = function getUUIDsToSend(cb) {
+  Financials.statics.getInitialUUIDsToSend = function getInitialUUIDsToSend(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
+        }
+      }
+    });
+
+    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 hasRecipients = snapshot.notifications.company.sendTo.length > 0;
+        var hasSendOnLessThanNow = snapshot.notifications.company.initial.sendOn < now;
+        var hasNotBeenSentTo = !snapshot.notifications.company.initial.sentOn;
+
+        return hasRecipients && hasSendOnLessThanNow && hasNotBeenSentTo;
+
+      });
+
+      return cb(null, _.pluck(snapshots, 'uuid'));
+
+    });
+
+  };
+
+  Financials.statics.getReminderUUIDsToSend = function getReminderUUIDsToSend(cb) {
+
+    var self = this;
+    var now = new Date();
+
+    var query = self.find({
+      'snapshots': {
+        $elemMatch: {
+          'notifications.company.sendTo': { $gt: [] },
+          'notifications.company.reminders.sendOn': { $lte: now },
+          'notifications.company.reminders.sentOn': 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 sendOnLessThanNow = _.find(snapshot.notifications.company.reminders, function(reminder) {
+          return reminder.sendOn < now;
+        });
+
+        var hasRecipients = snapshot.notifications.company.sendTo.length > 0;
+        var hasSendOnLessThanNow = !_.isEmpty(sendOnLessThanNow);
+        var hasNotBeenSentTo = !sendOnLessThanNow.sentOn;
+
+        return hasRecipients && hasSendOnLessThanNow && hasNotBeenSentTo;
+
+      });
+
+      return cb(null, _.pluck(snapshots, 'uuid'));
+
+    });
+
+  };
+
+  Financials.statics.getRejectionUUIDsToSend = function getRejectionUUIDsToSend(cb) {
 
     var self = this;
     var now = new Date();
@@ -240,8 +321,8 @@ module.exports = function(mongoose, config) {
       'snapshots': {
         $elemMatch: {
           'notifications.company.sendTo': { $gt: [] },
-          'notifications.company.sendOn.sendOn': { $lte: now },
-          'notifications.company.sendOn.sentOn': null
+          'notifications.company.rejections.sendOn': { $lte: now },
+          'notifications.company.rejections.sentOn': null
         }
       }
     });
@@ -256,15 +337,15 @@ module.exports = function(mongoose, config) {
 
       snapshots = _.filter(snapshots, function(snapshot) {
 
-        var sendOnsLessThanNow = _.filter(snapshot.notifications.company.sendOn, function(sendOn) {
-          return sendOn.sendOn < now;
+        var sendOnLessThanNow = _.find(snapshot.notifications.company.rejections, function(rejection) {
+          return rejection.sendOn < now;
         });
 
         var hasRecipients = snapshot.notifications.company.sendTo.length > 0;
-        var hasSendOnLessThanNow = !_.isEmpty(sendOnsLessThanNow);
-        var hasSendOnNotSent = _.some(sendOnsLessThanNow, function(s) { return s.sentOn ? false : true; });
+        var hasSendOnLessThanNow = !_.isEmpty(sendOnLessThanNow);
+        var hasNotBeenSentTo = !sendOnLessThanNow.sentOn;
 
-        return hasRecipients && hasSendOnLessThanNow && hasSendOnNotSent;
+        return hasRecipients && hasSendOnLessThanNow && hasNotBeenSentTo;
 
       });
 

package/package.json

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