bulltrackers-module 1.0.552 → 1.0.554

package/functions/alert-system/index.js

@@ -10,9 +10,9 @@ const { processAlertForPI, readComputationResults, readComputationResultsWithSha
  * Pub/Sub trigger handler for alert generation
  * Expected message format:
  * {
- *   date: "2025-12-27",
- *   computationName: "PiRiskIncrease",
- *   documentPath: "unified_insights/2025-12-27/results/popular-investor/computations/PiRiskIncrease"
+ * date: "2025-12-27",
+ * computationName: "PiRiskIncrease",
+ * documentPath: "unified_insights/2025-12-27/results/popular-investor/computations/PiRiskIncrease"
  * }
  */
 async function handleAlertTrigger(message, context, config, dependencies) {
@@ -130,30 +130,40 @@ async function handleAlertTrigger(message, context, config, dependencies) {
  * Firestore trigger function for alert generation
  * Triggered when computation results are written to:
  * unified_insights/{date}/results/{category}/computations/{computationName}
- * 
- * Handles sharded data by checking _shards subcollection if _sharded === true
+ * * Handles sharded data by checking _shards subcollection if _sharded === true
  */
 async function handleComputationResultWrite(change, context, config, dependencies) {
   const { db, logger } = dependencies;
-  
-  // Extract path parameters from the document path
-  // Path format: unified_insights/{date}/results/{category}/computations/{computationName}
-  const resource = context.resource || change.after.ref.path;
-  const pathParts = resource.split('/');
-  
-  // Find indices of key path segments
-  const dateIndex = pathParts.indexOf('unified_insights') + 1;
-  const categoryIndex = pathParts.indexOf('results') + 1;
-  const computationIndex = pathParts.indexOf('computations') + 1;
-  
-  if (dateIndex === 0 || categoryIndex === 0 || computationIndex === 0) {
-    logger.log('WARN', `[AlertTrigger] Invalid document path format: ${resource}`);
-    return;
+
+  // --- PATH RESOLUTION LOGIC ---
+  // 1. Try to use context.params (Preferred for Gen 2 & Wildcards)
+  // The 'contextShim' in your root index.js passes 'event.params' into here.
+  let { date, category, computationName } = context.params || {};
+
+  // 2. Fallback: Parse from resource string (Legacy / Backup)
+  if (!date || !computationName) {
+      const resource = context.resource || (change.after && change.after.ref.path) || '';
+      
+      // Simple split logic can fail on full resource URIs (e.g. //firestore.googleapis.com/...)
+      // so we look for specific keywords to anchor the split.
+      const pathParts = resource.split('/');
+      
+      const dateIndex = pathParts.indexOf('unified_insights') + 1;
+      const categoryIndex = pathParts.indexOf('results') + 1;
+      const computationIndex = pathParts.indexOf('computations') + 1;
+      
+      if (dateIndex > 0 && categoryIndex > 0 && computationIndex > 0) {
+          date = pathParts[dateIndex];
+          category = pathParts[categoryIndex];
+          computationName = pathParts[computationIndex];
+      }
+  }
+
+  // 3. Validation
+  if (!date || !category || !computationName) {
+      logger.log('WARN', `[AlertTrigger] Could not resolve path params. Resource: ${context.resource}`);
+      return;
   }
-  
-  const date = pathParts[dateIndex];
-  const category = pathParts[categoryIndex];
-  const computationName = pathParts[computationIndex];
   
   // Only process if document was created or updated (not deleted)
   if (!change.after.exists) {
@@ -169,9 +179,9 @@ async function handleComputationResultWrite(change, context, config, dependencie
       return;
     }
     
-    // Only process popular-investor category computations
-    if (category !== 'popular-investor') {
-      logger.log('DEBUG', `[AlertTrigger] Not popular-investor category: ${category}`);
+    // [FIX] Allow both 'popular-investor' (for profile metrics) AND 'alerts' (for actual alerts)
+    if (category !== 'popular-investor' && category !== 'alerts') {
+      logger.log('DEBUG', `[AlertTrigger] Skipping irrelevant category: ${category}`);
       return;
     }
     
@@ -440,5 +450,4 @@ module.exports = {
   handleAlertTrigger,
   handleComputationResultWrite,
   checkAndSendAllClearNotifications
-};
-
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.552",
+  "version": "1.0.554",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [