bulltrackers-module 1.0.227 → 1.0.228

package/functions/computation-system/helpers/computation_worker.js

@@ -1,15 +1,15 @@
 /**
  * FILENAME: computation-system/helpers/computation_worker.js
  * PURPOSE: Consumes computation tasks from Pub/Sub and executes them.
- * UPDATED: Fixed import source. Points to actual Calculations package, not layers.
+ * UPDATED: Instantiates the internal StructuredLogger to replace the generic injected logger.
  */
 
 const { runDateComputation, groupByPass } = require('../WorkflowOrchestrator.js');
 const { getManifest }                     = require('../topology/ManifestLoader');
+const { StructuredLogger }                = require('../logger/logger'); // <--- CRITICAL IMPORT
 
-// 1. IMPORT CALCULATIONS (CORRECTED)
+// 1. IMPORT CALCULATIONS
 // We import the specific package containing your strategies (gem, pyro, core, etc.)
-// Adjust the require path if you are using a local relative path instead of node_modules.
 let calculationPackage;
 try {
     // Primary: Try to load from the installed npm package
@@ -21,34 +21,50 @@ try {
 
 
 // The package exports { calculations: { ... }, utils: { ... } }
-// We only need the 'calculations' object (which contains the folder-grouped classes)
 const calculations = calculationPackage.calculations;
 
 /**
  * Handles a single Pub/Sub message for a computation task.
  * Supports both Gen 1 (Message) and Gen 2 (CloudEvent) formats.
  * @param {object} message - The Pub/Sub message payload.
- * @param {object} config - System configuration (must include activeProductLines).
- * @param {object} dependencies - System dependencies (logger, db, etc.).
+ * @param {object} config - System configuration.
+ * @param {object} dependencies - Injected dependencies (db, generic logger, etc.).
  */
 async function handleComputationTask(message, config, dependencies) {
-    const { logger } = dependencies;
+    
+    // 2. INITIALIZE SYSTEM LOGGER
+    // We ignore the generic 'dependencies.logger' and instantiate our specialized one.
+    // This ensures methods like 'logDateAnalysis' and 'logStorage' exist.
+    const systemLogger = new StructuredLogger({
+        minLevel: config.minLevel || 'INFO',
+        enableStructured: true,
+        ...config // Apply any other relevant config overrides
+    });
 
-    // 2. LAZY LOAD MANIFEST
-    // We pass the CORRECT 'calculations' object here (e.g. { core: {...}, pyro: {...} })
+    // 3. OVERRIDE DEPENDENCIES
+    // We create a new dependencies object to pass downstream.
+    // This fixes the "logger.logStorage is not a function" error in ResultCommitter.js
+    const runDependencies = {
+        ...dependencies,
+        logger: systemLogger
+    };
+
+    const { logger } = runDependencies; // Use this for local logging
+
+    // 4. LAZY LOAD MANIFEST
     let computationManifest;
     try {
         computationManifest = getManifest(
             config.activeProductLines || [], 
             calculations, 
-            dependencies
+            runDependencies // Pass the updated dependencies
         );
     } catch (manifestError) {
         logger.log('FATAL', `[Worker] Failed to load Manifest: ${manifestError.message}`);
         return; 
     }
 
-    // 3. PARSE PUB/SUB MESSAGE
+    // 5. PARSE PUB/SUB MESSAGE
     let data;
     try {
         if (message.data && message.data.message && message.data.message.data) { 
@@ -67,7 +83,7 @@ async function handleComputationTask(message, config, dependencies) {
         return; 
     }
 
-    // 4. EXECUTE TASK
+    // 6. EXECUTE TASK
     try {
         if (!data || data.action !== 'RUN_COMPUTATION_DATE') { 
             if (data) logger.log('WARN', `[Worker] Unknown or missing action: ${data?.action}. Ignoring.`); 
@@ -95,7 +111,7 @@ async function handleComputationTask(message, config, dependencies) {
             pass, 
             calcsInThisPass, 
             config, 
-            dependencies, 
+            runDependencies, // <--- IMPORTANT: Pass the dependencies with the System Logger
             computationManifest
         );
         

package/package.json

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