bulltrackers-module 1.0.701 → 1.0.703

package/functions/computation-system/data/CachedDataLoader.js

@@ -17,7 +17,8 @@ const {
     loadWatchlistMembership: loadWatchlistMembershipData,
     loadPIAlertHistory,
     loadPIWatchlistData,
-    loadPopularInvestorMasterList
+    loadPopularInvestorMasterList,
+    loadDailyPortfolios // <--- IMPORTED
 } = require('../utils/data_loader');
 const { getAvailabilityWindow } = require('./AvailabilityChecker');
 const zlib = require('zlib'); 
@@ -81,6 +82,12 @@ const LOADER_DEFINITIONS = {
         // No collection key needed for direct implementation, but handled by fn
         fn: loadPIWatchlistData,
         isIdBased: true // Uses ID instead of Date
+    },
+    // <--- ADDED SUPPORT FOR PORTFOLIO SERIES
+    loadPortfolios: {
+        cache: 'portfolios',
+        fn: loadDailyPortfolios
+        // No configKey/flag ensures legacy loop (required for complex multi-collection fetch)
     }
 };
 
@@ -112,7 +119,8 @@ class CachedDataLoader {
     // =========================================================================
     // GENERIC LOADER HELPER
     // =========================================================================
-    async _loadGeneric(methodName, key) {
+    // [FIX] Accepts ...args to pass down filters (like requiredUserTypes)
+    async _loadGeneric(methodName, key, ...args) {
         const def = LOADER_DEFINITIONS[methodName];
         if (!def) throw new Error(`Unknown loader method: ${methodName}`);
 
@@ -125,7 +133,7 @@ class CachedDataLoader {
             this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Loading '${def.cache}' from: ${collection}/${key}`);
         }
 
-        const promise = def.fn(this.config, this.deps, key);
+        const promise = def.fn(this.config, this.deps, key, ...args);
         cacheMap.set(key, promise);
         return promise;
     }
@@ -144,6 +152,8 @@ class CachedDataLoader {
     async loadWatchlistMembership(dateStr)  { return this._loadGeneric('loadWatchlistMembership', dateStr); }
     async loadAlertHistory(dateStr)         { return this._loadGeneric('loadAlertHistory'       , dateStr); }
     async loadPIWatchlistData(piCid)        { return this._loadGeneric('loadPIWatchlistData'    , String(piCid)); }
+    // <--- ADDED PORTFOLIOS ACCESSOR with extra arg
+    async loadPortfolios(dateStr, userTypes) { return this._loadGeneric('loadPortfolios', dateStr, userTypes); }
 
     // =========================================================================
     // SPECIALIZED LOADERS (Non-Standard Patterns)
@@ -195,13 +205,14 @@ class CachedDataLoader {
     /**
      * Optimistically loads data series using Batch Reads (db.getAll).
      * Uses Availability Index to minimize costs.
+     * [FIX] Now accepts ...args to pass context (e.g. requiredUserTypes)
      */
-    async loadSeries(loaderMethod, dateStr, lookbackDays) {
+    async loadSeries(loaderMethod, dateStr, lookbackDays, ...args) {
         const def = LOADER_DEFINITIONS[loaderMethod];
         if (!def) throw new Error(`[CachedDataLoader] Unknown series method ${loaderMethod}`);
         
         // Fallback to legacy loop if method isn't configured for batching (missing config/flag)
-        if (!def.configKey || !def.flag) return this._loadSeriesLegacy(loaderMethod, dateStr, lookbackDays);
+        if (!def.configKey || !def.flag) return this._loadSeriesLegacy(loaderMethod, dateStr, lookbackDays, ...args);
 
         // 1. Calculate Date Range
         const endDate = new Date(dateStr);
@@ -256,7 +267,7 @@ class CachedDataLoader {
                 });
             } catch (err) {
                 console.warn(`[CachedDataLoader] Batch failed: ${err.message}. Legacy fallback.`);
-                return this._loadSeriesLegacy(loaderMethod, dateStr, lookbackDays);
+                return this._loadSeriesLegacy(loaderMethod, dateStr, lookbackDays, ...args);
             }
         }
 
@@ -268,7 +279,7 @@ class CachedDataLoader {
         };
     }
 
-    async _loadSeriesLegacy(loaderMethod, dateStr, lookbackDays) {
+    async _loadSeriesLegacy(loaderMethod, dateStr, lookbackDays, ...args) {
         const results = {};
         const promises = [];
         const endDate = new Date(dateStr);
@@ -277,7 +288,8 @@ class CachedDataLoader {
             const d = new Date(endDate);
             d.setUTCDate(d.getUTCDate() - i);
             const dStr = d.toISOString().slice(0, 10);
-            promises.push(this[loaderMethod](dStr).then(data => data ? results[dStr] = data : null).catch(() => null));
+            // [FIX] Pass args (e.g. requiredUserTypes) to the loader method
+            promises.push(this[loaderMethod](dStr, ...args).then(data => data ? results[dStr] = data : null).catch(() => null));
         }
 
         await Promise.all(promises);

package/functions/computation-system/executors/StandardExecutor.js

@@ -392,6 +392,10 @@ async function loadSeriesData(loader, dateStr, calcs, config, deps) {
     const rootReqs = {};
     const depReqs = {};  // norm -> { days, originalName, category }
 
+    // [FIX] Calculate User Types here to pass to loadSeries
+    const requiredUserTypes = new Set(calcs.map(c => (c.userType || 'ALL').toUpperCase()));
+    const userTypeArray = requiredUserTypes.has('ALL') ? null : Array.from(requiredUserTypes);
+
     calcs.forEach(c => {
         if (c.manifest.rootDataSeries) {
             Object.entries(c.manifest.rootDataSeries).forEach(([k, v]) => rootReqs[k] = Math.max(rootReqs[k]||0, v.lookback||v));
@@ -410,11 +414,17 @@ async function loadSeriesData(loader, dateStr, calcs, config, deps) {
     const series = { root: {}, results: {} };
     const rootMap = {
         alerts: 'loadAlertHistory', insights: 'loadInsights', ratings: 'loadRatings',
-        watchlist: 'loadWatchlistMembership', rankings: 'loadRankings'
+        watchlist: 'loadWatchlistMembership', rankings: 'loadRankings',
+        // <--- ADDED MAPPING
+        portfolios: 'loadPortfolios' 
     };
 
     await Promise.all(Object.entries(rootReqs).map(async ([key, days]) => {
-        if (rootMap[key]) series.root[key] = (await loader.loadSeries(rootMap[key], dateStr, days)).data;
+        if (rootMap[key]) {
+            // [FIX] Pass userTypeArray specifically if loading portfolios
+            const extraArgs = (key === 'portfolios') ? [userTypeArray] : [];
+            series.root[key] = (await loader.loadSeries(rootMap[key], dateStr, days, ...extraArgs)).data;
+        }
     }));
 
     // Build lookup from ALL computations using config.calculations

package/functions/computation-system/utils/data_loader.js

@@ -228,6 +228,19 @@ async function loadFullDayMap(config, deps, partRefs, dateString) {
     return fullMap;
 }
 
+/** Stage 3.5: Load Daily Portfolios (Wrapper for Series Loading) */
+async function loadDailyPortfolios(config, deps, dateString, requiredUserTypes = null) {
+    // 1. GCS FAST PATH
+    const cached = await tryLoadFromGCS(config, dateString, 'portfolios', deps.logger);
+    if (cached) return cached;
+
+    // 2. FIRESTORE FALLBACK
+    // [FIX] Now passing requiredUserTypes to prevent fetching all users (e.g. NormalUserPortfolios)
+    const partRefs = await getPortfolioPartRefs(config, deps, dateString, requiredUserTypes);
+    if (partRefs.length === 0) return {};
+    return loadDataByRefs(config, deps, partRefs);
+}
+
 /** Stage 4: Load daily instrument insights */
 async function loadDailyInsights(config, deps, dateString) {
     const { db, logger, calculationUtils } = deps;
@@ -800,7 +813,8 @@ async function loadPopularInvestorMasterList(config, deps, dateString = null) {
 module.exports = {
     getPortfolioPartRefs, 
     loadDataByRefs, 
-    loadFullDayMap, 
+    loadFullDayMap,
+    loadDailyPortfolios, 
     loadDailyInsights, 
     loadDailySocialPostInsights, 
     getHistoryPartRefs, 

package/package.json

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