bulltrackers-module 1.0.459 → 1.0.461

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

@@ -62,9 +62,11 @@ async function findLatestComputationDate(db, insightsCollection, resultsSub, com
         
         const doc = await computationRef.get();
         if (doc.exists) {
+            console.log(`[findLatestComputationDate] Found computation ${computationName} in category ${category} for date ${dateStr}`);
             return dateStr;
         }
     }
+    console.log(`[findLatestComputationDate] No computation found for ${computationName} in category ${category} within ${maxDays} days`);
     return null;
 }
 
@@ -87,45 +89,110 @@ async function hasUserCopied(db, userCid, piCid, config) {
         }
         // devResult is null, meaning no dev override, continue with normal logic
         
-        // === PRIMARY: Try to fetch from SignedInUserCopiedPIs computation ===
+        // === PRIMARY: Try to fetch from computation results ===
         const insightsCollection = config.unifiedInsightsCollection || 'unified_insights';
-        const category = 'signed_in_user';
-        const computationName = 'SignedInUserCopiedPIs';
         const resultsSub = config.resultsSubcollection || 'results';
         const compsSub = config.computationsSubcollection || 'computations';
         
-        const computationDate = await findLatestComputationDate(
-            db, 
-            insightsCollection,
-            resultsSub,
-            compsSub,
-            category, 
-            computationName, 
-            userCidNum, 
-            30
-        );
+        // Try both computation names and categories
+        const computationConfigs = [
+            { category: 'signed_in_user', name: 'SignedInUserCopiedPIs', format: 'object' }, // Returns { current: [], past: [], all: [] }
+            { category: 'signed_in_user', name: 'SignedInUserCopiedList', format: 'array' }, // Returns array directly
+            { category: 'popular-investor', name: 'SignedInUserCopiedList', format: 'array' }, // Alternative location
+        ];
         
-        if (computationDate) {
-            const computationRef = db.collection(insightsCollection)
-                .doc(computationDate)
-                .collection(resultsSub)
-                .doc(category)
-                .collection(compsSub)
-                .doc(computationName);
+        for (const configItem of computationConfigs) {
+            const computationDate = await findLatestComputationDate(
+                db, 
+                insightsCollection,
+                resultsSub,
+                compsSub,
+                configItem.category, 
+                configItem.name, 
+                userCidNum, 
+                30
+            );
             
-            const computationDoc = await computationRef.get();
-            
-            if (computationDoc.exists) {
-                const rawData = computationDoc.data();
-                const decompressed = tryDecompress(rawData);
+            if (computationDate) {
+                const computationRef = db.collection(insightsCollection)
+                    .doc(computationDate)
+                    .collection(resultsSub)
+                    .doc(configItem.category)
+                    .collection(compsSub)
+                    .doc(configItem.name);
+                
+                const computationDoc = await computationRef.get();
                 
-                // Check if user's data exists in computation results
-                if (decompressed && decompressed[String(userCidNum)]) {
-                    const userData = decompressed[String(userCidNum)];
-                    // Check if PI is in current, past, or all arrays
-                    const allCopied = userData.all || [];
-                    if (allCopied.includes(piCidNum)) {
-                        return true;
+                if (computationDoc.exists) {
+                    const rawData = computationDoc.data();
+                    
+                    // Handle sharded data
+                    let mergedData = null;
+                    if (rawData._sharded === true && rawData._shardCount) {
+                        // Data is in shards - read all shards and merge
+                        const shardsCol = computationRef.collection('_shards');
+                        const shardsSnapshot = await shardsCol.get();
+                        
+                        if (!shardsSnapshot.empty) {
+                            mergedData = {};
+                            for (const shardDoc of shardsSnapshot.docs) {
+                                const shardData = shardDoc.data();
+                                // Merge shard data - each shard may contain different user IDs
+                                for (const [key, value] of Object.entries(shardData)) {
+                                    if (mergedData[key]) {
+                                        // If key exists, merge arrays or objects
+                                        if (Array.isArray(mergedData[key]) && Array.isArray(value)) {
+                                            mergedData[key] = [...mergedData[key], ...value];
+                                        } else if (typeof mergedData[key] === 'object' && typeof value === 'object') {
+                                            mergedData[key] = { ...mergedData[key], ...value };
+                                        } else {
+                                            mergedData[key] = value;
+                                        }
+                                    } else {
+                                        mergedData[key] = value;
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        // Data is in main document - decompress if needed
+                        const { tryDecompress } = require('./data_helpers');
+                        mergedData = tryDecompress(rawData);
+                        
+                        // Handle string decompression result
+                        if (typeof mergedData === 'string') {
+                            try {
+                                mergedData = JSON.parse(mergedData);
+                            } catch (e) {
+                                console.error(`[hasUserCopied] Failed to parse decompressed string:`, e.message);
+                                continue;
+                            }
+                        }
+                    }
+                    
+                    if (!mergedData) continue;
+                    
+                    // Extract user data based on format
+                    const userData = mergedData[String(userCidNum)];
+                    if (!userData) continue;
+                    
+                    if (configItem.format === 'object') {
+                        // SignedInUserCopiedPIs format: { userId: { current: [], past: [], all: [] } }
+                        if (userData.all && Array.isArray(userData.all)) {
+                            if (userData.all.includes(piCidNum)) {
+                                console.log(`[hasUserCopied] Found PI ${piCidNum} in SignedInUserCopiedPIs.all for user ${userCid} (date: ${computationDate}, category: ${configItem.category})`);
+                                return true;
+                            }
+                        }
+                    } else if (configItem.format === 'array') {
+                        // SignedInUserCopiedList format: { userId: [{ cid: X, ... }, ...] }
+                        if (Array.isArray(userData)) {
+                            const hasCopied = userData.some(item => Number(item.cid) === piCidNum);
+                            if (hasCopied) {
+                                console.log(`[hasUserCopied] Found PI ${piCidNum} in SignedInUserCopiedList for user ${userCid} (date: ${computationDate}, category: ${configItem.category})`);
+                                return true;
+                            }
+                        }
                     }
                 }
             }
@@ -135,12 +202,34 @@ async function hasUserCopied(db, userCid, piCid, config) {
         const userDoc = await db.collection(signedInUsersCollection).doc(String(userCid)).get();
         if (userDoc.exists) {
             const data = userDoc.data();
+            
+            // Check AggregatedMirrors (current copies)
             if (data.AggregatedMirrors && Array.isArray(data.AggregatedMirrors)) {
                 const isCopying = data.AggregatedMirrors.some(m => Number(m.ParentCID) === piCidNum);
-                if (isCopying) return true;
+                if (isCopying) {
+                    console.log(`[hasUserCopied] Found PI ${piCidNum} in AggregatedMirrors for user ${userCid}`);
+                    return true;
+                }
+            }
+            
+            // Also check historical mirrors if available
+            if (data.snapshots && typeof data.snapshots === 'object') {
+                // Check recent snapshots for any copy history
+                const snapshotDates = Object.keys(data.snapshots).sort().reverse().slice(0, 30); // Last 30 days
+                for (const date of snapshotDates) {
+                    const snapshot = data.snapshots[date];
+                    if (snapshot && snapshot.AggregatedMirrors && Array.isArray(snapshot.AggregatedMirrors)) {
+                        const wasCopying = snapshot.AggregatedMirrors.some(m => Number(m.ParentCID) === piCidNum);
+                        if (wasCopying) {
+                            console.log(`[hasUserCopied] Found PI ${piCidNum} in historical snapshot ${date} for user ${userCid}`);
+                            return true;
+                        }
+                    }
+                }
             }
         }
 
+        console.log(`[hasUserCopied] User ${userCid} has not copied PI ${piCidNum} (checked computation and portfolio)`);
         return false;
     } catch (error) {
         console.error('[hasUserCopied] Error checking copy status:', error);
@@ -435,6 +524,8 @@ async function checkReviewEligibility(req, res, dependencies, config) {
         
         const canReview = await hasUserCopied(db, effectiveCid, piCid, config);
         
+        logger.log('INFO', `[checkReviewEligibility] User ${effectiveCid} eligibility for PI ${piCid}: ${canReview}`);
+        
         return res.status(200).json({
             piCid: Number(piCid),
             eligible: canReview,

package/package.json

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