bulltrackers-module 1.0.253 → 1.0.254

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

@@ -1,6 +1,6 @@
 /**
  * @fileoverview Checks availability of root data via the Root Data Index.
- * REFACTORED: Now relies on the centralized 'system_root_data_index' map.
+ * REFACTORED: Now supports granular 'userType' checks (Speculator vs Normal).
  */
 const { normalizeName } = require('../utils/utils');
 
@@ -10,11 +10,34 @@ const INDEX_COLLECTION = process.env.ROOT_DATA_AVAILABILITY_COLLECTION || 'syste
 function checkRootDependencies(calcManifest, rootDataStatus) {
     const missing = [];
     if (!calcManifest.rootDataDependencies) return { canRun: true, missing };
+
+    const userType = calcManifest.userType || 'all';
+
     for (const dep of calcManifest.rootDataDependencies) {
-        if (dep === 'portfolio'     && !rootDataStatus.hasPortfolio) missing.push('portfolio');
+        if (dep === 'portfolio') {
+            if (userType === 'speculator') {
+                if (!rootDataStatus.speculatorPortfolio) missing.push('speculatorPortfolio');
+            } else if (userType === 'normal') {
+                if (!rootDataStatus.normalPortfolio) missing.push('normalPortfolio');
+            } else {
+                // 'all', 'aggregate', or 'n/a' -> Check if ANY portfolio data exists
+                // This satisfies the "either/or" requirement for generic calculations
+                if (!rootDataStatus.hasPortfolio) missing.push('portfolio');
+            }
+        }
+        else if (dep === 'history') {
+            if (userType === 'speculator') {
+                if (!rootDataStatus.speculatorHistory) missing.push('speculatorHistory');
+            } else if (userType === 'normal') {
+                if (!rootDataStatus.normalHistory) missing.push('normalHistory');
+            } else {
+                // 'all', 'aggregate', or 'n/a' -> Check if ANY history data exists
+                if (!rootDataStatus.hasHistory) missing.push('history');
+            }
+        }
+        // These data types are global and do not have user subtypes
         else if (dep === 'insights' && !rootDataStatus.hasInsights)  missing.push('insights');
         else if (dep === 'social'   && !rootDataStatus.hasSocial)    missing.push('social');
-        else if (dep === 'history'  && !rootDataStatus.hasHistory)   missing.push('history');
         else if (dep === 'price'    && !rootDataStatus.hasPrices)    missing.push('price');
     }
     return { canRun: missing.length === 0, missing };
@@ -49,27 +72,33 @@ function getViableCalculations(candidates, fullManifest, rootDataStatus, dailySt
 
 /**
  * Checks data availability by reading the centralized index.
- * Only falls back to raw checks if explicitly configured or index is missing.
+ * Extracts granular details to support Speculator-specific checks.
  */
 async function checkRootDataAvailability(dateStr, config, dependencies, earliestDates) {
     const { logger, db } = dependencies;
     
     try {
         // 1. Try reading the Index
-        const indexDoc = await db.collection(INDEX_COLLECTION).doc(dateStr).get();
+        const indexDoc = db.collection(INDEX_COLLECTION).doc(dateStr).get();
         
         if (indexDoc.exists) {
             const data = indexDoc.data();
-            // Return status based on the map
-            // Note: We return null references. The data loaders in streamPortfolioData
-            // have logic to fetch refs if providedRefs is null (which they are here).
+            const details = data.details || {}; // Extract granular details if present
+
             return {
                 status: {
+                    // Global flags (Aggregate - true if EITHER exists)
                     hasPortfolio: !!data.hasPortfolio,
                     hasHistory:   !!data.hasHistory,
                     hasSocial:    !!data.hasSocial,
                     hasInsights:  !!data.hasInsights,
-                    hasPrices:    !!data.hasPrices
+                    hasPrices:    !!data.hasPrices,
+
+                    // Granular flags (Specific)
+                    speculatorPortfolio: !!details.speculatorPortfolio,
+                    normalPortfolio:     !!details.normalPortfolio,
+                    speculatorHistory:   !!details.speculatorHistory,
+                    normalHistory:       !!details.normalHistory
                 },
                 portfolioRefs: null, 
                 historyRefs: null,
@@ -79,10 +108,12 @@ async function checkRootDataAvailability(dateStr, config, dependencies, earliest
             };
         } else {
             // Index missing: implies data hasn't been indexed yet or doesn't exist.
-            // For safety in this strict model, we assume MISSING.
             logger.log('WARN', `[Availability] Index not found for ${dateStr}. Assuming NO data.`);
             return {
-                status: { hasPortfolio: false, hasHistory: false, hasSocial: false, hasInsights: false, hasPrices: false }
+                status: { 
+                    hasPortfolio: false, hasHistory: false, hasSocial: false, hasInsights: false, hasPrices: false,
+                    speculatorPortfolio: false, normalPortfolio: false, speculatorHistory: false, normalHistory: false
+                }
             };
         }
 

package/package.json

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