bulltrackers-module 1.0.777 → 1.0.779

package/functions/computation-system-v2/handlers/scheduler.js

@@ -1,9 +1,9 @@
 /**
- * @fileoverview Scheduler V3.3: Smart Reconciliation & Future-Aligned Backfills
+ * @fileoverview Scheduler V3.4: Enhanced Logging for Verification
  * * * 1. Reconcile: Checks ENTIRE graph for stale hashes, triggers ROOTS if needed.
  * * 2. Purge: Actively removes tasks that don't match the current deployment hash.
  * * 3. Watchdog: Recovers "Zombie" tasks (running but stuck).
- * * * UPDATE: Backfills now respect the 'next available window' instead of running instantly.
+ * * 4. Logging: Detailed output for Tombstoned/Existing tasks to verify ETA logic.
  */
 
 const { CloudTasksClient } = require('@google-cloud/tasks');
@@ -18,8 +18,8 @@ const config = require('../config/bulltrackers.config');
 
 // Config
 const CLOUD_TASKS_CONCURRENCY = 20;
-const PLANNING_LOOKBACK_DAYS = 7;    // Look back to ensure recent history is correct
-const PLANNING_LOOKAHEAD_HOURS = 24; // Schedule future tasks
+const PLANNING_LOOKBACK_DAYS = 7;
+const PLANNING_LOOKAHEAD_HOURS = 24;
 const ZOMBIE_THRESHOLD_MINUTES = 15;
 
 // Cache singleton instances
@@ -45,7 +45,6 @@ async function initialize() {
 
 /**
  * ENTRY POINT 1: The Planner
- * Trigger: Cloud Scheduler -> "0 * * * *" (Hourly)
  */
 async function planComputations(req, res) {
     try {
@@ -62,7 +61,6 @@ async function planComputations(req, res) {
 
         console.log(`[Planner] Reconciling window: ${windowStart.toISOString()} to ${windowEnd.toISOString()}`);
 
-        // Helper to find Roots for any given computation (Pass 1..N)
         const manifestMap = new Map(manifest.map(m => [m.name, m]));
         const getRoots = (entry, visited = new Set()) => {
             if (visited.has(entry.name)) return [];
@@ -74,7 +72,7 @@ async function planComputations(req, res) {
                 .flatMap(p => getRoots(p, visited));
         };
 
-        const tasksToSchedule = new Map(); // Use Map to deduplicate by Task Name
+        const tasksToSchedule = new Map();
         const stats = { checked: 0, scheduled: 0, mismatched: 0, missing: 0 };
 
         const targetDates = [];
@@ -89,9 +87,7 @@ async function planComputations(req, res) {
             const dateStr = dateObj.toISOString().split('T')[0];
             const dailyStatus = await stateRepository.getDailyStatus(dateStr);
 
-            // Iterate ALL computations (not just Pass 1) to find stale nodes
             for (const entry of manifest) {
-                // If this specific entry is not scheduled for today, skip it
                 if (!shouldRunOnDate(entry.schedule, dateObj)) continue;
 
                 stats.checked++;
@@ -107,15 +103,13 @@ async function planComputations(req, res) {
                 }
 
                 if (reason) {
-                    // If entry is stale, we must schedule its ROOT(s) to trigger the chain
                     const roots = getRoots(entry);
                     
                     roots.forEach(root => {
-                        // Unique Task Key: RootName + Date + Hash
                         const taskKey = `root-${toKebab(root.originalName)}-${dateStr}-${root.hash}`;
                         
                         if (!tasksToSchedule.has(taskKey)) {
-                            // NEW: Calculate the NEXT valid run window instead of using the past date
+                            // Calculate proper ETA (Next valid window)
                             const runAt = getNextRunWindow(root.schedule, dateObj);
 
                             tasksToSchedule.set(taskKey, {
@@ -260,31 +254,21 @@ function shouldRunOnDate(schedule, dateObj) {
     return true;
 }
 
-/**
- * Calculates the run time. 
- * If the Target Date's schedule is in the PAST, it projects execution to the NEXT available window (Today or Tomorrow).
- */
 function getNextRunWindow(schedule, targetDateObj) {
     const [h, m] = (schedule.time || '02:00').split(':').map(Number);
-    
-    // 1. Calculate the ideal run time on the TARGET date
     let runTime = new Date(targetDateObj);
     runTime.setUTCHours(h, m, 0, 0);
 
     const now = Date.now();
-
-    // 2. If ideal time is in the past, move it to the *next* occurrence relative to NOW
+    // If idealized time is in the past, shift to NEXT available window relative to NOW
     if (runTime.getTime() < now) {
         const nextWindow = new Date();
         nextWindow.setUTCHours(h, m, 0, 0);
-        
-        // If today's window has passed, move to tomorrow
         if (nextWindow.getTime() <= now) {
             nextWindow.setUTCDate(nextWindow.getUTCDate() + 1);
         }
         return nextWindow.getTime() / 1000;
     }
-
     return runTime.getTime() / 1000;
 }
 
@@ -334,10 +318,17 @@ async function dispatchTasks(tasks) {
             return { status: 'scheduled' };
             
         } catch (e) {
+            // ALREADY_EXISTS (6) or CONFLICT (409)
             if (e.code === 6 || e.code === 409) {
-                console.warn(`[Planner] Task name collision (Tombstone?): ${t.computation} @ ${t.targetDate}`);
+                // ENHANCED LOGGING:
+                const eta = t.runAtSeconds 
+                    ? new Date(t.runAtSeconds * 1000).toISOString() 
+                    : 'Immediate';
+                
+                console.warn(`[Planner] ⚠️ Task collision (Tombstone/Exists): ${t.computation} | Target: ${t.targetDate} | Planned ETA: ${eta} | Hash: ${t.configHash}`);
                 return { status: 'exists' };
             }
+            
             console.error(`[Planner] Failed task ${t.computation}: ${e.message}`);
             return { status: 'error' };
         }

package/functions/core/utils/bigquery_utils.js

@@ -595,6 +595,15 @@ const SCHEMAS = {
         { name: 'metadata', type: 'JSON', mode: 'NULLABLE' },
         { name: 'last_triggered', type: 'TIMESTAMP', mode: 'NULLABLE' },
         { name: 'last_updated', type: 'TIMESTAMP', mode: 'REQUIRED' }
+    ],
+    user_alert_settings: [
+        { name: 'date', type: 'DATE', mode: 'REQUIRED' },
+        { name: 'user_id', type: 'STRING', mode: 'REQUIRED' },
+        { name: 'watchlist_id', type: 'STRING', mode: 'REQUIRED' },
+        { name: 'watchlist_name', type: 'STRING', mode: 'NULLABLE' },
+        { name: 'visibility', type: 'STRING', mode: 'NULLABLE' },
+        { name: 'items', type: 'JSON', mode: 'NULLABLE' },
+        { name: 'updated_at', type: 'TIMESTAMP', mode: 'REQUIRED' }
     ]
 };
 
@@ -891,6 +900,28 @@ async function ensurePIAlertHistoryTable(logger = null) {
     );
 }
 
+/**
+ * Ensure user_alert_settings table exists
+ * @param {object} logger - Logger instance
+ * @returns {Promise<Table>}
+ */
+async function ensureUserAlertSettingsTable(logger = null) {
+    const datasetId = process.env.BIGQUERY_DATASET_ID || 'bulltrackers_data';
+    const tableId = 'user_alert_settings';
+    const schema = getSchema(tableId);
+    
+    return await ensureTableExists(
+        datasetId,
+        tableId,
+        schema,
+        {
+            partitionField: 'date',
+            clusterFields: ['user_id', 'watchlist_id']
+        },
+        logger
+    );
+}
+
 /**
  * Query portfolio data from BigQuery
  * @param {string} dateStr - Date string (YYYY-MM-DD)
@@ -2272,6 +2303,7 @@ module.exports = {
     ensurePIPageViewsTable,
     ensureWatchlistMembershipTable,
     ensurePIAlertHistoryTable,
+    ensureUserAlertSettingsTable,
     queryPortfolioData,
     queryHistoryData,
     querySocialData,

package/package.json

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