bulltrackers-module 1.0.950 → 1.0.951

package/functions/computation-system-v3/computations/DashboardPage.js

@@ -29,7 +29,7 @@ exports.config = {
             filter: { user_type: 'POPULAR_INVESTOR' }
         },
         'portfolio_snapshots': {
-            lookback: 0,
+            lookback: 7, // FIX: Changed to 7 to allow historical diffing of positions
             mandatory: false,
             fields: ['user_id', 'portfolio_data', 'date'],
             filter: { user_type: 'POPULAR_INVESTOR' }
@@ -122,21 +122,99 @@ exports.process = (ctx) => {
     const topPIRiskChange7dSlice = topPIRiskChange7d.slice(0, TOP_RISK_CHANGE_N);
 
     // -------------------------------------------------------------------------
-    // 2. Most purchased / most sold assets (from trade_history_snapshots)
+    // Define the 7-day boundary for asset trading tracking
     // -------------------------------------------------------------------------
+    const targetDate = new Date(date);
+    const sevenDaysAgo = new Date(targetDate.getTime() - 7 * 24 * 60 * 60 * 1000);
+
     const purchaseCount = new Map();
     const saleCount = new Map();
 
+    // -------------------------------------------------------------------------
+    // 2A. Most purchased / most sold assets (from trade_history_snapshots)
+    // -------------------------------------------------------------------------
     tradeHistory.forEach(row => {
         const trades = lib.trades.extractTrades(row);
         trades.forEach(trade => {
             const instrumentId = lib.trades.getInstrumentId(trade);
             if (instrumentId == null) return;
             const ticker = resolveTicker(instrumentId);
-            if (lib.trades.isBuy(trade)) {
-                purchaseCount.set(ticker, (purchaseCount.get(ticker) || 0) + 1);
+
+            const openDate = lib.trades.getOpenDate(trade);
+            const closeDate = lib.trades.getCloseDate(trade);
+            const isBuy = lib.trades.isBuy(trade); // True if Long position
+
+            if (isBuy) {
+                // If it's a Long position and was opened recently -> Purchase
+                if (openDate && openDate >= sevenDaysAgo && openDate <= targetDate) {
+                    purchaseCount.set(ticker, (purchaseCount.get(ticker) || 0) + 1);
+                }
+                // If it's a Long position and was closed recently -> Sale
+                if (closeDate && closeDate >= sevenDaysAgo && closeDate <= targetDate) {
+                    saleCount.set(ticker, (saleCount.get(ticker) || 0) + 1);
+                }
             } else {
-                saleCount.set(ticker, (saleCount.get(ticker) || 0) + 1);
+                // For Short positions, opening is a Sale, closing is a Purchase
+                if (openDate && openDate >= sevenDaysAgo && openDate <= targetDate) {
+                    saleCount.set(ticker, (saleCount.get(ticker) || 0) + 1);
+                }
+                if (closeDate && closeDate >= sevenDaysAgo && closeDate <= targetDate) {
+                    purchaseCount.set(ticker, (purchaseCount.get(ticker) || 0) + 1);
+                }
+            }
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // 2B. Most purchased assets (from diffing portfolio_snapshots)
+    // -------------------------------------------------------------------------
+    const portfolioByUser = new Map();
+    const portfolioRows = toArray(data['portfolio_snapshots'] || []);
+
+    // Group snapshots by user
+    portfolioRows.forEach(row => {
+        const userId = lib.portfolio.getUserId(row);
+        if (!userId) return;
+
+        const rowDateStr = row.date && (typeof row.date.value === 'string' ? row.date.value : String(row.date).slice(0, 10));
+        if (!rowDateStr) return;
+
+        const rowDate = new Date(rowDateStr);
+        if (rowDate < sevenDaysAgo || rowDate > targetDate) return;
+
+        if (!portfolioByUser.has(userId)) portfolioByUser.set(userId, []);
+        portfolioByUser.get(userId).push({ date: rowDateStr, row });
+    });
+
+    // Diff the oldest and newest snapshot for each user in the 7-day window
+    portfolioByUser.forEach((snapshots) => {
+        if (snapshots.length < 2) return; // Need at least 2 days to diff
+
+        snapshots.sort((a, b) => a.date.localeCompare(b.date));
+
+        const oldestPositions = lib.portfolio.extractPositions(lib.portfolio.extractPortfolioData(snapshots[0].row));
+        const newestPositions = lib.portfolio.extractPositions(lib.portfolio.extractPortfolioData(snapshots[snapshots.length - 1].row));
+
+        // Helper to sum invested amount per asset
+        const getInvestedMap = (positions) => {
+            const map = new Map();
+            positions.forEach(p => {
+                const id = lib.portfolio.getInstrumentId(p);
+                if (id != null) map.set(id, (map.get(id) || 0) + lib.portfolio.getInvested(p));
+            });
+            return map;
+        };
+
+        const oldMap = getInvestedMap(oldestPositions);
+        const newMap = getInvestedMap(newestPositions);
+
+        newMap.forEach((newInvested, instrumentId) => {
+            const oldInvested = oldMap.get(instrumentId) || 0;
+
+            // If the total invested amount in an asset increased, they purchased more of it
+            if (newInvested > oldInvested) {
+                const ticker = resolveTicker(instrumentId);
+                purchaseCount.set(ticker, (purchaseCount.get(ticker) || 0) + 1);
             }
         });
     });
@@ -226,4 +304,4 @@ exports.process = (ctx) => {
             recentAlertEvents
         }
     };
-};
+};

package/package.json

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