@dhyasama/totem-models 5.0.0 → 5.0.2

package/lib/Deal.js

@@ -123,15 +123,18 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    console.log('Deal.statics.getForCustomer');
+    console.log('customerId', customerId);
+
     self
       .find({ 'customer': customerId })
-      .populate('organization', 'name logoUrl website websiteAliases')
-      .populate('messages')
-      .populate('sources.person', 'name avatarUrl')
-      .populate({
-        path: 'documents',
-        match: { customer: customerId }
-      })
+      // .populate('organization', 'name logoUrl website websiteAliases')
+      // .populate('messages')
+      // .populate('sources.person', 'name avatarUrl')
+      // .populate({
+      //   path: 'documents',
+      //   match: { customer: customerId }
+      // })
       .exec(cb);
 
   };

package/lib/Organization.js

@@ -570,45 +570,23 @@ module.exports = function(mongoose, config) {
   // Note that running a method on a document does not save it
   ///////////////////////////////////////////////////////////////////////////////////////
 
-  Organization.methods.addDeal = function(status, customer, account) {
+  Organization.methods.addDeal = function(deal) {
 
     var self = this;
 
     // Validate inputs
-    if (!customer) throw new Error('Customer is required');
-    if (!status) throw new Error('Status is required');
-    if (!account) throw new Error('Account is required');
-
-    // 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
-    };
+    if (!deal) throw new Error('deal is required');
 
     // Check if this deal already exists
     var dealMatch = _.find(self.deals, function(d) {
-      return utils.getIdAsString(d, 'customer') == customer._id.toString();
+      return d._id.toString() === deal._id.toString();
     });
 
     // Update the deal
-    if (dealMatch) {
-      dealMatch.status = status;
-      dealMatch.history.push(historyEntry);
-    }
+    if (dealMatch) { dealMatch = deal; }
 
     // Add the deal
-    else {
-      self.deals.push({
-        customer: customer,
-        status: status,
-        history: [historyEntry]
-      });
-    }
+    else { self.deals.push(deal); }
 
   };
 

package/package.json

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