@dhyasama/totem-models 11.90.0 → 11.93.0

package/lib/Deal.js

@@ -758,25 +758,54 @@ module.exports = function(mongoose, config) {
     if (!deal) { return cb(new Error('deal is required'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
 
-    let getLastStage = function() {
+    let getPreviousStage = function(currentStage) {
 
       if (!deal.history || deal.history.length === 0) return null;
 
-      let history = _.sortBy(deal.history);
-      let last = history[history.length - 1];
+      let previous = null;
 
-      return last.stage;
+      for (let i = 0; i < deal.history.length; i++) {
+        const item = deal.history[i];
+        if (!item || !item.stage) continue;
+        if (item.stage === currentStage) continue;
+
+        if (!previous || new Date(item.timestamp).getTime() > new Date(previous.timestamp).getTime()) {
+          previous = item;
+        }
+      }
+
+      return previous ? previous.stage : null;
 
     };
 
+    // Determine if any meaningful fields have actually changed
+    const trackedPaths = ['action', 'source', 'referrer', 'fundraise', 'resources', 'documents', 'customFields'];
+    let otherChanged = false;
+    if (deal._originalTracked) {
+      const afterNormalized = normalizeTrackedFromDoc(deal);
+      otherChanged = trackedPaths.some(function(path) {
+        return !_.isEqual(deal._originalTracked[path], afterNormalized[path]);
+      });
+    }
+    else {
+      otherChanged = deal.isModified ? trackedPaths.some(function(path) { return deal.isModified(path); }) : false;
+    }
+
     let description = '';
-    let lastStage = getLastStage();
+    const stageChanged = (typeof deal.isModified === 'function') ? deal.isModified('stage') : false;
+    const previousStage = stageChanged ? getPreviousStage(deal.stage) : null;
 
-    if (lastStage === null) description = 'The deal was created';
-    else if (lastStage !== deal.stage) description += 'The deal was updated from ' + lastStage + ' to ' + deal.stage;
-    else description = 'The deal details were updated';
+    if (deal.isNew) {
+      description = 'The deal was created';
+    }
+    else if (stageChanged) {
+      description = 'The deal was updated from ' + previousStage + ' to ' + deal.stage;
+    }
+    else if (otherChanged) {
+      description = 'The deal details were updated';
+    }
 
-    // only add history if the description is set from the above conditions
+    // Only add history and bump lastUpdated if there were actual changes
     if (description !== '') {
 
       deal.history = deal.history || [];

package/lib/Financials.js

@@ -84,7 +84,7 @@ module.exports = function(mongoose, config) {
       status: { type: String, enum: ['Created', 'Scheduled', 'Delivered', 'Opened', 'Overdue', 'In Review', 'Completed', 'Archived'] },
 
       year: { type: Number, default: 0 },
-      period: { type: String, enum: ['Annual', 'Q1', 'Q2', 'Q3', 'Q4', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] },
+      period: { type: String, enum: ['Annual', 'H1', 'H2', 'Q1', 'Q2', 'Q3', 'Q4', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] },
 
       form: [{
         name: { type: String, trim: true },

package/package.json

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