@dhyasama/totem-models 4.5.2 → 4.5.4

package/lib/Organization.js

@@ -384,19 +384,15 @@ module.exports = function(mongoose, config) {
   Organization.virtual('customer.deals.activeStatuses').get(function () {
 
     var self = this;
-    var statuses = [];
-
-    // Don't return statuses for a different customer
-    if (self._id.toString() != config.CUSTOMER_ID) return statuses;
 
     // Backwards schema compatibility
-    else if (!self.customer.deals) return statuses;
+    if (!self.customer.deals) return [];
 
     // Deals aren't on for customer
-    else if (!self.customer.deals.active) return statuses;
+    else if (!self.customer.deals.active) return [];
 
     // Get active status names and sort them
-    statuses = _.filter(self.customer.deals.statuses, function(s) { return s.active; });
+    var statuses = _.filter(self.customer.deals.statuses, function(s) { return s.active; });
     statuses = _.sortBy(statuses, 'order');
     statuses = _.pluck(statuses, 'name');
 
@@ -594,27 +590,22 @@ module.exports = function(mongoose, config) {
 
     // Check if this deal already exists
     var dealMatch = _.find(self.deals, function(d) {
-      var cid = d.customer._id ? d.customer._id.toString() : d.customer.toString();
-      return cid == customer._id.toString();
+      return utils.getIdAsString(d, 'customer') == customer._id.toString();
     });
 
     // Update the deal
     if (dealMatch) {
-
       dealMatch.status = status;
       dealMatch.history.push(historyEntry);
-
     }
 
     // Add the deal
     else {
-
       self.deals.push({
         customer: customer,
         status: status,
         history: [historyEntry]
       });
-
     }
 
   };
@@ -1050,17 +1041,18 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Organization.statics.getDeals = function getDeals(cb) {
+  Organization.statics.getDeals = function getDeals(customerId, cb) {
 
     var self = this;
 
     self
-      .find({ 'deals.customer': config.CUSTOMER_ID, 'deleted': { $ne: true } })
+      .find({ 'deals.customer': customerId, 'deleted': { $ne: true } })
       .select('name website websiteAliases deals')
       .exec(function(err, result) {
 
         if (err) return cb(err, null);
 
+        result.deals = _.reject(result.deals, function(item) { return !item.customer || item.customer.toString() != customerId.toString(); });
         result = _.map(result, function(item) {
           return {
             name: item.name,

package/package.json

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