aiden-shared-calculations-unified 1.0.39 → 1.0.40

package/calculations/behavioural/historical/smart_money_flow.js

@@ -1,5 +1,12 @@
 /**
  * @fileoverview Tracks the investment flow of "smart money".
+ *
+ * --- FIX ---
+ * The core logic (identifySmartMoney) has been moved from process() to
+ * getResult(). This is critical to prevent a race condition where
+ * this calculation tries to *read* the profitability shards
+ * before user_profitability_tracker has *written* them.
+ * --- END FIX ---
  */
 
 const { Firestore } = require('@google-cloud/firestore');
@@ -8,20 +15,20 @@ const firestore = new Firestore();
 const { getInstrumentSectorMap } = require('../../../utils/sector_mapping_provider');
 
 class SmartMoneyFlow {
-    // ... (rest of the code is unchanged) ...
     constructor() {
         this.smartMoneyUsers = new Set();
-        this.sectorFlow = {};
         this.sectorMap = null; // Cache for the sector map
+
+        // --- NEW ---
+        // We now store the portfolio data during process()
+        this.todayPortfolios = {};
+        this.yesterdayPortfolios = {};
+        // --- END NEW ---
     }
 
     async process(todayPortfolio, yesterdayPortfolio, userId) {
-        // Load smart money users only if the set is empty
-        if (this.smartMoneyUsers.size === 0) {
-            await this.identifySmartMoney();
-             // Log after identification attempt
-             console.log(`Identified ${this.smartMoneyUsers.size} smart money users.`);
-        }
+        // --- FIX: process() NO LONGER calls identifySmartMoney ---
+        // It just caches the portfolios we need for getResult()
 
         // Load sector map if not already loaded
         if (!this.sectorMap) {
@@ -29,8 +36,6 @@ class SmartMoneyFlow {
                  this.sectorMap = await getInstrumentSectorMap();
                  if (!this.sectorMap || Object.keys(this.sectorMap).length === 0) {
                      console.warn('Sector map loaded but is empty.');
-                 } else {
-                    // console.log('Sector map loaded successfully.'); // Optional: remove if too verbose
                  }
             } catch (error) {
                 console.error('Failed to load sector map:', error);
@@ -38,36 +43,11 @@ class SmartMoneyFlow {
             }
         }
 
-        // Check if the current user is considered "smart money"
-        if (this.smartMoneyUsers.has(userId) && todayPortfolio && yesterdayPortfolio) {
-             // Ensure sectorMap is available before proceeding
-            if (!this.sectorMap) {
-                console.warn(`Skipping user ${userId}: Sector map not available.`);
-                return;
-            }
-            const todaySectorInvestment = this.calculateSectorInvestment(todayPortfolio);
-            const yesterdaySectorInvestment = this.calculateSectorInvestment(yesterdayPortfolio);
-
-            // Calculate change in investment per sector
-            const allSectors = new Set([...Object.keys(todaySectorInvestment), ...Object.keys(yesterdaySectorInvestment)]);
-            for (const sector of allSectors) {
-                const todayAmount = todaySectorInvestment[sector] || 0;
-                const yesterdayAmount = yesterdaySectorInvestment[sector] || 0;
-                const change = todayAmount - yesterdayAmount;
-
-                // Only record if there is a change
-                if (change !== 0) {
-                     if (!this.sectorFlow[sector]) {
-                        this.sectorFlow[sector] = 0;
-                    }
-                    this.sectorFlow[sector] += change;
-                }
-            }
-        } else {
-             // Optional: Log why processing is skipped for a user
-             // if (!this.smartMoneyUsers.has(userId)) console.log(`User ${userId} is not smart money.`);
-             // if (!todayPortfolio) console.log(`User ${userId}: Missing today's portfolio.`);
-             // if (!yesterdayPortfolio) console.log(`User ${userId}: Missing yesterday's portfolio.`);
+        if (todayPortfolio) {
+            this.todayPortfolios[userId] = todayPortfolio;
+        }
+        if (yesterdayPortfolio) {
+            this.yesterdayPortfolios[userId] = yesterdayPortfolio;
         }
     }
 
@@ -149,18 +129,57 @@ class SmartMoneyFlow {
     }
 
 
-    getResult() {
+    async getResult() {
+        // --- FIX: MOVED FROM process() ---
+        // 1. Identify smart money *now*, after Pass 1's getResult() has run
+        await this.identifySmartMoney();
+
+        // 2. Ensure sector map is loaded (it should be from process())
+        if (!this.sectorMap) {
+            console.error('SmartMoneyFlow: Sector map not loaded, cannot get result.');
+            return { smart_money_flow: {} };
+        }
+        // --- END FIX ---
+
+        const sectorFlow = {};
+
+        // 3. Loop through the cached portfolios
+        for (const userId of this.smartMoneyUsers) {
+            const todayPortfolio = this.todayPortfolios[userId];
+            const yesterdayPortfolio = this.yesterdayPortfolios[userId];
+
+            if (todayPortfolio && yesterdayPortfolio) {
+                const todaySectorInvestment = this.calculateSectorInvestment(todayPortfolio);
+                const yesterdaySectorInvestment = this.calculateSectorInvestment(yesterdayPortfolio);
+
+                // Calculate change in investment per sector
+                const allSectors = new Set([...Object.keys(todaySectorInvestment), ...Object.keys(yesterdaySectorInvestment)]);
+                for (const sector of allSectors) {
+                    const todayAmount = todaySectorInvestment[sector] || 0;
+                    const yesterdayAmount = yesterdaySectorInvestment[sector] || 0;
+                    const change = todayAmount - yesterdayAmount;
+
+                    // Only record if there is a change
+                    if (change !== 0) {
+                         if (!sectorFlow[sector]) {
+                            sectorFlow[sector] = 0;
+                        }
+                        sectorFlow[sector] += change;
+                    }
+                }
+            }
+        }
+
         // Return only sectors with non-zero flow if desired, or the full object
          const filteredFlow = {};
-         for (const sector in this.sectorFlow) {
-             if (this.sectorFlow[sector] !== 0) {
-                 filteredFlow[sector] = this.sectorFlow[sector];
+         for (const sector in sectorFlow) {
+             if (sectorFlow[sector] !== 0) {
+                 filteredFlow[sector] = sectorFlow[sector];
              }
          }
-         // console.log("Final Smart Money Flow:", filteredFlow); // Optional: Log final result
+         console.log("Final Smart Money Flow:", filteredFlow);
         return { smart_money_flow: filteredFlow };
-        // Or return the full object: return { smart_money_flow: this.sectorFlow };
     }
 }
 
-module.exports = SmartMoneyFlow;
+module.exports = SmartMoneyFlow;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiden-shared-calculations-unified",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "Shared calculation modules for the BullTrackers Computation System.",
   "main": "index.js",
   "files": [