@dhyasama/totem-models 11.124.0 → 11.126.0

package/lib/Financials.js

@@ -366,12 +366,22 @@ module.exports = function(mongoose, config) {
         console.log('Upserting metric breakdown:', metric.breakdown);
 
         // Check if the metric exists and update it
+        // Use $elemMatch to ensure we find a metric with BOTH name AND scenario matching
+        // (without $elemMatch, MongoDB could match name on one metric and scenario on another)
         return self.findOneAndUpdate(
           {
             _id: financialsId,
-            'snapshots.uuid': snapshotUUID,
-            'snapshots.metrics.name': metric.name,
-            'snapshots.metrics.scenario': metric.scenario
+            snapshots: {
+              $elemMatch: {
+                uuid: snapshotUUID,
+                metrics: {
+                  $elemMatch: {
+                    name: metric.name,
+                    scenario: metric.scenario
+                  }
+                }
+              }
+            }
           },
           {
             $set: {
@@ -632,7 +642,8 @@ module.exports = function(mongoose, config) {
         $elemMatch: {
           'notifications.company.initial.sendTo': { $gt: [] },
           'notifications.company.initial.sendOn': { $lte: now },
-          'notifications.company.initial.sentOn': null
+          'notifications.company.initial.sentOn': null,
+          'status': { $nin: ['Pending', 'Completed', 'Archived'] }
         }
       }
     });
@@ -687,7 +698,8 @@ module.exports = function(mongoose, config) {
         $elemMatch: {
           'notifications.company.reminders.sendTo': { $gt: [] },
           'notifications.company.reminders.sendOn': { $lte: now },
-          'notifications.company.reminders.sentOn': null
+          'notifications.company.reminders.sentOn': null,
+          'status': { $nin: ['Pending', 'Completed', 'Archived'] }
         }
       }
     });
@@ -746,7 +758,8 @@ module.exports = function(mongoose, config) {
         $elemMatch: {
           'notifications.company.rejections.sendTo': { $gt: [] },
           'notifications.company.rejections.sendOn': { $lte: now },
-          'notifications.company.rejections.sentOn': null
+          'notifications.company.rejections.sentOn': null,
+          'status': { $nin: ['Pending', 'Completed', 'Archived'] }
         }
       }
     });

package/package.json

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

package/scripts/migrate-all-customers.js

@@ -0,0 +1,194 @@
+'use strict';
+
+/**
+ * Wrapper script to run financials migration for all customers
+ *
+ * Usage:
+ *   NODE_ENV=production node scripts/migrate-all-customers.js [--config <configPath>] [--dry-run]
+ *
+ * Examples:
+ *   # Dry run for all customers using totem-web production config
+ *   NODE_ENV=production node scripts/migrate-all-customers.js --config ../totem-web/config/config.js --dry-run
+ *
+ *   # Actual migration for all customers
+ *   NODE_ENV=production node scripts/migrate-all-customers.js --config ../totem-web/config/config.js
+ */
+
+const mongoose = require('mongoose');
+const path = require('path');
+const { spawn } = require('child_process');
+
+// Parse command line arguments
+const args = process.argv.slice(2);
+const DRY_RUN = args.includes('--dry-run');
+
+// Get config path or db uri
+let configPath = null;
+let dbUri = null;
+
+const configIndex = args.indexOf('--config');
+if (configIndex !== -1 && args[configIndex + 1]) {
+  configPath = path.resolve(args[configIndex + 1]);
+}
+
+const dbUriIndex = args.indexOf('--db-uri');
+if (dbUriIndex !== -1 && args[dbUriIndex + 1]) {
+  dbUri = args[dbUriIndex + 1];
+}
+
+// Check for DB_URI environment variable
+if (!dbUri && process.env.DB_URI) {
+  dbUri = process.env.DB_URI;
+}
+
+// Validate arguments
+if (!configPath && !dbUri) {
+  console.error('Error: Either --config, --db-uri, or DB_URI environment variable is required');
+  console.error('Usage: node scripts/migrate-all-customers.js [--config <configPath>] [--db-uri <mongoUri>] [--dry-run]');
+  process.exit(1);
+}
+
+// Load config if provided
+if (configPath && !dbUri) {
+  console.log(`Loading config from: ${configPath}`);
+  try {
+    const config = require(configPath);
+    dbUri = config.db.uri;
+  } catch (err) {
+    console.error(`Failed to load config: ${err.message}`);
+    console.error('Please provide DB_URI environment variable or use --db-uri flag instead');
+    process.exit(1);
+  }
+}
+
+console.log('Migration Configuration:');
+console.log('  Database URI:', dbUri.replace(/\/\/[^:]+:[^@]+@/, '//*****:*****@')); // Mask credentials
+console.log('  Dry Run:', DRY_RUN);
+console.log('');
+
+// Connect to MongoDB
+const mongooseOptions = {
+  useNewUrlParser: true,
+  useUnifiedTopology: true
+};
+
+mongoose.connect(dbUri, mongooseOptions);
+
+const db = mongoose.connection;
+
+db.on('error', (err) => {
+  console.error('MongoDB connection error:', err);
+  process.exit(1);
+});
+
+db.once('open', async () => {
+  console.log('Connected to MongoDB');
+
+  try {
+    await migrateAllCustomers();
+    console.log('\n=== All migrations completed successfully! ===');
+    process.exit(0);
+  } catch (err) {
+    console.error('\nMigration failed:', err);
+    process.exit(1);
+  }
+});
+
+async function migrateAllCustomers() {
+  const Financials = db.collection('financials');
+
+  // Get all unique customer IDs from financials
+  const customerIds = await Financials.distinct('customer');
+
+  console.log(`Found ${customerIds.length} unique customer(s) with financials to migrate\n`);
+
+  if (customerIds.length === 0) {
+    console.log('No customers with financials found.');
+    return;
+  }
+
+  // Create customer objects with just the ID
+  const customers = customerIds.map(id => ({ _id: id, name: `Customer ${id}` }));
+
+  let successCount = 0;
+  let failureCount = 0;
+  const failures = [];
+
+  // Close the mongoose connection so child processes can connect
+  await mongoose.connection.close();
+  console.log('Closed initial connection\n');
+
+  // Run migration for each customer
+  for (let i = 0; i < customers.length; i++) {
+    const customer = customers[i];
+    const customerId = customer._id.toString();
+    const customerName = customer.name || 'Unknown';
+
+    console.log(`\n${'='.repeat(80)}`);
+    console.log(`[${i + 1}/${customers.length}] Migrating customer: ${customerName} (${customerId})`);
+    console.log('='.repeat(80));
+
+    try {
+      await runMigrationForCustomer(customerId, configPath, dbUri, DRY_RUN);
+      successCount++;
+      console.log(`✓ Customer ${customerName} (${customerId}) migration completed`);
+    } catch (err) {
+      failureCount++;
+      failures.push({ customerId, customerName, error: err.message });
+      console.error(`✗ Customer ${customerName} (${customerId}) migration failed:`, err.message);
+    }
+  }
+
+  console.log('\n' + '='.repeat(80));
+  console.log('=== FINAL SUMMARY ===');
+  console.log('='.repeat(80));
+  console.log(`Total customers: ${customers.length}`);
+  console.log(`Successful migrations: ${successCount}`);
+  console.log(`Failed migrations: ${failureCount}`);
+
+  if (failures.length > 0) {
+    console.log('\nFailed customers:');
+    failures.forEach(({ customerId, customerName, error }) => {
+      console.log(`  - ${customerName} (${customerId}): ${error}`);
+    });
+  }
+
+  if (DRY_RUN) {
+    console.log('\nThis was a dry run. No changes were made to the database.');
+    console.log('Run without --dry-run to apply changes.');
+  }
+}
+
+function runMigrationForCustomer(customerId, configPath, dbUri, dryRun) {
+  return new Promise((resolve, reject) => {
+    const scriptPath = path.join(__dirname, 'migrate-financials-schema.js');
+    const scriptArgs = [scriptPath, customerId];
+
+    if (configPath) {
+      scriptArgs.push('--config', configPath);
+    } else if (dbUri) {
+      scriptArgs.push('--db-uri', dbUri);
+    }
+
+    if (dryRun) {
+      scriptArgs.push('--dry-run');
+    }
+
+    const child = spawn('node', scriptArgs, {
+      stdio: 'inherit',
+      env: { ...process.env }
+    });
+
+    child.on('close', (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`Migration script exited with code ${code}`));
+      }
+    });
+
+    child.on('error', (err) => {
+      reject(err);
+    });
+  });
+}