bulltrackers-module 1.0.411 → 1.0.413

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

@@ -66,9 +66,12 @@ async function findLatestPortfolioDate(db, signedInUsersCollection, userCid, max
  * Helper function to find the latest available date for computation results
  * Searches backwards from today up to 30 days
  */
-async function findLatestComputationDate(db, insightsCollection, category, computationName, userCid, maxDaysBack = 30) {
+async function findLatestComputationDate(db, insightsCollection, resultsSub, compsSub, category, computationName, userCid, maxDaysBack = 30) {
     const today = new Date();
     
+    // Log the path structure being checked
+    console.log(`[findLatestComputationDate] Searching for: ${insightsCollection}/{date}/${resultsSub}/${category}/${compsSub}/${computationName}`);
+    
     for (let i = 0; i < maxDaysBack; i++) {
         const checkDate = new Date(today);
         checkDate.setDate(checkDate.getDate() - i);
@@ -77,36 +80,34 @@ async function findLatestComputationDate(db, insightsCollection, category, compu
         try {
             const computationRef = db.collection(insightsCollection)
                 .doc(dateStr)
-                .collection('results')
+                .collection(resultsSub)
                 .doc(category)
-                .collection('computations')
+                .collection(compsSub)
                 .doc(computationName);
             
             const computationDoc = await computationRef.get();
             
+            // Log each date being checked
+            if (i < 3) { // Only log first 3 to avoid spam
+                console.log(`[findLatestComputationDate] Checking date ${dateStr}: exists=${computationDoc.exists}`);
+            }
+            
+            // Just check if document exists - don't check for CID here
+            // We'll check for CID in the calling function after decompression
             if (computationDoc.exists) {
-                const rawData = computationDoc.data();
-                // Decompress if needed (handles byte string storage)
-                const computationData = tryDecompress(rawData);
-                // Check if user's CID exists in the computation result
-                const cidStr = String(userCid);
-                const hasCid = computationData && computationData[cidStr] !== undefined;
-                
-                if (hasCid) {
-                    return dateStr; // Found data for this date
-                } else if (computationData && typeof computationData === 'object') {
-                    // Log debug info if document exists but CID not found
-                    const sampleKeys = Object.keys(computationData).slice(0, 5);
-                    console.log(`[findLatestComputationDate] Date ${dateStr}: Document exists but CID ${cidStr} not found. Sample keys:`, sampleKeys);
-                }
+                console.log(`[findLatestComputationDate] Found document at date: ${dateStr}`);
+                return dateStr; // Found document for this date
             }
         } catch (error) {
+            // Log errors for debugging
+            console.error(`[findLatestComputationDate] Error checking date ${dateStr}:`, error.message);
             // Continue to next date if error
             continue;
         }
     }
     
-    return null; // No data found in the last maxDaysBack days
+    console.log(`[findLatestComputationDate] No document found in last ${maxDaysBack} days`);
+    return null; // No document found in the last maxDaysBack days
 }
 
 /**
@@ -672,7 +673,9 @@ async function getUserComputations(req, res, dependencies, config) {
             const firstCompName = computationNames[0];
             const latestDate = await findLatestComputationDate(
                 db, 
-                insightsCollection, 
+                insightsCollection,
+                resultsSub,
+                compsSub,
                 category, 
                 firstCompName, 
                 userCid, 
@@ -796,9 +799,14 @@ async function autoGenerateWatchlist(req, res, dependencies, config) {
         const computationName = 'SignedInUserCopiedPIs';
         
         // Try to find latest computation date (with fallback)
+        const insightsCollection = config.unifiedInsightsCollection || 'unified_insights';
+        const resultsSub = config.resultsSubcollection || 'results';
+        const compsSub = config.computationsSubcollection || 'computations';
         const computationDate = await findLatestComputationDate(
             db, 
-            insightsCollection, 
+            insightsCollection,
+            resultsSub,
+            compsSub,
             category, 
             computationName, 
             userCid, 
@@ -1387,17 +1395,24 @@ async function getPiProfile(req, res, dependencies, config) {
         const category = 'popular_investor';
         const today = new Date().toISOString().split('T')[0];
         
-        // Find latest available computation date
+        logger.log('INFO', `[getPiProfile] Starting search for PI CID: ${cid}`);
+        
+        // Find latest available computation date (just check if document exists, not CID)
         const latestDate = await findLatestComputationDate(
             db, 
-            insightsCollection, 
+            insightsCollection,
+            resultsSub,
+            compsSub,
             category, 
             computationName, 
-            cid, 
+            null, // Don't pass CID - just find if document exists
             30
         );
         
+        logger.log('INFO', `[getPiProfile] Latest computation date found: ${latestDate || 'NONE'}`);
+        
         if (!latestDate) {
+            logger.log('WARN', `[getPiProfile] No computation document found for ${computationName} in last 30 days`);
             return res.status(404).json({ 
                 error: "Profile data not available",
                 message: "No computation results found for this Popular Investor"
@@ -1412,9 +1427,12 @@ async function getPiProfile(req, res, dependencies, config) {
             .collection(compsSub)
             .doc(computationName);
         
+        logger.log('INFO', `[getPiProfile] Fetching document at path: ${insightsCollection}/${latestDate}/${resultsSub}/${category}/${compsSub}/${computationName}`);
+        
         const computationDoc = await computationRef.get();
         
         if (!computationDoc.exists) {
+            logger.log('WARN', `[getPiProfile] Document does not exist at expected path`);
             return res.status(404).json({ 
                 error: "Profile data not found",
                 message: "Computation document does not exist"
@@ -1425,6 +1443,7 @@ async function getPiProfile(req, res, dependencies, config) {
         const rawData = computationDoc.data();
         const wasCompressed = rawData && rawData._compressed === true;
         logger.log('INFO', `[getPiProfile] Document exists. Was compressed: ${wasCompressed}, CID being searched: ${cid}`);
+        logger.log('INFO', `[getPiProfile] Raw data keys:`, rawData ? Object.keys(rawData).slice(0, 10) : 'NO DATA');
         
         const computationData = tryDecompress(rawData);
         
@@ -1443,26 +1462,30 @@ async function getPiProfile(req, res, dependencies, config) {
         // Log full decompressed data (will be large but needed for debugging)
         logger.log('INFO', `[getPiProfile] FULL DECOMPRESSED DOCUMENT CONTENTS:`, JSON.stringify(computationData, null, 2));
         
-        const profileData = computationData[String(cid)];
+        const cidStr = String(cid);
+        const profileData = computationData && typeof computationData === 'object' ? computationData[cidStr] : undefined;
         
         if (!profileData) {
             // Additional debug info in error response
             const availableCids = computationData && typeof computationData === 'object' ? Object.keys(computationData).slice(0, 20) : [];
-            logger.log('WARN', `[getPiProfile] CID ${cid} not found in computation data. Available CIDs (sample):`, availableCids);
+            logger.log('WARN', `[getPiProfile] CID ${cid} (as string: "${cidStr}") not found in computation data. Available CIDs (sample):`, availableCids);
             
             return res.status(404).json({ 
                 error: "Profile data not found",
                 message: "No data for this Popular Investor in computation results",
                 debug: {
-                    searchedCid: String(cid),
+                    searchedCid: cidStr,
                     wasCompressed: wasCompressed,
                     totalKeysInDocument: computationData && typeof computationData === 'object' ? Object.keys(computationData).length : 0,
                     sampleAvailableCids: availableCids,
-                    dataDate: latestDate
+                    dataDate: latestDate,
+                    documentPath: `${insightsCollection}/${latestDate}/${resultsSub}/${category}/${compsSub}/${computationName}`
                 }
             });
         }
         
+        logger.log('SUCCESS', `[getPiProfile] Found profile data for CID ${cid} from date ${latestDate}`);
+        
         return res.status(200).json({
             status: 'success',
             cid: String(cid),

package/package.json

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