bulltrackers-module 1.0.93 → 1.0.94

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

@@ -2,18 +2,22 @@
  * @fileoverview Data loader sub-pipes for the Computation System.
  * REFACTORED: Now stateless and receive dependencies.
  */
-const { withRetry } = require('aiden-shared-calculations-unified').utils;
-const { FieldPath } = require('@google-cloud/firestore'); // <<< --- ADD FieldPath
+
+// <<< FIX: REMOVED all top-level 'require' and 'dependencies' lines >>>
 
 /**
  * Sub-pipe: pipe.computationSystem.dataLoader.getPortfolioPartRefs
  * @param {object} config - The computation system configuration object.
- * @param {object} dependencies - Contains db, logger.
+ * @param {object} dependencies - Contains db, logger, calculationUtils.
  * @param {string} dateString - The date in YYYY-MM-DD format.
  * @returns {Promise<Firestore.DocumentReference[]>} An array of DocumentReferences.
  */
 async function getPortfolioPartRefs(config, dependencies, dateString) {
-    const { db, logger } = dependencies;
+    // <<< FIX: Destructure all dependencies here, inside the function >>>
+    const { db, logger, calculationUtils } = dependencies;
+    const { withRetry } = calculationUtils;
+    // <<< END FIX >>>
+
     logger.log('INFO', `Getting portfolio part references for date: ${dateString}`);
     const allPartRefs = [];
     const collectionsToQuery = [config.normalUserPortfolioCollection, config.speculatorPortfolioCollection];
@@ -47,12 +51,16 @@ async function getPortfolioPartRefs(config, dependencies, dateString) {
 /**
  * Sub-pipe: pipe.computationSystem.dataLoader.loadDataByRefs
  * @param {object} config - The computation system configuration object.
- * @param {object} dependencies - Contains db, logger.
+ * @param {object} dependencies - Contains db, logger, calculationUtils.
  * @param {Firestore.DocumentReference[]} refs - An array of DocumentReferences to load.
  * @returns {Promise<object>} A single map of { [userId]: portfolioData }.
  */
 async function loadDataByRefs(config, dependencies, refs) {
-    const { db, logger } = dependencies;
+    // <<< FIX: Destructure all dependencies here, inside the function >>>
+    const { db, logger, calculationUtils } = dependencies;
+    const { withRetry } = calculationUtils;
+    // <<< END FIX >>>
+
     if (!refs || refs.length === 0) { return {}; }
     const mergedPortfolios = {};
     const batchSize = config.partRefBatchSize || 50;
@@ -86,7 +94,10 @@ async function loadDataByRefs(config, dependencies, refs) {
  * @returns {Promise<object>} A single map of { [userId]: portfolioData }.
  */
 async function loadFullDayMap(config, dependencies, partRefs) {
+    // <<< FIX: Destructure only what's needed for this specific function >>>
     const { logger } = dependencies;
+    // <<< END FIX >>>
+
     if (partRefs.length === 0) return {};
     logger.log('TRACE', `Loading full day map from ${partRefs.length} references...`);
 
@@ -100,12 +111,16 @@ async function loadFullDayMap(config, dependencies, partRefs) {
  * Sub-pipe: pipe.computationSystem.dataLoader.loadDailyInsights
  * Fetches the daily instrument insights document for a specific date.
  * @param {object} config - The computation system configuration object.
- * @param {object} dependencies - Contains db, logger.
+ * @param {object} dependencies - Contains db, logger, calculationUtils.
  * @param {string} dateString - The date in YYYY-MM-DD format.
  * @returns {Promise<object|null>} The insights data object or null if not found/error.
  */
 async function loadDailyInsights(config, dependencies, dateString) {
-    const { db, logger } = dependencies;
+    // <<< FIX: Destructure all dependencies here, inside the function >>>
+    const { db, logger, calculationUtils } = dependencies;
+    const { withRetry } = calculationUtils;
+    // <<< END FIX >>>
+
     const insightsCollectionName = config.insightsCollectionName || 'daily_instrument_insights'; // Use config or default
     logger.log('INFO', `Loading daily insights for date: ${dateString} from ${insightsCollectionName}`);
     try {
@@ -129,12 +144,16 @@ async function loadDailyInsights(config, dependencies, dateString) {
  * Sub-pipe: pipe.computationSystem.dataLoader.loadDailySocialPostInsights
  * Fetches all analyzed social post documents for a specific date.
  * @param {object} config - The computation system configuration object.
- * @param {object} dependencies - Contains db, logger.
+ * @param {object} dependencies - Contains db, logger, calculationUtils.
  * @param {string} dateString - The date in YYYY-MM-DD format.
  * @returns {Promise<object|null>} An object map of { [postId]: postData } or null.
  */
 async function loadDailySocialPostInsights(config, dependencies, dateString) {
-    const { db, logger } = dependencies;
+    // <<< FIX: Destructure all dependencies here, inside the function >>>
+    const { db, logger, calculationUtils } = dependencies;
+    const { withRetry } = calculationUtils;
+    // <<< END FIX >>>
+
     // Use the new config property, or fall back to a default
     const socialInsightsCollectionName = config.socialInsightsCollectionName || 'daily_social_insights';
     logger.log('INFO', `Loading social post insights for date: ${dateString} from ${socialInsightsCollectionName}`);
@@ -170,4 +189,4 @@ module.exports = {
     loadFullDayMap,
     loadDailyInsights,
     loadDailySocialPostInsights, 
-};
+};

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

@@ -5,6 +5,7 @@
  */
 
 const { FieldValue, FieldPath } = require('@google-cloud/firestore');
+
 // --- REMOVED ---
 // const { utils } = require('aiden-shared-calculations-unified');
 // const { withRetry } = utils;

package/package.json

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