@dhyasama/totem-models 7.55.1 → 7.57.0

package/lib/Financials.js

@@ -272,10 +272,9 @@ module.exports = function(mongoose, config) {
       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;
+        var hasUnsentSendOnLessThanNow = snapshot.notifications.company.initial.sendOn < now && !snapshot.notifications.company.initial.sentOn;
 
-        return hasRecipients && hasSendOnLessThanNow && hasNotBeenSentTo;
+        return hasRecipients && hasUnsentSendOnLessThanNow;
 
       });
 
@@ -296,7 +295,15 @@ module.exports = function(mongoose, config) {
           'notifications.company.sendTo': { $gt: [] },
           'notifications.company.reminders.sendOn': { $lte: now },
           'notifications.company.reminders.sentOn': null,
-          'submittedOn': null
+           "$or": [
+            {
+              "submittedOn": null,
+            },
+            {
+              "submittedOn": { $ne: null },
+              "rejection": { $ne: null }
+            }
+          ]
         }
       }
     });
@@ -311,16 +318,14 @@ module.exports = function(mongoose, config) {
 
       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 = sendOnLessThanNow;
-        var hasNotBeenSentTo = sendOnLessThanNow && !sendOnLessThanNow.sentOn;
+        var hasUnsentSendOnLessThanNow = _.find(snapshot.notifications.company.reminders, function(reminder) {
+          return reminder.sendOn < now && !reminder.sentOn;
+        });
         var hasNotBeenSubmitted = !snapshot.submittedOn;
+        var hasBeenRejected = snapshot.submittedOn && snapshot.rejection;
 
-        return hasRecipients && hasSendOnLessThanNow && hasNotBeenSentTo && hasNotBeenSubmitted;
+        return hasRecipients && hasUnsentSendOnLessThanNow && (hasNotBeenSubmitted || hasBeenRejected);
 
       });
 
@@ -355,15 +360,12 @@ module.exports = function(mongoose, config) {
 
       snapshots = _.filter(snapshots, function(snapshot) {
 
-        var sendOnLessThanNow = _.find(snapshot.notifications.company.rejections, function(rejection) {
-          return rejection.sendOn < now;
-        });
-
         var hasRecipients = snapshot.notifications.company.sendTo.length > 0;
-        var hasSendOnLessThanNow = sendOnLessThanNow;
-        var hasNotBeenSentTo = sendOnLessThanNow && !sendOnLessThanNow.sentOn;
+        var hasUnsentSendOnLessThanNow = _.find(snapshot.notifications.company.rejections, function(rejection) {
+          return rejection.sendOn < now && !rejection.sentOn;
+        });
 
-        return hasRecipients && hasSendOnLessThanNow && hasNotBeenSentTo;
+        return hasRecipients && hasUnsentSendOnLessThanNow;
 
       });
 
@@ -409,11 +411,11 @@ module.exports = function(mongoose, config) {
       _.each(results, function(result) {
         _.each(result.snapshots, function(snapshot) {
 
-          var bool = snapshot.managedServices;
-          bool = bool && snapshot.submittedOn;
-          bool = bool && !snapshot.reviewedOn;
+          var isManagedServices = snapshot.managedServices;
+          var isSubmitted = snapshot.submittedOn;
+          var isNotReviewed = !snapshot.reviewedOn;
 
-          if(bool) {
+          if(isManagedServices && isSubmitted && isNotReviewed) {
             snapshots.push({
               organization: result.organization.name,
               snapshot: snapshot

package/package.json

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