aiden-shared-calculations-unified 1.0.29 → 1.0.31

package/package.json

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

package/utils/price_data_provider.js

@@ -14,6 +14,34 @@ let cache = {
 // In-progress fetch promise
 let fetchPromise = null;
 
+/**
+ * Finds the most recent available price on or before a given date.
+ * @param {object} priceHistory - The map of { "YYYY-MM-DD": price }
+ * @param {string} dateStr - The target date string to start searching from.
+ * @param {number} [maxLookback=5] - Max days to look back (to skip weekends/holidays).
+ * @returns {number|null} The price, or null if not found.
+ */
+function _findPreviousAvailablePrice(priceHistory, dateStr, maxLookback = 5) {
+    if (!priceHistory) return null;
+
+    let checkDate = new Date(dateStr + 'T00:00:00Z');
+    
+    for (let i = 0; i < maxLookback; i++) {
+        const checkDateStr = checkDate.toISOString().slice(0, 10);
+        const price = priceHistory[checkDateStr];
+        
+        if (price !== undefined && price !== null && price > 0) {
+            return price; // Found it
+        }
+        
+        // If not found, look back one more day
+        checkDate.setUTCDate(checkDate.getUTCDate() - 1);
+    }
+    
+    // console.warn(`No price found for instrument within ${maxLookback} days of ${dateStr}`);
+    return null; // No price found within lookback
+}
+
 /**
  * Loads all sharded price data from the `asset_prices` collection.
  * This is a heavy operation and should be cached.
@@ -75,6 +103,7 @@ async function loadAllPriceData() {
 
 /**
  * A helper to safely get the price change percentage between two dates.
+ * --- THIS IS THE MODIFIED FUNCTION ---
  * @param {string} instrumentId - The instrument ID.
  * @param {string} yesterdayStr - YYYY-MM-DD date string for yesterday.
  * @param {string} todayStr - YYYY-MM-DD date string for today.
@@ -86,18 +115,28 @@ function getDailyPriceChange(instrumentId, yesterdayStr, todayStr, priceMap) {
         return null; // No price data for this instrument
     }
     
-    const priceDay1 = priceMap[instrumentId][yesterdayStr];
-    const priceDay2 = priceMap[instrumentId][todayStr];
+    const instrumentPrices = priceMap[instrumentId];
+
+    // Find the most recent available price *on or before* the target dates
+    const priceDay1 = _findPreviousAvailablePrice(instrumentPrices, yesterdayStr, 5);
+    const priceDay2 = _findPreviousAvailablePrice(instrumentPrices, todayStr, 5);
 
-    if (priceDay1 && priceDay2 && priceDay1 > 0) {
+    if (priceDay1 && priceDay2) {
+        // We found prices, now check if they are the *same* price
+        // (e.g., if today is Sunday, priceDay2 would be Friday's price.
+        // If yesterday was Saturday, priceDay1 would *also* be Friday's price).
+        if (priceDay1 === priceDay2) {
+            return 0.0; // No change between the two most recent *available* dates
+        }
         return (priceDay2 - priceDay1) / priceDay1;
     }
     
-    return null; // Missing one or both dates, or division by zero
+    return null; // Missing one or both dates, even after lookback
 }
 
 
 module.exports = {
     loadAllPriceData,
     getDailyPriceChange
+    // Add the helper to exports if you want, but it's not required
 };