bulltrackers-module 1.0.142 → 1.0.144

package/functions/computation-system/helpers/orchestration_helpers.js

@@ -55,7 +55,21 @@ async function checkRootDataAvailability(dateStr, config, dependencies, earliest
             // We return null to skip the entire day
             return null;
         }
-        return {portfolioRefs, insightsData,socialData,historyRefs,status: { hasPortfolio, hasInsights, hasSocial, hasHistory }};
+        
+        /**
+         * --- THIS IS THE FIX ---
+         * Rename keys to match what streamAndProcess (Stage 8) expects.
+         * 'insightsData' is renamed to 'todayInsights'.
+         * 'socialData' is renamed to 'todaySocialPostInsights'.
+         */
+        return {
+            portfolioRefs, 
+            todayInsights: insightsData,      // <-- FIX
+            todaySocialPostInsights: socialData, // <-- FIX
+            historyRefs,
+            status: { hasPortfolio, hasInsights, hasSocial, hasHistory }
+        };
+
     } catch (err) { logger.log('ERROR', `[PassRunner] Error checking data for ${dateStr}`, { errorMessage: err.message }); return null; }
 }
 
@@ -168,12 +182,16 @@ function filterCalculations(standardCalcs, metaCalcs, rootDataStatus, existingRe
 /** Stage 6: Initialize calculator instances */
 function initializeCalculators(calcs, logger) { const state = {}; for (const c of calcs) { const name=normalizeName(c.name), Cl=c.class; if(typeof Cl==='function') try { const inst=new Cl(); inst.manifest=c; state[name]=inst; } catch(e){logger.warn(`Init failed ${name}`,{errorMessage:e.message}); state[name]=null;} else {logger.warn(`Class missing ${name}`); state[name]=null;} } return state; }
 
-/** Stage 7: Load historical data required for calculations */
-async function loadHistoricalData(date, calcs, config, deps, rootData) { const updated = {...rootData}, dStr=date.toISOString().slice(0,10); const tasks = [];
+/** * Stage 7: Load historical data required for calculations 
+ * --- THIS FUNCTION IS NOW FIXED ---
+ */
+async function loadHistoricalData(date, calcs, config, deps, rootData) { 
+    const { logger } = deps; // <--- THIS WAS THE MISSING LINE
+    const updated = {...rootData}, dStr=date.toISOString().slice(0,10); const tasks = [];
+    
     const needsYesterdayPortfolio = calcs.some(c => c.isHistorical && c.rootDataDependencies.includes('portfolio'));
     const needsTodayHistory = calcs.some(c => c.rootDataDependencies.includes('history'));
     const needsYesterdayHistory = calcs.some(c => c.isHistorical && c.rootDataDependencies.includes('history'));
-    // --- NEW: Add checks for historical insights and social ---
     const needsYesterdayInsights = calcs.some(c => c.isHistorical && c.rootDataDependencies.includes('insights'));
     const needsYesterdaySocial = calcs.some(c => c.isHistorical && c.rootDataDependencies.includes('social'));
     
@@ -196,7 +214,6 @@ async function loadHistoricalData(date, calcs, config, deps, rootData) { const u
             updated.yesterdayHistoryData=await loadFullDayMap(config,deps,await getHistoryPartRefs(config,deps,prevStr)); 
         })());
     }
-    // --- NEW: Load historical insights/social ---
     if(needsYesterdayInsights) {
         tasks.push((async()=>{ const prev=new Date(date); prev.setUTCDate(prev.getUTCDate()-1); const prevStr=prev.toISOString().slice(0,10); 
             logger.log('INFO', `[PassRunner] Loading YESTERDAY insights data for ${prevStr}`);
@@ -221,6 +238,7 @@ async function loadHistoricalData(date, calcs, config, deps, rootData) { const u
 async function streamAndProcess(dateStr, state, passName, config, deps, rootData) { 
     const { logger, calculationUtils } = deps;
     // --- MODIFIED: yesterdayInsights/Social are now loaded by loadHistoricalData ---
+    // --- THIS WILL NOW WORK, as rootData contains 'todayInsights' from Stage 3 ---
     const { todayInsights, yesterdayInsights, todaySocialPostInsights, yesterdaySocialPostInsights, todayHistoryData, yesterdayHistoryData, yesterdayPortfolios } = rootData;
     
     // --- NEW: Check if streaming is even needed ---
@@ -237,6 +255,7 @@ async function streamAndProcess(dateStr, state, passName, config, deps, rootData
         if(cat==='socialPosts'||cat==='insights') {
             if (firstUser) {
                 logger.log('INFO', `[${passName}] Running non-streaming calc: ${name}`);
+                // --- This 'args' array will now receive the correct data ---
                 let args=[null,null,null,{...context, userType: 'n/a'},todayInsights,yesterdayInsights,todaySocialPostInsights,yesterdaySocialPostInsights,todayHistoryData,yesterdayHistoryData];
                 // Pass historical data if needed
                 if(calc.manifest.isHistorical) {
@@ -266,6 +285,7 @@ async function streamAndProcess(dateStr, state, passName, config, deps, rootData
                 // --- MODIFIED: Skip social/insights here, they ran above ---
                 if(isSocialOrInsights) continue; 
                 
+                // --- This 'args' array will now receive the correct data ---
                 let args=[p,null,uid,context,todayInsights,yesterdayInsights,todaySocialPostInsights,yesterdaySocialPostInsights,todayHistoryData,yesterdayHistoryData]; 
                 
                 if(isHistorical){ 
@@ -287,7 +307,7 @@ async function runStandardComputationPass(date, calcs, passName, config, deps, r
     // --- THIS IS THE CRITICAL CHANGE ---
     // If 'calcs' is empty *because of the new filter*, this log won't even appear.
     if (calcs.length === 0) {
-        logger.log('INFO', `[${passName}] No standard calcs to run for ${dateStr} after filtering.`);
+        logger.log('INFO', `[${passName}] No standard calcs to run for ${dStr} after filtering.`);
         return; 
     }
     // This log now only appears if there is *actually* work to do.

package/package.json

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