bulltrackers-module 1.0.614 → 1.0.615

package/functions/api-v2/helpers/data-fetchers/firestore.js

@@ -1146,21 +1146,73 @@ const fetchNotifications = async (firestore, userId, options = {}) => {
 
 // 12. Mark Notification Read
 const markNotificationRead = async (firestore, userId, notificationIds, markAll = false) => {
-    const batch = firestore.batch();
     const collectionRef = firestore.collection('SignedInUsers').doc(userId).collection('notifications');
+    const MAX_BATCH_SIZE = 500; // Firestore batch limit
+    const batches = [];
+    let currentBatch = firestore.batch();
+    let batchCount = 0;
 
     if (markAll) {
-        const snapshot = await collectionRef.where('read', '==', false).get();
+        // Query all unread notifications with a reasonable limit to prevent timeouts
+        // Process in chunks to avoid overwhelming the system
+        const MAX_NOTIFICATIONS_TO_PROCESS = 1000; // Limit to prevent timeouts
+        const snapshot = await collectionRef.where('read', '==', false).limit(MAX_NOTIFICATIONS_TO_PROCESS).get();
+        console.log(`[markNotificationRead] Marking ${snapshot.size} notifications as read for user ${userId} (limited to ${MAX_NOTIFICATIONS_TO_PROCESS})`);
+        
+        if (snapshot.size === 0) {
+            console.log(`[markNotificationRead] No unread notifications found for user ${userId}`);
+            return;
+        }
+        
         snapshot.docs.forEach(doc => {
-            batch.update(doc.ref, { read: true, readAt: new Date() });
+            currentBatch.update(doc.ref, { read: true, readAt: new Date() });
+            batchCount++;
+            
+            // If batch is full, commit it and start a new one
+            if (batchCount >= MAX_BATCH_SIZE) {
+                batches.push(currentBatch);
+                currentBatch = firestore.batch();
+                batchCount = 0;
+            }
         });
-    } else if (Array.isArray(notificationIds)) {
+        
+        // Add the last batch if it has operations
+        if (batchCount > 0) {
+            batches.push(currentBatch);
+        }
+    } else if (Array.isArray(notificationIds) && notificationIds.length > 0) {
+        // Mark specific notifications
         notificationIds.forEach(id => {
             const ref = collectionRef.doc(id);
-            batch.update(ref, { read: true, readAt: new Date() });
+            currentBatch.update(ref, { read: true, readAt: new Date() });
+            batchCount++;
+            
+            // If batch is full, commit it and start a new one
+            if (batchCount >= MAX_BATCH_SIZE) {
+                batches.push(currentBatch);
+                currentBatch = firestore.batch();
+                batchCount = 0;
+            }
         });
+        
+        // Add the last batch if it has operations
+        if (batchCount > 0) {
+            batches.push(currentBatch);
+        }
+    } else {
+        // No valid operation
+        return;
+    }
+
+    // Commit all batches sequentially to avoid overwhelming Firestore and prevent timeouts
+    if (batches.length > 0) {
+        console.log(`[markNotificationRead] Committing ${batches.length} batch(es) for user ${userId}`);
+        for (let i = 0; i < batches.length; i++) {
+            await batches[i].commit();
+            console.log(`[markNotificationRead] Committed batch ${i + 1}/${batches.length} for user ${userId}`);
+        }
+        console.log(`[markNotificationRead] Successfully marked notifications as read for user ${userId}`);
     }
-    await batch.commit();
 };
 
 

package/functions/api-v2/routes/notifications.js

@@ -27,10 +27,14 @@ router.post('/mark-read', async (req, res) => {
         const { db } = req.dependencies;
         const { notificationIds, markAll } = req.body; // Array of IDs or boolean flag
         
+        console.log(`[notifications/mark-read] Request for user ${req.targetUserId}, markAll: ${markAll}, notificationIds: ${notificationIds?.length || 0}`);
+        
+        // Execute the operation with a reasonable timeout
         await markNotificationRead(db, req.targetUserId, notificationIds, markAll);
         
         res.json({ success: true });
     } catch (error) {
+        console.error(`[notifications/mark-read] Error for user ${req.targetUserId}:`, error.message, error.stack);
         res.status(500).json({ error: error.message });
     }
 });

package/package.json

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