@dhyasama/totem-models 8.7.1 → 8.8.1

package/lib/Financials.js

@@ -27,8 +27,6 @@ module.exports = function(mongoose, config) {
 
       uuid: { type: String },
 
-      campaignId: { type: String },
-
       managedServices: { type: Boolean, default: false, required: true },
 
       status: { type: String },
@@ -115,7 +113,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: {
 
@@ -133,17 +133,18 @@ module.exports = function(mongoose, config) {
             status: { type: String, enum: [null, 'Sent', 'Bounced', 'Delivered', 'Opened', 'Clicked']}
           },
 
-          reminder: {
+          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']}
-          },
+          }],
 
-          history: [{
-            email: { type: String, trim: true },
+          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']}            
           }]
 
         },
@@ -180,8 +181,6 @@ module.exports = function(mongoose, config) {
 
   });
 
-
-
   ///////////////////////////////////////////////////////////////////////////////////////
   // METHODS
   // Methods operate on a single document
@@ -196,9 +195,9 @@ module.exports = function(mongoose, config) {
 
   Financials.statics.getByOrg = function getByOrg(customerId, orgId, cb) {
 
-    let self = this;
+    var self = this;
 
-    let query = self.findOne({
+    var query = self.findOne({
       'customer': customerId,
       'organization': orgId
     }).populate({
@@ -206,34 +205,15 @@ module.exports = function(mongoose, config) {
       match: { customer: customerId }
     });
 
-    // No need to scrub because population matched on customer id
-
-    query.exec(cb);
-
-  };
-
-  Financials.statics.getByPostmarkMessageId = function getByPostmarkMessageId(postmarkMessageId, cb) {
-
-    let self = this;
-
-    let query = self.findOne({
-      $or: [
-        { 'snapshots.notifications.company.initial.postmarkMessageId': postmarkMessageId },
-        { 'snapshots.notifications.company.reminder.postmarkMessageId': postmarkMessageId }
-      ]
-    });
-
-    // No population so no need to scrub
-
     query.exec(cb);
 
   };
 
   Financials.statics.getByUUID = function getByUUID(customerId, uuid, cb) {
 
-    let self = this;
+    var self = this;
 
-    let query = self.findOne({
+    var query = self.findOne({
       'customer': customerId,
       'snapshots.uuid': uuid
     });
@@ -245,129 +225,150 @@ module.exports = function(mongoose, config) {
       match: { customer: customerId }
     });
 
-    // No need to scrub because population matched on customer id
-
     query.exec(cb);
 
   };
 
-  Financials.statics.getForCampaign = function getForCampaign(customerId, cb) {
-
-    let self = this;
-
-    let 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
-    });
-
-    // No population so no need to scrub
-
-    query.exec(cb);
-
-  };
-
-  Financials.statics.getForCustomer = function getForCustomer(customerId, cb) {
+  Financials.statics.getByPostmarkMessageId = function getByPostmarkMessageId(postmarkMessageId, cb) {
 
-    let self = this;
+    var self = this;
 
-    let query = self.find({
-      'customer': customerId
+    var query = self.findOne({
+      $or: [
+        { 'snapshots.notifications.company.initial.postmarkMessageId': postmarkMessageId },
+        { 'snapshots.notifications.company.reminders.postmarkMessageId': postmarkMessageId },
+        { 'snapshots.notifications.company.rejections.postmarkMessageId': postmarkMessageId },
+      ]
     });
 
-    // No population so no need to scrub
-
     query.exec(cb);
 
   };
 
-  Financials.statics.getManagedServicesForReview = function getManagedServicesForReview(customerId, cb) {
+  Financials.statics.getInitialUUIDsToSend = function getInitialUUIDsToSend(cb) {
 
-    let self = this;
+    var self = this;
+    var now = new Date();
 
-    let query = self.find({
-      'customer': customerId,
+    var query = self.find({
       'snapshots': {
         $elemMatch: {
-          'managedServices': true, 
-          'submittedOn': { $ne: null },
-          'reviewedOn': null
+          'notifications.company.sendTo': { $gt: [] },
+          'notifications.company.initial.sendOn': { $lte: now },
+          'notifications.company.initial.sentOn': null
         }
       }
     });
 
-    // No population so no need to scrub
-
     query.exec(function(err, result) {
 
-      let snapshots = _.pluck(result || [], 'snapshots');
+      if (err) { return cb(err, null); }
+
+      var snapshots = _.pluck(result || [], 'snapshots');
+
       snapshots = _.flatten(snapshots);
 
       snapshots = _.filter(snapshots, function(snapshot) {
 
-        let bool = snapshot.managedServices;
-        bool = bool && snapshot.submittedOn;
-        bool = bool && !snapshot.reviewedOn;
+        var hasRecipients = snapshot.notifications.company.sendTo.length > 0;
+        var hasUnsentSendOnLessThanNow = snapshot.notifications.company.initial.sendOn < now && !snapshot.notifications.company.initial.sentOn;
 
-        return bool;
+        return hasRecipients && hasUnsentSendOnLessThanNow;
 
       });
 
-      if (err) { return cb(err, null); }
-      return cb(null, snapshots);
+      return cb(null, _.pluck(snapshots, 'uuid'));
 
     });
 
   };
 
-  Financials.statics.getToSend = function getToSend(uuid, cb) {
+  Financials.statics.getReminderUUIDsToSend = function getReminderUUIDsToSend(cb) {
 
-    let self = this;
+    var self = this;
+    var now = new Date();
 
-    let query = self.findOne({
-      'snapshots.uuid': uuid
+    var query = self.find({
+      'snapshots': {
+        $elemMatch: {
+          'notifications.company.sendTo': { $gt: [] },
+          'notifications.company.reminders.sendOn': { $lte: now },
+          'notifications.company.reminders.sentOn': null,
+           "$or": [
+            {
+              "submittedOn": null,
+            },
+            {
+              "submittedOn": { $ne: null },
+              "rejection": { $ne: null }
+            }
+          ]
+        }
+      }
     });
 
-    query.populate('organization', 'name logoUrl');
-    query.populate('customer', 'name logoUrl customer.totemUrl');
+    query.exec(function(err, result) {
 
-    query.exec(cb);
+      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 hasUnsentSendOnLessThanNow = _.find(snapshot.notifications.company.reminders, function(reminder) {
+          return reminder.sendOn < now && !reminder.sentOn;
+        });
+        var hasBeenSubmitted = snapshot.submittedOn;
+        var hasBeenRejected = snapshot.rejection;
+
+        return hasRecipients && hasUnsentSendOnLessThanNow && ((!hasBeenSubmitted) || (hasBeenSubmitted && hasBeenRejected));
+
+      });
+
+      return cb(null, _.pluck(snapshots, 'uuid'));
+
+    });
 
   };
 
-  Financials.statics.getUUIDsToSendInitial = function getUUIDsToSendInitial(cb) {
+  Financials.statics.getRejectionUUIDsToSend = function getRejectionUUIDsToSend(cb) {
 
-    let self = this;
-    let now = new Date();
+    var self = this;
+    var now = new Date();
 
-    let query = self.find({
+    var query = self.find({
       'snapshots': {
         $elemMatch: {
           'notifications.company.sendTo': { $gt: [] },
-          'notifications.company.initial.sendOn': { $lte: now },
-          'notifications.company.initial.sentOn': null,
-          'submittedOn': null
+          'notifications.company.rejections.sendOn': { $lte: now },
+          'notifications.company.rejections.sentOn': null,
+          "submittedOn": { $ne: null },
+          "rejection": { $ne: null }
         }
       }
     });
 
-    // No population so no need to scrub
-
     query.exec(function(err, result) {
 
       if (err) { return cb(err, null); }
 
-      let snapshots = _.pluck(result || [], 'snapshots');
+      var snapshots = _.pluck(result || [], 'snapshots');
 
       snapshots = _.flatten(snapshots);
 
       snapshots = _.filter(snapshots, function(snapshot) {
 
-        let bool = !!snapshot.notifications.company.sendTo.length > 0;
-        bool = bool && snapshot.notifications.company.initial.sendOn < now;
-        bool = bool && !snapshot.notifications.company.initial.sentOn;
+        var hasRecipients = snapshot.notifications.company.sendTo.length > 0;
+        var hasUnsentSendOnLessThanNow = _.find(snapshot.notifications.company.rejections, function(rejection) {
+          return rejection.sendOn < now && !rejection.sentOn;
+        });
+        var hasBeenSubmitted = snapshot.submittedOn;
+        var hasBeenRejected = snapshot.rejection;
 
-        return bool;
+        return hasRecipients && hasUnsentSendOnLessThanNow && hasBeenSubmitted && hasBeenRejected;
 
       });
 
@@ -377,46 +378,76 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Financials.statics.getUUIDsToSendReminder = function getUUIDsToSendReminder(cb) {
+  Financials.statics.getForCustomer = function getForCustomer(customerId, cb) {
 
-    let self = this;
-    let now = new Date();
+    var self = this;
 
-    let query = self.find({
+    var query = self.find({
+      'customer': customerId
+    });
+
+    query.exec(cb);
+
+  };
+
+  Financials.statics.getManagedServicesForReview = function getManagedServicesForReview(customerId, cb) {
+
+    var self = this;
+
+    var query = self.find({
+      'customer': customerId,
       'snapshots': {
         $elemMatch: {
-          'notifications.company.sendTo': { $gt: [] },
-          'notifications.company.reminder.sendOn': { $lte: now },
-          'notifications.company.reminder.sentOn': null,
-          'submittedOn': null
+          'managedServices': true, 
+          'submittedOn': { $ne: null },
+          'reviewedOn': null
         }
       }
     });
 
-    // No population so no need to scrub
+    query.populate('organization', 'name');
 
-    query.exec(function(err, result) {
+    query.exec(function(err, results) {
 
-      if (err) { return cb(err, null); }
+      var snapshots = [];
 
-      let snapshots = _.pluck(result || [], 'snapshots');
+      _.each(results, function(result) {
+        _.each(result.snapshots, function(snapshot) {
 
-      snapshots = _.flatten(snapshots);
+          var isManagedServices = snapshot.managedServices;
+          var isSubmitted = snapshot.submittedOn;
+          var isNotReviewed = !snapshot.reviewedOn;
 
-      snapshots = _.filter(snapshots, function(snapshot) {
+          if(isManagedServices && isSubmitted && isNotReviewed) {
+            snapshots.push({
+              organization: result.organization.name,
+              snapshot: snapshot
+            });
+          }
 
-        let bool = !!snapshot.notifications.company.sendTo.length > 0;
-        bool = bool && snapshot.notifications.company.reminder.sendOn < now;
-        bool = bool && !snapshot.notifications.company.reminder.sentOn;
+        });
+      });
 
-        return bool;
+      if (err) { return cb(err, null); }
+      return cb(null, snapshots);
 
-      });
+    });
 
-      return cb(null, _.pluck(snapshots, 'uuid'));
+  };
+
+  Financials.statics.getToSend = function getToSend(uuid, cb) {
 
+    var self = this;
+
+    var query = self.findOne({
+      'snapshots.uuid': uuid
     });
 
+    query.populate('organization', 'name logoUrl');
+    query.populate('customer', 'name logoUrl customer.totemUrl');
+
+    query.exec(cb);
+
   };
 
   Financials.statics.removeCustomerFinancials = function removeCustomerFinancials(customerId, cb) {
@@ -424,9 +455,7 @@ module.exports = function(mongoose, config) {
     // this is only used to wipe out financials created by the google sheet import process
     // we do NOT want to delete any financials submitted via forms generated directly from the app
 
-    let self = this;
-
-    // No population so no need to scrub
+    var self = this;
 
     self
       .update(
@@ -439,7 +468,6 @@ module.exports = function(mongoose, config) {
 
   Financials.statics.upsert = function upsert(financials, cb) {
 
-    if (!cb) { throw new Error('cb is required'); }
     if (!financials) { return cb(new Error('financials is required'), null); }
 
     // Required for mixed types
@@ -456,8 +484,6 @@ module.exports = function(mongoose, config) {
     financials.markModified('investingActivities.breakdown');
     financials.markModified('financingActivities.breakdown');
 
-    // No population so no need to scrub
-
     financials.save(cb);
 
   };
@@ -478,17 +504,24 @@ module.exports = function(mongoose, config) {
 
       if(!snapshot) return;
 
+      var isManagedServices = snapshot.managedServices;
+      var isSubmitted = snapshot.submittedOn;
+      var isReviewed = snapshot.reviewedOn;
+      var isRejected = 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(snapshot.notifications.company && snapshot.notifications.company.initial && snapshot.notifications.company.initial.sendOn) {
+
+        var latestReminder = _.max(snapshot.notifications.company.reminders, function(r) { return new Date(r.sendOn); });
+
+        var isScheduled = snapshot.notifications.company.initial.sendOn && moment().isBefore(moment(snapshot.notifications.company.initial.sendOn));
+        var isOverdue = latestReminder.sendOn && moment().subtract(14, 'd').isAfter(moment(latestReminder.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;
@@ -501,9 +534,10 @@ 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(latestReminder.sentOn) snapshot.action = latestReminder.status;
+          else snapshot.action = snapshot.notifications.company.initial.status;
         }
 
       }
@@ -523,8 +557,8 @@ module.exports = function(mongoose, config) {
   // CONFIG
   ///////////////////////////////////////////////////////////////////////////////////////
 
-  Financials.set('usePushEach', true);
   Financials.set('toJSON', { virtuals: true });
+  Financials.set('usePushEach', true);
   Financials.set('autoIndex', false);
 
   Financials.on('index', function(err) { console.log('error building financials indexes: ' + err); });

package/lib/Investment.js

@@ -159,9 +159,7 @@ module.exports = function(mongoose, config) {
 
   Investment.post('remove', function(doc) {
     // Clean up reference
-    Round.removeInvestment(doc._id, function(err, result) {
-      if (err) console.log(err);
-    });
+    Round.removeInvestment(doc._id);
   });
 
 

package/lib/Round.js

@@ -675,7 +675,6 @@ module.exports = function(mongoose, config) {
       if (!options.isWorkerProcess) {
         _.each(rounds, function(round) {
           round.organization = helpers.cleanOrg(round.organization, options.CUSTOMER_ID);
-          if(round.organization.filters) console.log(round.organization.filters.toObject());
         });
       }
 
@@ -739,7 +738,6 @@ module.exports = function(mongoose, config) {
       if (!options.isWorkerProcess) {
         _.each(rounds, function(round) {
           round.organization = helpers.cleanOrg(round.organization, options.CUSTOMER_ID);
-          if(round.organization.filters) console.log(round.organization.filters.toObject());
         });
       }
 

package/package.json

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