@dhyasama/totem-models 4.5.0 → 4.5.2

package/lib/Organization.js

@@ -389,7 +389,7 @@ module.exports = function(mongoose, config) {
     // Don't return statuses for a different customer
     if (self._id.toString() != config.CUSTOMER_ID) return statuses;
 
-    // Backwards schema compatability
+    // Backwards schema compatibility
     else if (!self.customer.deals) return statuses;
 
     // Deals aren't on for customer
@@ -581,32 +581,41 @@ module.exports = function(mongoose, config) {
     if (!status) throw new Error('Status is required');
     if (!account) throw new Error('Account is required');
 
-    // Make sure customer and deals are active
-    if (!customer.customer.active) throw new Error('Customer is not active');
-    if (!customer.customer.deals.active) throw new Error('Deals are not active for this customer');
+    // Check if status exists and is active
+    var statusMatch = _.find(customer.customer.deals.statuses, function(s) { return s.name.toLowerCase() == status.toLowerCase() && s.active; });
+    if (!statusMatch) throw new Error('This deal status is not valid for this customer');
+
+    // Prepare an entry to track history of deal
+    var historyEntry = {
+      timestamp: new Date(),
+      account: account,
+      status: status
+    };
 
     // 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() && d.status.toLowerCase() == status.toLowerCase();
+      return cid == customer._id.toString();
     });
 
-    if (dealMatch) throw new Error('This deal status already exists for this customer');
+    // Update the deal
+    if (dealMatch) {
 
-    // Check if status exists and is active
-    var statusMatch = _.find(customer.customer.deals.statuses, function(s) { return s.name.toLowerCase() == status.toLowerCase() && s.active; });
-    if (!statusMatch) throw new Error('This deal status is not valid for this customer');
+      dealMatch.status = status;
+      dealMatch.history.push(historyEntry);
+
+    }
 
     // Add the deal
-    self.deals.push({
-      customer: customer,
-      status: status,
-      history: [{
-        timestamp: new Date(),
-        account: account,
-        status: status
-      }]
-    });
+    else {
+
+      self.deals.push({
+        customer: customer,
+        status: status,
+        history: [historyEntry]
+      });
+
+    }
 
   };
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
   "main": "index.js",
   "scripts": {
-    "test": "NODE_ENV=test node ./changeBSON && mocha -R spec -t 15000"
+    "test": "NODE_ENV=test node ./changeBSON && mocha -R spec -t 15000 --exit"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/test/Organization.js

@@ -1175,13 +1175,15 @@ describe('Organization', function() {
       var threwError = false;
 
       try {
-        org.addDeal('New', customer1, account);
+        org.addDeal('Pass', customer1, account);
       }
       catch (err) {
         threwError = true;
       }
 
-      threwError.should.equal(true);
+      threwError.should.equal(false);
+      org.deals.length.should.equal(1);
+      org.deals[0].status.should.equal('Pass');
 
       return done();