bulltrackers-module 1.0.435 → 1.0.436

package/functions/generic-api/user-api/helpers/data_helpers.js

@@ -2465,7 +2465,7 @@ async function getSignedInUserPIPersonalizedMetrics(req, res, dependencies, conf
 
 module.exports = { 
     getPiAnalytics, 
-    getUserRecommendations, 
+    getUserRecommendations,
     getWatchlist,
     updateWatchlist,
     autoGenerateWatchlist,
@@ -2481,6 +2481,7 @@ module.exports = {
     checkPisInRankings,
     getPiProfile,
     checkIfUserIsPopularInvestor,
+    checkIfUserIsPI, // Export for use in review_helpers
     trackProfileView,
     getSignedInUserPIPersonalizedMetrics
 };

package/functions/generic-api/user-api/helpers/on_demand_fetch_helpers.js

@@ -16,16 +16,27 @@ const RATE_LIMIT_MS = RATE_LIMIT_HOURS * 60 * 60 * 1000;
 async function requestPiFetch(req, res, dependencies, config) {
     const { db, logger, pubsub } = dependencies;
     const { piCid } = req.params;
-    const userCid = req.user?.etoroCID || req.query?.userCid;
+    
+    // Get userCid from query (same pattern as other endpoints)
+    const userCid = req.query?.userCid;
     
     if (!userCid) {
-        return res.status(401).json({ 
+        return res.status(400).json({ 
             success: false,
-            error: "Authentication required",
-            message: "You must be signed in to request data fetching"
+            error: "Missing userCid",
+            message: "Please provide userCid as a query parameter"
         });
     }
     
+    // Check for dev override impersonation (same pattern as other endpoints)
+    const { getEffectiveCid, getDevOverride } = require('./dev_helpers');
+    const effectiveCid = await getEffectiveCid(db, userCid, config, logger);
+    const devOverride = await getDevOverride(db, userCid, config, logger);
+    const isImpersonating = devOverride && devOverride.impersonateCid && effectiveCid !== Number(userCid);
+    
+    // Use effective CID for the request (impersonated or actual)
+    const requestUserCid = Number(effectiveCid);
+    
     const piCidNum = Number(piCid);
     if (isNaN(piCidNum) || piCidNum <= 0) {
         return res.status(400).json({
@@ -36,8 +47,8 @@ async function requestPiFetch(req, res, dependencies, config) {
     }
     
     try {
-        // Check rate limits
-        const rateLimitCheck = await checkRateLimits(db, userCid, piCidNum, logger);
+        // Check rate limits (use effective CID)
+        const rateLimitCheck = await checkRateLimits(db, requestUserCid, piCidNum, logger);
         
         if (!rateLimitCheck.allowed) {
             return res.status(429).json({
@@ -75,22 +86,24 @@ async function requestPiFetch(req, res, dependencies, config) {
         
         await requestRef.set({
             requestId,
-            userCid: Number(userCid),
+            userCid: requestUserCid, // Use effective CID
+            actualUserCid: Number(userCid), // Track actual developer CID for audit
             piCid: piCidNum,
             piUsername,
             status: 'queued',
+            isImpersonating: isImpersonating || false,
             createdAt: FieldValue.serverTimestamp(),
             updatedAt: FieldValue.serverTimestamp()
         });
         
-        // Update user rate limit
+        // Update user rate limit (use effective CID)
         const userRequestRef = db.collection('pi_fetch_requests')
             .doc(String(piCidNum))
             .collection('user_requests')
-            .doc(String(userCid));
+            .doc(String(requestUserCid));
         
         await userRequestRef.set({
-            userCid: Number(userCid),
+            userCid: requestUserCid,
             piCid: piCidNum,
             lastRequestedAt: FieldValue.serverTimestamp(),
             requestCount: FieldValue.increment(1),
@@ -106,7 +119,7 @@ async function requestPiFetch(req, res, dependencies, config) {
         await globalRef.set({
             piCid: piCidNum,
             lastRequestedAt: FieldValue.serverTimestamp(),
-            lastRequestedBy: Number(userCid),
+            lastRequestedBy: requestUserCid, // Use effective CID
             totalRequests: FieldValue.increment(1),
             updatedAt: FieldValue.serverTimestamp()
         }, { merge: true });
@@ -122,10 +135,12 @@ async function requestPiFetch(req, res, dependencies, config) {
             priority: 'high',
             source: 'on_demand',
             requestId,
-            requestedBy: Number(userCid),
+            requestedBy: requestUserCid, // Use effective CID
+            actualRequestedBy: Number(userCid), // Track actual developer CID
             metadata: {
                 onDemand: true,
-                requestedAt: now.toISOString()
+                requestedAt: now.toISOString(),
+                isImpersonating: isImpersonating || false
             }
         };
         
@@ -139,7 +154,7 @@ async function requestPiFetch(req, res, dependencies, config) {
             updatedAt: FieldValue.serverTimestamp()
         });
         
-        logger.log('INFO', `[requestPiFetch] User ${userCid} requested fetch for PI ${piCidNum} (${piUsername}). Request ID: ${requestId}`);
+        logger.log('INFO', `[requestPiFetch] User ${userCid}${isImpersonating ? ` (impersonating ${requestUserCid})` : ''} requested fetch for PI ${piCidNum} (${piUsername}). Request ID: ${requestId}`);
         
         return res.status(200).json({
             success: true,
@@ -170,7 +185,7 @@ async function requestPiFetch(req, res, dependencies, config) {
 async function getPiFetchStatus(req, res, dependencies, config) {
     const { db, logger } = dependencies;
     const { piCid } = req.params;
-    const userCid = req.user?.etoroCID || req.query?.userCid;
+    const userCid = req.query?.userCid; // Optional - for rate limit info
     
     const piCidNum = Number(piCid);
     if (isNaN(piCidNum) || piCidNum <= 0) {

package/package.json

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