bulltrackers-module 1.0.729 → 1.0.731

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

@@ -207,8 +207,9 @@ class StandardExecutor {
 
             let social = null;
             if (globalRoots.social) {
-                social = (actualType === 'POPULAR_INVESTOR' ? globalRoots.social.pi[userId] : 
-                         (actualType === 'SIGNED_IN_USER' ? globalRoots.social.signedIn[userId] : globalRoots.social.generic)) || {};
+                // Use optional chaining to handle missing sub-objects (pi, signedIn, generic)
+                social = (actualType === 'POPULAR_INVESTOR' ? globalRoots.social.pi?.[userId] : 
+                         (actualType === 'SIGNED_IN_USER' ? globalRoots.social.signedIn?.[userId] : globalRoots.social.generic)) || {};
             }
 
             // 4. Build Context

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

@@ -459,9 +459,22 @@ exports.streamPortfolioData = async function* (config, deps, dateStr, refs, user
     if (isBigQuery && process.env.BIGQUERY_ENABLED !== 'false') {
         try {
             const types = userTypes || ['POPULAR_INVESTOR', 'SIGNED_IN_USER'];
-            const data = await queryPortfolioData(dateStr, null, types, logger);
+            const rawData = await queryPortfolioData(dateStr, null, types, logger);
             
-            if (data && Object.keys(data).length > 0) {
+            if (rawData && Object.keys(rawData).length > 0) {
+                // Transform BigQuery format to computation system format
+                // BigQuery returns: { cid: { portfolio_data: {...}, user_type: '...', fetched_at: '...' } }
+                // Computation system expects: { cid: { ...portfolioFields..., _userType: '...' } }
+                const data = {};
+                for (const [cid, record] of Object.entries(rawData)) {
+                    // Unwrap portfolio_data and add _userType metadata
+                    const portfolioData = record.portfolio_data || {};
+                    data[cid] = {
+                        ...portfolioData,
+                        _userType: record.user_type
+                    };
+                }
+                
                 logger.log('INFO', `[DataLoader] ✅ Streaming ${Object.keys(data).length} portfolios from BigQuery (${dateStr})`);
                 
                 // Yield in chunks of 100 users for memory efficiency
@@ -526,9 +539,22 @@ exports.streamHistoryData = async function* (config, deps, dateStr, refs, userTy
     if (isBigQuery && process.env.BIGQUERY_ENABLED !== 'false') {
         try {
             const types = userTypes || ['POPULAR_INVESTOR', 'SIGNED_IN_USER'];
-            const data = await queryHistoryData(dateStr, null, types, logger);
+            const rawData = await queryHistoryData(dateStr, null, types, logger);
             
-            if (data && Object.keys(data).length > 0) {
+            if (rawData && Object.keys(rawData).length > 0) {
+                // Transform BigQuery format to computation system format
+                // BigQuery returns: { cid: { history_data: {...}, user_type: '...', fetched_at: '...' } }
+                // Computation system expects: { cid: { ...historyFields..., _userType: '...' } }
+                const data = {};
+                for (const [cid, record] of Object.entries(rawData)) {
+                    // Unwrap history_data and add _userType metadata
+                    const historyData = record.history_data || {};
+                    data[cid] = {
+                        ...historyData,
+                        _userType: record.user_type
+                    };
+                }
+                
                 logger.log('INFO', `[DataLoader] ✅ Streaming ${Object.keys(data).length} history records from BigQuery (${dateStr})`);
                 
                 // Yield in chunks of 100 users

package/package.json

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