bulltrackers-module 1.0.579 → 1.0.580

package/functions/generic-api/user-api/helpers/data/computation_helpers.js

@@ -209,56 +209,99 @@ async function getUserComputations(req, res, dependencies, config) {
         
         const isDevOverrideActive = devOverride && devOverride.enabled && devOverride.fakeCopiedPIs.length > 0;
         
+        // Check if any of the requested computations are meta computations
+        const firstCompName = computationNames[0];
+        const firstCompMetadata = computationMetadata[firstCompName];
+        const isMetaComputation = firstCompMetadata && firstCompMetadata.type === 'meta';
+        
         let datesToCheck = [today];
         
         if (mode === 'latest') {
-            // Use same logic as data-status: search backwards and verify user exists
-            // This ensures we find the same date that data-status found
-            const firstCompName = computationNames[0];
-            const maxDaysBack = 30; // Match data-status search window
             let foundDate = null;
             
-            for (let daysBack = 0; daysBack < maxDaysBack; daysBack++) {
-                const checkDate = new Date();
-                checkDate.setDate(checkDate.getDate() - daysBack);
-                const dateStr = checkDate.toISOString().split('T')[0];
+            if (isMetaComputation) {
+                // For meta computations: check today first, then look back 7 days
+                const maxDaysBack = 7;
                 
-                try {
-                    // Check if page/computation document exists for this user and date
-                    // For computations using pages subcollection, checkPiInComputationDate handles it
-                    // For other computations, check the main document first
-                    const { found } = await checkPiInComputationDate(
-                        db,
-                        insightsCollection,
-                        resultsSub,
-                        compsSub,
-                        category,
-                        firstCompName,
-                        dateStr,
-                        String(effectiveCid),
-                        logger
-                    );
+                for (let daysBack = 0; daysBack < maxDaysBack; daysBack++) {
+                    const checkDate = new Date();
+                    checkDate.setDate(checkDate.getDate() - daysBack);
+                    const dateStr = checkDate.toISOString().split('T')[0];
+                    
+                    try {
+                        // For meta computations, just check if the document exists
+                        const computationRef = db.collection(insightsCollection)
+                            .doc(dateStr)
+                            .collection(resultsSub)
+                            .doc(category)
+                            .collection(compsSub)
+                            .doc(firstCompName);
+                        
+                        const computationDoc = await computationRef.get();
+                        
+                        if (computationDoc.exists) {
+                            foundDate = dateStr;
+                            if (dateStr !== today) {
+                                logger.log('INFO', `[getUserComputations] Meta computation ${firstCompName} found on fallback date ${foundDate} (today: ${today})`);
+                            } else {
+                                logger.log('INFO', `[getUserComputations] Meta computation ${firstCompName} found on today's date`);
+                            }
+                            break; // Found document, stop searching
+                        }
+                    } catch (error) {
+                        // Continue to next date if error
+                        logger.log('DEBUG', `[getUserComputations] Error checking date ${dateStr} for meta computation:`, error.message);
+                        continue;
+                    }
+                }
+            } else {
+                // For user-specific computations: use same logic as data-status
+                // Search backwards and verify user exists
+                const maxDaysBack = 30; // Match data-status search window
+                
+                for (let daysBack = 0; daysBack < maxDaysBack; daysBack++) {
+                    const checkDate = new Date();
+                    checkDate.setDate(checkDate.getDate() - daysBack);
+                    const dateStr = checkDate.toISOString().split('T')[0];
                     
-                    if (found) {
-                        foundDate = dateStr;
-                        if (dateStr !== today) {
-                            logger.log('INFO', `[getUserComputations] Using fallback date ${foundDate} for effective CID ${effectiveCid} (today: ${today})`);
-                        } else {
-                            logger.log('INFO', `[getUserComputations] Found computation for effective CID ${effectiveCid} on today's date`);
+                    try {
+                        // Check if page/computation document exists for this user and date
+                        // For computations using pages subcollection, checkPiInComputationDate handles it
+                        // For other computations, check the main document first
+                        const { found } = await checkPiInComputationDate(
+                            db,
+                            insightsCollection,
+                            resultsSub,
+                            compsSub,
+                            category,
+                            firstCompName,
+                            dateStr,
+                            String(effectiveCid),
+                            logger
+                        );
+                        
+                        if (found) {
+                            foundDate = dateStr;
+                            if (dateStr !== today) {
+                                logger.log('INFO', `[getUserComputations] Using fallback date ${foundDate} for effective CID ${effectiveCid} (today: ${today})`);
+                            } else {
+                                logger.log('INFO', `[getUserComputations] Found computation for effective CID ${effectiveCid} on today's date`);
+                            }
+                            break; // Found user, stop searching
                         }
-                        break; // Found user, stop searching
+                    } catch (error) {
+                        // Continue to next date if error
+                        logger.log('DEBUG', `[getUserComputations] Error checking date ${dateStr}:`, error.message);
+                        continue;
                     }
-                } catch (error) {
-                    // Continue to next date if error
-                    logger.log('DEBUG', `[getUserComputations] Error checking date ${dateStr}:`, error.message);
-                    continue;
                 }
             }
             
             if (foundDate) {
                 datesToCheck = [foundDate];
             } else {
-                logger.log('WARN', `[getUserComputations] No computation data found for CID ${effectiveCid} in last ${maxDaysBack} days. Frontend will use fallback.`);
+                const maxDaysBack = isMetaComputation ? 7 : 30;
+                logger.log('WARN', `[getUserComputations] No computation data found for ${isMetaComputation ? 'meta computation' : `CID ${effectiveCid}`} in last ${maxDaysBack} days. Frontend will use fallback.`);
                 return res.status(200).json({
                     status: 'success',
                     userCid: String(effectiveCid),

package/package.json

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