@dhyasama/totem-models 11.142.0 → 11.144.0

package/lib/Financials.js

@@ -112,7 +112,8 @@ module.exports = function(mongoose, config) {
         scenario: { type: String, enum: ['actual', 'budget', 'forecast'] },
         value: { type: Number },
         breakdown: { type: Schema.Types.Mixed },
-        source: {
+        calculation: { type: String, trim: true },
+        sources: [{
           _id: false,
           model: {
             type: String,
@@ -120,11 +121,11 @@ module.exports = function(mongoose, config) {
           },
           ref: {
             type: Schema.Types.ObjectId,
-            refPath: 'metrics.source.model',
+            refPath: 'metrics.sources.model',
           },
-          position: {                                                                      
-            _id: false,                                                                       
-            page: { type: Number },                                                        
+          position: {
+            _id: false,
+            page: { type: Number },
             bbox: {
               _id: false,
               top: { type: Number },
@@ -132,29 +133,17 @@ module.exports = function(mongoose, config) {
               width: { type: Number },
               height: { type: Number }
             },
-            row: { type: Number },
-            col: { type: Number },
-            sheet: { type: String }
-          },
-          calculation: {
-            _id: false,
-            description: { type: String, trim: true },
-            positions: [{
-              _id: false,
-              page: { type: Number },
-              bbox: {
-                _id: false,
-                top: { type: Number },
-                left: { type: Number },
-                width: { type: Number },
-                height: { type: Number }
-              },
+            sheet: { type: String },
+            header: {
               row: { type: Number },
-              col: { type: Number },
-              sheet: { type: String }
-            }]
+              column: { type: Number }
+            },
+            cell: {
+              row: { type: Number },
+              column: { type: Number }
+            }
           }
-        },
+        }],
         verified: { type: Boolean, default: false },
         history: [{
           _id: false,
@@ -166,19 +155,32 @@ module.exports = function(mongoose, config) {
           _id: false,
           value: { type: Number },
           breakdown: { type: Schema.Types.Mixed },
-          source: {
+          calculation: { type: String, trim: true },
+          sources: [{
             _id: false,
             model: { type: String, enum: ['Document', 'Meeting', 'Message', 'Note'] },
             ref: { type: Schema.Types.ObjectId },
             position: {
               _id: false,
               page: { type: Number },
-              bbox: { _id: false, top: { type: Number }, left: { type: Number }, width: { type: Number }, height: { type: Number } },
-              row: { type: Number },
-              col: { type: Number },
-              sheet: { type: String }
+              bbox: {
+                _id: false,
+                top: { type: Number },
+                left: { type: Number },
+                width: { type: Number },
+                height: { type: Number }
+              },
+              sheet: { type: String },
+              header: {
+                row: { type: Number },
+                column: { type: Number }
+              },
+              cell: {
+                row: { type: Number },
+                column: { type: Number }
+              }
             }
-          },
+          }],
           verified: { type: Boolean },
           history: [{
             _id: false,
@@ -439,7 +441,8 @@ module.exports = function(mongoose, config) {
         const previousState = currentMetric ? {
           value: currentMetric.value != null ? currentMetric.value : null,
           breakdown: currentMetric.breakdown != null ? currentMetric.breakdown : null,
-          source: currentMetric.source || null,
+          calculation: currentMetric.calculation || null,
+          sources: currentMetric.sources || [],
           verified: currentMetric.verified != null ? currentMetric.verified : null,
           history: currentMetric.history || []
         } : undefined;
@@ -450,7 +453,8 @@ module.exports = function(mongoose, config) {
         const $set = {
           'snapshots.$.metrics.$[metric].value': metric.value,
           'snapshots.$.metrics.$[metric].breakdown': metric.breakdown,
-          'snapshots.$.metrics.$[metric].source': metric.source,
+          'snapshots.$.metrics.$[metric].calculation': metric.calculation,
+          'snapshots.$.metrics.$[metric].sources': metric.sources,
           'snapshots.$.metrics.$[metric].verified': metric.verified
         };
 
@@ -562,7 +566,7 @@ module.exports = function(mongoose, config) {
           const $set = {};
           const $unset = { [prefix + '.previous']: 1 };
 
-          const fields = ['value', 'breakdown', 'source', 'verified'];
+          const fields = ['value', 'breakdown', 'calculation', 'sources', 'verified'];
           fields.forEach(field => {
             if (prev[field] != null) {
               $set[prefix + '.' + field] = prev[field];

package/package.json

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

package/scripts/migrate-financials-schema.js

@@ -17,7 +17,7 @@
  * 7. Remove verified field from questions[] (removed in commit 300a22a)
  * 8. Add verified: true for metrics[] only
  * 9. Convert metrics from old structure { name, actual, budget, forecast, breakdown }
- *    to new structure { name, scenario, value, breakdown, source, verified, history }
+ *    to new structure { name, scenario, value, breakdown, calculation, sources, verified, history }
  * 10. Link metrics to their source financial statement documents (Income Statement,
  *     Balance Sheet, Cash Flow Statement) when available
  * 11. Remove projections array from root level
@@ -326,7 +326,7 @@ async function migrateFinancials() {
                   verified: true,
                   history: historyArrayForMetrics
                 };
-                if (source) newMetric.source = source;
+                if (source) newMetric.sources = [source];
                 newMetrics.push(newMetric);
               }
 
@@ -339,7 +339,7 @@ async function migrateFinancials() {
                   verified: true,
                   history: historyArrayForMetrics
                 };
-                if (source) newMetric.source = source;
+                if (source) newMetric.sources = [source];
                 newMetrics.push(newMetric);
               }
 
@@ -352,14 +352,14 @@ async function migrateFinancials() {
                   verified: true,
                   history: historyArrayForMetrics
                 };
-                if (source) newMetric.source = source;
+                if (source) newMetric.sources = [source];
                 newMetrics.push(newMetric);
               }
             });
 
-            const metricsWithSource = newMetrics.filter(m => m.source).length;
+            const metricsWithSources = newMetrics.filter(m => m.sources && m.sources.length > 0).length;
             updates[`snapshots.${index}.metrics`] = newMetrics;
-            changes.push(`  - Snapshot ${index}: Converted ${oldMetrics.length} metric(s) to new structure (${newMetrics.length} entries, ${metricsWithSource} with source)`);
+            changes.push(`  - Snapshot ${index}: Converted ${oldMetrics.length} metric(s) to new structure (${newMetrics.length} entries, ${metricsWithSources} with sources)`);
           } else {
             // Already in new structure, just add verified, history, and source if missing
             oldMetrics.forEach((metric, mIndex) => {
@@ -371,11 +371,11 @@ async function migrateFinancials() {
                 updates[`snapshots.${index}.metrics.${mIndex}.history`] = historyArrayForMetrics;
                 changes.push(`  - Snapshot ${index}: Added history (${historyArrayForMetrics.length} entries) to metric ${mIndex}`);
               }
-              if (!('source' in metric)) {
+              if (!('sources' in metric)) {
                 const source = getSourceForMetric(metric.name);
                 if (source) {
-                  updates[`snapshots.${index}.metrics.${mIndex}.source`] = source;
-                  changes.push(`  - Snapshot ${index}: Added source to metric ${mIndex} (${metric.name})`);
+                  updates[`snapshots.${index}.metrics.${mIndex}.sources`] = [source];
+                  changes.push(`  - Snapshot ${index}: Added sources to metric ${mIndex} (${metric.name})`);
                 }
               }
             });