bulltrackers-module 1.0.549 → 1.0.550

package/functions/generic-api/user-api/helpers/core/path_resolution_helpers.js

@@ -285,11 +285,22 @@ async function readWithMigration(db, category, subcategory, params, options = {}
         try {
             if (isCollection) {
                 // Collection path must have odd number of segments
-                const collectionRef = db.collection(newPath);
-                const snapshot = await collectionRef.get();
-                if (!snapshot.empty) {
-                    if (logger) logger.log('INFO', `[readWithMigration] Found data in new path: ${newPath}`);
-                    return { snapshot, source: 'new', path: newPath };
+                if (documentId) {
+                    // Read specific document from collection
+                    const docRef = db.collection(newPath).doc(documentId);
+                    const doc = await docRef.get();
+                    if (doc.exists) {
+                        if (logger) logger.log('INFO', `[readWithMigration] Found document in new path: ${docRef.path}`);
+                        return { data: doc.data(), exists: true, source: 'new', path: docRef.path };
+                    }
+                } else {
+                    // Read entire collection
+                    const collectionRef = db.collection(newPath);
+                    const snapshot = await collectionRef.get();
+                    if (!snapshot.empty) {
+                        if (logger) logger.log('INFO', `[readWithMigration] Found data in new path: ${newPath}`);
+                        return { snapshot, source: 'new', path: newPath };
+                    }
                 }
             } else {
                 // Document path: if newPath has even segments, it's already a document path
@@ -345,17 +356,34 @@ async function readWithMigration(db, category, subcategory, params, options = {}
                 legacyPath = legacyPath.replace(/{version}/g, params.version || '{version}');
                 
                 if (isCollection) {
-                    const legacyCollectionRef = db.collection(legacyPath);
-                    const legacySnapshot = await legacyCollectionRef.get();
-                    if (!legacySnapshot.empty) {
-                        if (logger) logger.log('INFO', `[readWithMigration] Found data in legacy path: ${legacyPath}, will migrate`);
-                        
-                        // Auto-migrate if new path is available
-                        if (newPath) {
-                            await migrateCollectionData(db, legacySnapshot, newPath, dataType, logger);
+                    if (documentId) {
+                        // Read specific document from legacy collection
+                        const legacyDocRef = db.collection(legacyPath).doc(documentId);
+                        const legacyDoc = await legacyDocRef.get();
+                        if (legacyDoc.exists) {
+                            if (logger) logger.log('INFO', `[readWithMigration] Found document in legacy path: ${legacyDocRef.path}, will migrate`);
+                            
+                            // Auto-migrate if new path is available
+                            if (newPath) {
+                                await migrateDocumentData(db, legacyDoc, newPath, documentId, logger);
+                            }
+                            
+                            return { data: legacyDoc.data(), exists: true, source: 'legacy', path: legacyDocRef.path, migrated: !!newPath };
+                        }
+                    } else {
+                        // Read entire legacy collection
+                        const legacyCollectionRef = db.collection(legacyPath);
+                        const legacySnapshot = await legacyCollectionRef.get();
+                        if (!legacySnapshot.empty) {
+                            if (logger) logger.log('INFO', `[readWithMigration] Found data in legacy path: ${legacyPath}, will migrate`);
+                            
+                            // Auto-migrate if new path is available
+                            if (newPath) {
+                                await migrateCollectionData(db, legacySnapshot, newPath, dataType, logger);
+                            }
+                            
+                            return { snapshot: legacySnapshot, source: 'legacy', path: legacyPath, migrated: !!newPath };
                         }
-                        
-                        return { snapshot: legacySnapshot, source: 'legacy', path: legacyPath, migrated: !!newPath };
                     }
                 } else {
                     const legacyDocRef = documentId

package/functions/generic-api/user-api/helpers/watchlist/watchlist_management_helpers.js

@@ -225,11 +225,24 @@ async function updateWatchlist(req, res, dependencies, config) {
             }
         );
         
-        if (!readResult || !readResult.exists) {
+        if (!readResult) {
             return res.status(404).json({ error: "Watchlist not found" });
         }
         
-        const existingData = readResult.data();
+        // Handle both document read (with data) and collection read (with snapshot)
+        let existingData;
+        if (readResult.data) {
+            existingData = readResult.data;
+        } else if (readResult.snapshot && !readResult.snapshot.empty) {
+            // If we got a snapshot, find the specific document
+            const doc = readResult.snapshot.docs.find(d => d.id === id);
+            if (!doc) {
+                return res.status(404).json({ error: "Watchlist not found" });
+            }
+            existingData = doc.data();
+        } else {
+            return res.status(404).json({ error: "Watchlist not found" });
+        }
         
         // Verify ownership
         if (existingData.createdBy !== Number(userCid)) {

package/package.json

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