bulltrackers-module 1.0.752 → 1.0.753

package/functions/orchestrator/index.js

@@ -16,6 +16,9 @@ const QUEUE_NAME = process.env.ORCHESTRATOR_QUEUE || 'task-engine-queue';
 const LOCATION = process.env.GCP_REGION || 'europe-west1'; 
 const PROJECT = process.env.GCP_PROJECT_ID;
 
+// --- FEATURE FLAG: Disable Normal/Speculator Users ---
+const ENABLE_LEGACY_USERS = process.env.ENABLE_LEGACY_USERS === 'true';
+
 /**
  * ENTRY POINT: HTTP Handler for Workflow Interaction
  */
@@ -33,6 +36,14 @@ async function handleOrchestratorHttp(req, res, dependencies, config) {
                 throw new Error("Missing userType or date for PLAN action");
             }
             
+            // --- NEW: Block Legacy Users if Disabled ---
+            if ((userType === 'normal' || userType === 'speculator') && !ENABLE_LEGACY_USERS) {
+                const msg = `[Orchestrator] SKIPPING PLAN for '${userType}': ENABLE_LEGACY_USERS is false.`;
+                logger.log('WARN', msg);
+                // Return 200 to prevent retry loops in workflows
+                return res.status(200).send({ status: 'skipped', message: msg });
+            }
+
             // Determine self-URL for callback (Cloud Task needs to call this function back)
             // We use the env var passed by GCF (FUNCTION_URI) or construct it manually
             const orchestratorUrl = orchestratorUrlOverride || 
@@ -47,6 +58,14 @@ async function handleOrchestratorHttp(req, res, dependencies, config) {
             if (!planId || !windowId) {
                 throw new Error("Missing planId or windowId for EXECUTE_WINDOW action");
             }
+            
+            // --- NEW: Block Legacy Users if Disabled (Double Check) ---
+            if ((userType === 'normal' || userType === 'speculator') && !ENABLE_LEGACY_USERS) {
+                 const msg = `[Orchestrator] SKIPPING EXECUTE_WINDOW for '${userType}': ENABLE_LEGACY_USERS is false.`;
+                 logger.log('WARN', msg);
+                 return res.status(200).send({ status: 'skipped', message: msg });
+            }
+
             const result = await executeUpdateWindow(planId, windowId, userType, config, dependencies);
             res.status(200).send(result);
 
@@ -227,8 +246,13 @@ async function runDiscoveryOrchestrator(config, deps) {
     const { logger, firestoreUtils } = deps;
     logger.log('INFO', '🚀 Discovery Orchestrator triggered...');
     await firestoreUtils.resetProxyLocks(deps, config);
-    if (isUserTypeEnabled('normal', config.enabledUserTypes)) await runDiscovery('normal', config.discoveryConfig.normal, config, deps);
-    if (isUserTypeEnabled('speculator', config.enabledUserTypes)) await runDiscovery('speculator', config.discoveryConfig.speculator, config, deps);
+    
+    if (ENABLE_LEGACY_USERS) {
+        if (isUserTypeEnabled('normal', config.enabledUserTypes)) await runDiscovery('normal', config.discoveryConfig.normal, config, deps);
+        if (isUserTypeEnabled('speculator', config.enabledUserTypes)) await runDiscovery('speculator', config.discoveryConfig.speculator, config, deps);
+    } else {
+        logger.log('INFO', 'Discovery skipped for legacy users (normal/speculator) because ENABLE_LEGACY_USERS is false.');
+    }
 }
 
 async function runUpdateOrchestrator(config, deps) {
@@ -237,8 +261,13 @@ async function runUpdateOrchestrator(config, deps) {
     await firestoreUtils.resetProxyLocks(deps, config);
     const enabledTypes = config.enabledUserTypes || [];
 
-    if (isUserTypeEnabled('normal', enabledTypes)) await runUpdates('normal', config.updateConfig, config, deps);
-    if (isUserTypeEnabled('speculator', enabledTypes)) await runUpdates('speculator', config.updateConfig, config, deps);
+    if (ENABLE_LEGACY_USERS) {
+        if (isUserTypeEnabled('normal', enabledTypes)) await runUpdates('normal', config.updateConfig, config, deps);
+        if (isUserTypeEnabled('speculator', enabledTypes)) await runUpdates('speculator', config.updateConfig, config, deps);
+    } else {
+        logger.log('INFO', 'Updates skipped for legacy users (normal/speculator) because ENABLE_LEGACY_USERS is false.');
+    }
+
     if (isUserTypeEnabled('popular_investor', enabledTypes)) {
         const piConfig = { ...config.updateConfig, popularInvestorRankingsCollection: config.updateConfig.popularInvestorRankingsCollection || 'popular_investor_rankings' };
         await runUpdates('popular_investor', piConfig, config, deps);

package/functions/task-engine/tests/test-task-engine.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# ==============================================================================
+# BULLTRACKERS TASK ENGINE END-TO-END TESTER
+# This script triggers the Orchestrator to plan an immediate execution window.
+# ==============================================================================
+
+# --- CONFIGURATION ---
+FUNCTION_NAME="orchestrator-http"
+REGION="europe-west1"
+DATE=$(date +%Y-%m-%d) # Defaults to today
+USER_TYPE="normal"     # Options: normal, speculator, popular_investor
+WINDOWS=1              # 1 window = immediate execution (0s delay)
+
+# --- 1. FETCH URL DYNAMICALLY ---
+echo "🔍 Fetching URL for function: $FUNCTION_NAME ($REGION)..."
+
+# Try Gen 2 (Cloud Run) URL first
+URL=$(gcloud functions describe $FUNCTION_NAME --region=$REGION --format='value(serviceConfig.uri)' 2>/dev/null)
+
+# Fallback to Gen 1 if empty
+if [ -z "$URL" ]; then
+    URL=$(gcloud functions describe $FUNCTION_NAME --region=$REGION --format='value(httpsTrigger.url)' 2>/dev/null)
+fi
+
+if [ -z "$URL" ]; then
+    echo "❌ Error: Could not find URL for function '$FUNCTION_NAME'. Check if it is deployed."
+    exit 1
+fi
+
+echo "✅ Target URL: $URL"
+
+# --- 2. GET AUTH TOKEN ---
+echo "🔑 Generating Identity Token..."
+TOKEN=$(gcloud auth print-identity-token)
+
+if [ -z "$TOKEN" ]; then
+    echo "❌ Error: Could not generate token. Run 'gcloud auth login' first."
+    exit 1
+fi
+
+# --- 3. SEND REQUEST ---
+echo "🚀 Triggering Plan for $USER_TYPE on $DATE ($WINDOWS window)..."
+
+RESPONSE=$(curl -s -w "\n%{http_code}" -X POST "$URL" \
+  -H "Authorization: Bearer $TOKEN" \
+  -H "Content-Type: application/json" \
+  -d "{
+    \"action\": \"PLAN\",
+    \"userType\": \"$USER_TYPE\",
+    \"date\": \"$DATE\",
+    \"windows\": $WINDOWS
+  }")
+
+# --- 4. PARSE RESPONSE ---
+HTTP_BODY=$(echo "$RESPONSE" | head -n -1)
+HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
+
+if [ "$HTTP_CODE" -eq 200 ]; then
+    echo ""
+    echo "✅ SUCCESS (HTTP 200)"
+    echo "---------------------------------------------------"
+    echo "$HTTP_BODY" | python3 -m json.tool 2>/dev/null || echo "$HTTP_BODY"
+    echo "---------------------------------------------------"
+    echo "👉 Monitor 'task-engine-queue' in Cloud Tasks Console."
+    echo "👉 Check Logs Explorer for 'Orchestrator' and 'Dispatcher'."
+else
+    echo ""
+    echo "❌ FAILED (HTTP $HTTP_CODE)"
+    echo "---------------------------------------------------"
+    echo "$HTTP_BODY"
+    echo "---------------------------------------------------"
+fi

package/package.json

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