@dhyasama/totem-models 7.21.1 → 7.22.1

package/lib/Financials.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // NOTES
@@ -217,8 +217,8 @@ module.exports = function(mongoose, config) {
 
     var query = self.findOne({
       $or: [
-        { "snapshots.notifications.company.initial.postmarkMessageId": postmarkMessageId },
-        { "snapshots.notifications.company.reminder.postmarkMessageId": postmarkMessageId }
+        { 'snapshots.notifications.company.initial.postmarkMessageId': postmarkMessageId },
+        { 'snapshots.notifications.company.reminder.postmarkMessageId': postmarkMessageId }
       ]
     });
 
@@ -278,9 +278,13 @@ module.exports = function(mongoose, config) {
 
     var query = self.find({
       'customer': customerId,
-      "snapshots.managedServices": true, 
-      "snapshots.submittedOn": { $ne: null },
-      "snapshots.reviewedOn": null
+      'snapshots': {
+        $elemMatch: {
+          'managedServices': true, 
+          'submittedOn': { $ne: null },
+          'reviewedOn': null
+        }
+      }
     });
 
     query.exec(function(err, result) {
@@ -288,6 +292,16 @@ module.exports = function(mongoose, config) {
       var snapshots = _.pluck(result || [], 'snapshots');
       snapshots = _.flatten(snapshots);
 
+      snapshots = _.filter(snapshots, function(snapshot) {
+
+        var bool = snapshot.managedServices;
+        bool = bool && snapshot.submittedOn;
+        bool = bool && !snapshot.reviewedOn;
+
+        return bool;
+
+      });
+
       if (err) { return cb(err, null); }
       return cb(null, snapshots);
 
@@ -316,12 +330,12 @@ module.exports = function(mongoose, config) {
     var now = new Date();
 
     var query = self.find({
-      "snapshots": {
+      'snapshots': {
         $elemMatch: {
-          "notifications.company.sendTo.email": { $ne: null },
-          "notifications.company.initial.sendOn": { $lte: now },
-          "notifications.company.initial.sentOn": null,
-          "submittedOn": null
+          'notifications.company.sendTo.email': { $ne: null },
+          'notifications.company.initial.sendOn': { $lte: now },
+          'notifications.company.initial.sentOn': null,
+          'submittedOn': null
         }
       }
     });
@@ -356,12 +370,12 @@ module.exports = function(mongoose, config) {
     var now = new Date();
 
     var query = self.find({
-      "snapshots": {
+      'snapshots': {
         $elemMatch: {
-          "notifications.company.sendTo.email": { $ne: null },
-          "notifications.company.reminder.sendOn": { $lte: now },
-          "notifications.company.reminder.sentOn": null,
-          "submittedOn": null
+          'notifications.company.sendTo.email': { $ne: null },
+          'notifications.company.reminder.sendOn': { $lte: now },
+          'notifications.company.reminder.sentOn': null,
+          'submittedOn': null
         }
       }
     });
@@ -506,4 +520,4 @@ module.exports = function(mongoose, config) {
 
   mongoose.model('Financials', Financials);
 
-};
+};

package/lib/Organization.js

@@ -2163,7 +2163,7 @@ module.exports = function(mongoose, config) {
 
     var CUSTOMER_ID = config.CUSTOMER_ID;
 
-    if (CUSTOMER_ID == 'GLOBAL_PROCESS') return next();
+    if (CUSTOMER_ID == 'GLOBAL_PROCESS' && next) return next();
 
     // remove customer details if not viewing self
     if (doc._id.toString() != CUSTOMER_ID) doc.customer = {};
@@ -2195,7 +2195,7 @@ module.exports = function(mongoose, config) {
 
     });
 
-    return next();
+    if (next) return next();
 
   });
 

package/package.json

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