@dhyasama/totem-models 6.29.2 → 6.30.2

package/lib/Deal.js

@@ -203,8 +203,11 @@ module.exports = function(mongoose, config) {
 
     options = options || {};
 
+    // { history: { $elemMatch: { timestamp: { $gte: ISODate("2019-01-03T20:45:14.406+0000") } } } }
+
     var terms = { 'customer': customerId };
-    if (options.stage) terms['stage'] = { $in: options.stage };
+    if (options.stage) { terms['stage'] = { $in: options.stage }; }
+    if (options.since) { terms['history'] = { $elemMatch: { timestamp: { $gte: options.since } } }; }
 
     self
       .find(terms)

package/lib/Financials.js

@@ -141,17 +141,24 @@ module.exports = function(mongoose, config) {
 
   Financials.statics.removeCustomerFinancials = function removeCustomerFinancials(customerId, cb) {
 
+    // this is only used to wipe out financials created by the google sheet import process
+    // we do NOT want to delete any financials submitted via forms generated directly from the app
+
     var self = this;
 
     self
-      .remove({customer: customerId})
-      .exec(cb);
+      .update(
+        { customer: customerId },
+        { $pull : { snapshots: { uuid : null, submittedOn: null, submittedBy: null } } },
+        { multi : true }
+      ).exec(cb);
 
   };
 
   Financials.statics.upsert = function upsert(financials, cb) {
     if (!financials) { return cb(new Error('financials is required'), null); }
     financials.save(function(err, result) {
+      console.log(result);
       return cb(null, result);
     });
   };

package/package.json

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

package/test/Deal.js

@@ -15,6 +15,7 @@ var org;
 var customer;
 var dealId;
 var account;
+var timestamps = [];
 
 describe('Deal', function() {
 
@@ -217,10 +218,18 @@ describe('Deal', function() {
         should.exist(result);
 
         Deal.getForCustomer(config.CUSTOMER_ID, {}, function(err, result) {
+
           should.not.exist(err);
           should.exist(result)
+
           result.length.should.equal(2);
+
+          timestamps = _.pluck(result[0].history, 'timestamp');
+          timestamps = timestamps.concat(_.pluck(result[0].history, 'timestamp'));
+          timestamps = _.sortBy(timestamps, function(ts) { return - (new Date(ts)); });
+
           return done();
+
         });
 
       });
@@ -229,6 +238,21 @@ describe('Deal', function() {
 
   });
 
+  it('gets new deals for a customer', function(done) {
+
+    Deal.getForCustomer(config.CUSTOMER_ID, { since: timestamps[0] }, function(err, result) {
+
+      should.not.exist(err);
+      should.exist(result);
+
+      result.length.should.be.greaterThan(0);
+
+      return done();
+
+    });
+
+  });
+
   it('gets all deals', function(done) {
 
     var temp = config.CUSTOMER_ID;