bulltrackers-module 1.0.557 → 1.0.559

package/functions/alert-system/helpers/alert_helpers.js

@@ -115,6 +115,7 @@ async function processAlertForPI(db, logger, piCid, alertType, computationMetada
 /**
  * Find all users who should receive alerts for a PI and alert type
  * Uses WatchlistMembershipData/{date} to find users, then reads watchlists from SignedInUsers/{cid}/watchlists
+ * Also checks for developer accounts with pretendSubscribedToAllAlerts flag enabled
  */
 async function findSubscriptionsForPI(db, logger, piCid, alertTypeId, computationDate, dependencies = {}) {
   const subscriptions = [];
@@ -135,6 +136,62 @@ async function findSubscriptionsForPI(db, logger, piCid, alertTypeId, computatio
     return subscriptions;
   }
   
+  // Check for developer accounts with pretendSubscribedToAllAlerts flag enabled
+  // This allows developers to test the alert system without manually configuring subscriptions
+  try {
+    const { getDevOverride, isDeveloperAccount } = require('../../generic-api/user-api/helpers/dev/dev_helpers');
+    const { getPIMasterList } = require('../../generic-api/user-api/helpers/core/user_status_helpers');
+    const config = dependencies.config || {};
+    const collectionRegistry = dependencies.collectionRegistry || null;
+    
+    // Get all popular investors from master list for username lookup
+    const allInvestors = await getPIMasterList(db, collectionRegistry, logger);
+    const piUsername = allInvestors[String(piCid)]?.username || `PI-${piCid}`;
+    
+    // Default alert config with all alert types enabled (for dev override)
+    const allAlertsEnabledConfig = {
+      increasedRisk: true,
+      volatilityChanges: true,
+      newSector: true,
+      increasedPositionSize: true,
+      newSocialPost: true,
+      newPositions: true
+    };
+    
+    // Check all developer accounts
+    const devOverridesCollection = config.devOverridesCollection || 'dev_overrides';
+    const devOverridesSnapshot = await db.collection(devOverridesCollection).get();
+    
+    for (const devOverrideDoc of devOverridesSnapshot.docs) {
+      const devUserCid = Number(devOverrideDoc.id);
+      
+      // Verify this is actually a developer account (security check)
+      if (!isDeveloperAccount(devUserCid)) {
+        continue;
+      }
+      
+      const devOverrideData = devOverrideDoc.data();
+      
+      // Check if this developer has the pretendSubscribedToAllAlerts flag enabled
+      if (devOverrideData.enabled === true && devOverrideData.pretendSubscribedToAllAlerts === true) {
+        // Add this developer as a subscription for this PI and alert type
+        subscriptions.push({
+          userCid: devUserCid,
+          piCid: piCid,
+          piUsername: piUsername,
+          watchlistId: 'dev-override-all-alerts',
+          watchlistName: 'Dev Override - All Alerts',
+          alertConfig: allAlertsEnabledConfig
+        });
+        
+        logger.log('INFO', `[findSubscriptionsForPI] DEV OVERRIDE: Added developer ${devUserCid} to subscriptions for PI ${piCid}, alert type ${alertTypeId}`);
+      }
+    }
+  } catch (error) {
+    // Don't fail the entire function if dev override check fails
+    logger.log('WARN', `[findSubscriptionsForPI] Error checking dev overrides: ${error.message}`);
+  }
+  
   // Step 1: Load WatchlistMembershipData/{date} to find which users have this PI in their watchlist
   const piCidStr = String(piCid);
   let userCids = [];

package/functions/generic-api/user-api/helpers/dev/dev_helpers.js

@@ -41,6 +41,7 @@ async function getDevOverride(db, userCid, config, logger = null) {
                 fakeCopiedPIs: [],
                 pretendToBePI: false,
                 impersonateCid: null, // CID to impersonate/view as
+                pretendSubscribedToAllAlerts: false, // Pretend to be subscribed to all alert types for all PIs
                 createdAt: FieldValue.serverTimestamp(),
                 lastUpdated: FieldValue.serverTimestamp()
             };
@@ -60,6 +61,7 @@ async function getDevOverride(db, userCid, config, logger = null) {
                 fakeCopiedPIs: [],
                 pretendToBePI: false,
                 impersonateCid: null,
+                pretendSubscribedToAllAlerts: false,
                 lastUpdated: null,
                 wasAutoCreated: true
             };
@@ -73,6 +75,7 @@ async function getDevOverride(db, userCid, config, logger = null) {
             fakeCopiedPIs: data.fakeCopiedPIs || [],
             pretendToBePI: data.pretendToBePI === true,
             impersonateCid: data.impersonateCid ? Number(data.impersonateCid) : null,
+            pretendSubscribedToAllAlerts: data.pretendSubscribedToAllAlerts === true,
             lastUpdated: data.lastUpdated,
             wasAutoCreated: false
         };
@@ -157,7 +160,7 @@ async function hasUserCopiedWithDevOverride(db, userCid, piCid, config, logger)
  */
 async function setDevOverride(req, res, dependencies, config) {
     const { db, logger } = dependencies;
-    const { userCid, enabled, fakeCopiedPIs, pretendToBePI, impersonateCid } = req.body;
+    const { userCid, enabled, fakeCopiedPIs, pretendToBePI, impersonateCid, pretendSubscribedToAllAlerts } = req.body;
     
     if (!userCid) {
         return res.status(400).json({ error: "Missing userCid" });
@@ -208,6 +211,7 @@ async function setDevOverride(req, res, dependencies, config) {
             fakeCopiedPIs: enabled !== undefined ? validatedPIs : (existingData.fakeCopiedPIs || []),
             pretendToBePI: pretendToBePI !== undefined ? (pretendToBePI === true) : (existingData.pretendToBePI || false),
             impersonateCid: impersonateCid !== undefined ? (impersonateCid ? Number(impersonateCid) : null) : (existingData.impersonateCid || null),
+            pretendSubscribedToAllAlerts: pretendSubscribedToAllAlerts !== undefined ? (pretendSubscribedToAllAlerts === true) : (existingData.pretendSubscribedToAllAlerts || false),
             lastUpdated: FieldValue.serverTimestamp()
         };
         
@@ -217,6 +221,7 @@ async function setDevOverride(req, res, dependencies, config) {
             `enabled=${overrideData.enabled}`,
             `pretendToBePI=${overrideData.pretendToBePI}`,
             `impersonateCid=${overrideData.impersonateCid || 'null'}`,
+            `pretendSubscribedToAllAlerts=${overrideData.pretendSubscribedToAllAlerts}`,
             `${validatedPIs.length} fake PIs`
         ];
         logger.log('SUCCESS', `[setDevOverride] Updated dev override for user ${userCid}: ${logParts.join(', ')}`);
@@ -270,6 +275,7 @@ async function getDevOverrideStatus(req, res, dependencies, config) {
             fakeCopiedPIs: devOverride.fakeCopiedPIs,
             pretendToBePI: devOverride.pretendToBePI || false,
             impersonateCid: devOverride.impersonateCid || null,
+            pretendSubscribedToAllAlerts: devOverride.pretendSubscribedToAllAlerts || false,
             lastUpdated: devOverride.lastUpdated,
             wasAutoCreated: devOverride.wasAutoCreated || false
         });
@@ -284,6 +290,9 @@ async function getDevOverrideStatus(req, res, dependencies, config) {
  * Get the effective CID to use for a developer account
  * Returns impersonateCid if set, otherwise returns the actual userCid
  * Only works for developer accounts
+ * 
+ * Note: If pretendToBePI is false, impersonation will not be used for PI-related checks
+ * to prevent unintended impersonation when the user doesn't want to pretend to be a PI
  */
 async function getEffectiveCid(db, userCid, config, logger = null) {
     if (!isDeveloperAccount(userCid)) {
@@ -291,8 +300,20 @@ async function getEffectiveCid(db, userCid, config, logger = null) {
     }
     
     const devOverride = await getDevOverride(db, userCid, config, logger);
-    // Only use impersonation if dev override is enabled
+    // Only use impersonation if dev override is enabled AND impersonateCid is set
+    // BUT: If pretendToBePI is explicitly false, don't use impersonation (user doesn't want to be treated as PI)
     if (devOverride && devOverride.enabled && devOverride.impersonateCid) {
+        // Check if user explicitly doesn't want to pretend to be a PI
+        // If pretendToBePI is false, don't use impersonation (respects user intent)
+        if (devOverride.pretendToBePI === false) {
+            if (logger && logger.log) {
+                logger.log('INFO', `[getEffectiveCid] DEV OVERRIDE: User ${userCid} has impersonateCid set but pretendToBePI=false, using actual CID ${userCid} instead`);
+            } else {
+                console.log(`[getEffectiveCid] DEV OVERRIDE: User ${userCid} has impersonateCid set but pretendToBePI=false, using actual CID ${userCid} instead`);
+            }
+            return Number(userCid);
+        }
+        
         if (logger && logger.log) {
             logger.log('INFO', `[getEffectiveCid] DEV OVERRIDE: User ${userCid} impersonating CID ${devOverride.impersonateCid}`);
         } else {

package/functions/generic-api/user-api/helpers/metrics/personalized_metrics_helpers.js

@@ -96,8 +96,19 @@ async function getSignedInUserPIPersonalizedMetrics(req, res, dependencies, conf
     }
     
     try {
-        const effectiveCid = await getEffectiveCid(db, userCid, config, logger);
         const devOverride = await getDevOverride(db, userCid, config, logger);
+        
+        // For PI-related checks, respect pretendToBePI flag
+        // If pretendToBePI is false, use actual userCid even if impersonateCid is set
+        let effectiveCid;
+        if (devOverride && devOverride.enabled && devOverride.pretendToBePI === false) {
+            // User explicitly doesn't want to pretend to be a PI, use actual CID
+            effectiveCid = Number(userCid);
+        } else {
+            // Use normal effective CID logic (may use impersonateCid if set)
+            effectiveCid = await getEffectiveCid(db, userCid, config, logger);
+        }
+        
         const isImpersonating = devOverride && devOverride.enabled && devOverride.impersonateCid && effectiveCid !== Number(userCid);
         
         // Check if user is a PI

package/functions/generic-api/user-api/helpers/profile/user_profile_helpers.js

@@ -128,8 +128,19 @@ async function checkIfUserIsPopularInvestor(req, res, dependencies, config) {
     
     try {
         // Check for dev override impersonation
-        const effectiveCid = await getEffectiveCid(db, userCid, config, logger);
         const devOverride = await getDevOverride(db, userCid, config, logger);
+        
+        // For PI-related checks, respect pretendToBePI flag
+        // If pretendToBePI is false, use actual userCid even if impersonateCid is set
+        let effectiveCid;
+        if (devOverride && devOverride.enabled && devOverride.pretendToBePI === false) {
+            // User explicitly doesn't want to pretend to be a PI, use actual CID
+            effectiveCid = Number(userCid);
+        } else {
+            // Use normal effective CID logic (may use impersonateCid if set)
+            effectiveCid = await getEffectiveCid(db, userCid, config, logger);
+        }
+        
         const isImpersonating = devOverride && devOverride.enabled && devOverride.impersonateCid && effectiveCid !== Number(userCid);
         
         // Use effective CID (impersonated or actual) to check PI status

package/package.json

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