@dhyasama/totem-models 8.28.1 → 8.29.0

package/lib/Financials.js

@@ -30,7 +30,6 @@ module.exports = function(mongoose, config) {
       managedServices: { type: Boolean, default: false, required: true },
 
       status: { type: String },
-
       action: { type: String },
 
       year: { type: Number, default: 0 },
@@ -147,12 +146,11 @@ module.exports = function(mongoose, config) {
 
         stakeholders: [{
 
-          organization: { type: Schema.ObjectId, ref: 'Organization' },
-
-          sendTo: [{
+          sendTo: {
+            organization: { type: Schema.ObjectId, ref: 'Organization' },
             email: { type: String, trim: true },
             name: { type: String, trim: true }
-          }],
+          },
 
           initial: {
             sendOn: { type: Date, required: false },
@@ -419,8 +417,8 @@ module.exports = function(mongoose, config) {
     var query = self.find({
       'snapshots': {
         $elemMatch: {
-          'notifications.stakeholders.sendTo': { $gt: [] },
-          'notifications.stakeholders.organization': { $ne: null },
+          'notifications.stakeholders.sendTo.email': { $ne: null },
+          'notifications.stakeholders.sendTo.organization': { $ne: null },
           'notifications.stakeholders.initial.sendOn': { $lte: now },
           'notifications.stakeholders.initial.sentOn': null
         }
@@ -437,11 +435,15 @@ module.exports = function(mongoose, config) {
 
       snapshots = _.filter(snapshots, function(snapshot) {
 
-        var hasRecipients = snapshot.notifications.stakeholders.sendTo.length > 0;
-        var hasOrganization = snapshot.notifications.stakeholders.organization;
-        var hasUnsentSendOnLessThanNow = snapshot.notifications.stakeholders.initial.sendOn < now && !snapshot.notifications.stakeholders.initial.sentOn;
+        return _.some(snapshot.notifications.stakeholders, function(stakeholder) {
+
+          var hasEmail =  stakeholder.sendTo && stakeholder.sendTo.email;
+          var hasOrganization = stakeholder.sendTo && stakeholder.sendTo.organization;
+          var hasUnsentSendOnLessThanNow = stakeholder.initial && stakeholder.initial.sendOn < now && !stakeholder.initial.sentOn;
 
-        return hasRecipients && hasOrganization && hasUnsentSendOnLessThanNow;
+          return hasEmail && hasOrganization && hasUnsentSendOnLessThanNow;
+
+        });
 
       });
 
@@ -459,8 +461,8 @@ module.exports = function(mongoose, config) {
     var query = self.find({
       'snapshots': {
         $elemMatch: {
-          'notifications.stakeholders.sendTo': { $gt: [] },
-          'notifications.stakeholders.organization': { $ne: null },
+          'notifications.stakeholders.sendTo.email': { $ne: null },
+          'notifications.stakeholders.sendTo.organization': { $ne: null },
           'notifications.stakeholders.reminders.sendOn': { $lte: now },
           'notifications.stakeholders.reminders.sentOn': null
         }
@@ -477,13 +479,17 @@ module.exports = function(mongoose, config) {
 
       snapshots = _.filter(snapshots, function(snapshot) {
 
-        var hasRecipients = snapshot.notifications.stakeholders.sendTo.length > 0;
-        var hasOrganization = snapshot.notifications.stakeholders.organization;
-        var hasUnsentSendOnLessThanNow = _.find(snapshot.notifications.stakeholders.reminders, function(reminder) {
-          return reminder.sendOn < now && !reminder.sentOn;
-        });
+        return _.some(snapshot.notifications.stakeholders, function(stakeholder) {
 
-        return hasRecipients && hasOrganization && hasUnsentSendOnLessThanNow;
+          var hasEmail =  stakeholder.sendTo && stakeholder.sendTo.email;
+          var hasOrganization = stakeholder.sendTo && stakeholder.sendTo.organization;
+          var hasUnsentSendOnLessThanNow = _.find(stakeholder.reminders, function(reminder) {
+            return reminder.sendOn < now && !reminder.sentOn;
+          });
+
+          return hasEmail && hasOrganization && hasUnsentSendOnLessThanNow;
+
+        });
 
       });
 

package/package.json

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