@dhyasama/totem-models 9.43.0 → 9.43.2

package/lib/Financials.js

@@ -601,43 +601,41 @@ module.exports = function(mongoose, config) {
       }
     });
 
-    query.exec(function(err, result) {
+    query.exec(function(err, financials) {
 
       if (err) { return cb(err, null); }
 
+      financials = financials || [];
+
       let results = [];
 
-      _.each(result, function(financial) {
+      _.each(financials, function(financial) {
 
-        let result = {
-          'financials': financial,
-          'snapshotUUID': null,
-          'stakeholderIdsToNotify': [],
-          'uuid': null, // todo - legacy, to be removed
-          'recipients': null, // todo - legacy, to be removed
-          'stakeholder': null // todo - legacy, to be removed
-        };
+        if (!financial) return;
 
         _.each(financial.snapshots, function(snapshot) {
 
-          result.snapshotUUID = snapshot.uuid;
-          result.uuid = snapshot.uuid; // legacy, tbr
+          if (!snapshot || !snapshot.uuid || !snapshot.notifications || !snapshot.notifications.stakeholders) return;
 
           _.each(snapshot.notifications.stakeholders, function(stakeholder) {
 
-            const hasSendToEmail = stakeholder.sendTo && stakeholder.sendTo.email;
-            const sendOnLessThanNow = stakeholder.initial && stakeholder.initial.sendOn < now;
+            if (!stakeholder || !stakeholder._id || !stakeholder.sendTo || !stakeholder.initial) return;
+
+            const sendToEmail = stakeholder.sendTo.email;
+            const sendOnLessThanNow = stakeholder.initial.sendOn < now;
             const sentOn = stakeholder.initial.sentOn;
             const sentToQueue = stakeholder.initial.sentToQueue;
-            const conditionsMet = hasSendToEmail && sendOnLessThanNow && !sentOn && !sentToQueue;
+            const conditionsMet = sendToEmail && sendOnLessThanNow && !sentOn && !sentToQueue;
 
             if (conditionsMet) {
 
-              result.stakeholderIdsToNotify.push(stakeholder._id);
-
-              // todo - legacy, to be removed
-              result.recipients = [stakeholder.sendTo.email];
-              result.stakeholder = stakeholder;
+              results.push({
+                'financials': financial,
+                'snapshotUUID': snapshot.uuid,
+                'stakeholderId': stakeholder._id,
+                'uuid': snapshot.uuid, // todo - legacy, to be removed
+                'recipients': [stakeholder.sendTo.email] // todo - legacy, to be removed
+              });
 
             }
 
@@ -645,8 +643,6 @@ module.exports = function(mongoose, config) {
 
         });
 
-        if (result.stakeholderIdsToNotify.length) { results.push(result); }
-
       });
 
       return cb(null, results);

package/package.json

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