bulltrackers-module 1.0.462 → 1.0.463

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

@@ -213,6 +213,30 @@ async function updateWatchlist(req, res, dependencies, config) {
             return res.status(403).json({ error: "You can only modify your own watchlists" });
         }
         
+        // Check if this is a copied watchlist
+        const isCopiedWatchlist = existingData.copiedFrom && existingData.copiedFromCreator;
+        const wasModified = existingData.hasBeenModified || false;
+        
+        // Determine if meaningful changes are being made (not just name)
+        let hasMeaningfulChanges = wasModified;
+        if (items !== undefined && existingData.type === 'static') {
+            // Check if items actually changed
+            const itemsChanged = JSON.stringify(items) !== JSON.stringify(existingData.items || []);
+            hasMeaningfulChanges = hasMeaningfulChanges || itemsChanged;
+        }
+        if (dynamicConfig !== undefined && existingData.type === 'dynamic') {
+            // Check if dynamicConfig actually changed
+            const configChanged = JSON.stringify(dynamicConfig) !== JSON.stringify(existingData.dynamicConfig || {});
+            hasMeaningfulChanges = hasMeaningfulChanges || configChanged;
+        }
+        
+        // If trying to make a copied watchlist public, check if meaningful changes were made
+        if (visibility === 'public' && isCopiedWatchlist && !hasMeaningfulChanges) {
+            return res.status(400).json({ 
+                error: "Cannot publish copied watchlist without making meaningful changes. Please modify the watchlist items, thresholds, or parameters before publishing." 
+            });
+        }
+        
         const updates = {
             updatedAt: FieldValue.serverTimestamp()
         };
@@ -221,6 +245,11 @@ async function updateWatchlist(req, res, dependencies, config) {
             updates.name = name.trim();
         }
         
+        // Track if watchlist has been modified (for copied watchlists)
+        if (isCopiedWatchlist && hasMeaningfulChanges) {
+            updates.hasBeenModified = true;
+        }
+        
         if (visibility !== undefined) {
             if (visibility !== 'public' && visibility !== 'private') {
                 return res.status(400).json({ error: "Visibility must be 'public' or 'private'" });
@@ -235,7 +264,7 @@ async function updateWatchlist(req, res, dependencies, config) {
                     createdBy: existingData.createdBy,
                     name: updates.name || existingData.name,
                     type: existingData.type,
-                    description: dynamicConfig?.description || '',
+                    description: (dynamicConfig?.description || existingData.dynamicConfig?.description || ''),
                     copyCount: existingData.copyCount || 0,
                     createdAt: existingData.createdAt,
                     updatedAt: FieldValue.serverTimestamp()
@@ -345,6 +374,8 @@ async function copyWatchlist(req, res, dependencies, config) {
         return res.status(400).json({ error: "Missing userCid or watchlist id" });
     }
     
+    const userCidNum = Number(userCid);
+    
     try {
         // First, try to find in public watchlists
         const publicRef = db.collection('public_watchlists').doc(id);
@@ -355,10 +386,11 @@ async function copyWatchlist(req, res, dependencies, config) {
         }
         
         const publicData = publicDoc.data();
+        const originalCreatorCid = Number(publicData.createdBy);
         
         // Find the original watchlist
         const originalRef = db.collection(config.watchlistsCollection || 'watchlists')
-            .doc(String(publicData.createdBy))
+            .doc(String(originalCreatorCid))
             .collection('lists')
             .doc(id);
         
@@ -370,15 +402,52 @@ async function copyWatchlist(req, res, dependencies, config) {
         
         const originalData = originalDoc.data();
         
+        // Check if user is copying their own watchlist
+        const isCopyingOwn = originalCreatorCid === userCidNum;
+        
+        // If copying own watchlist, find existing copies to determine number
+        let copyNumber = 1;
+        let newName = name;
+        
+        if (isCopyingOwn) {
+            // Get all watchlists by this user to find existing copies
+            const userWatchlistsRef = db.collection(config.watchlistsCollection || 'watchlists')
+                .doc(String(userCidNum))
+                .collection('lists');
+            
+            const userWatchlistsSnapshot = await userWatchlistsRef.get();
+            const baseName = originalData.name.replace(/\s*#\d+$/, ''); // Remove existing #N suffix
+            
+            // Count existing copies (including original)
+            const existingCopies = [];
+            userWatchlistsSnapshot.forEach(doc => {
+                const data = doc.data();
+                const docName = data.name.replace(/\s*#\d+$/, '');
+                if (docName === baseName || docName === originalData.name) {
+                    existingCopies.push(data);
+                }
+            });
+            
+            // Determine next copy number
+            copyNumber = existingCopies.length + 1;
+            newName = name || `${baseName} #${copyNumber}`;
+        } else {
+            // Copying someone else's watchlist
+            newName = name || `${originalData.name} (Copy)`;
+        }
+        
         // Create new watchlist for the copying user
         const newWatchlistId = generateWatchlistId();
         const watchlistData = {
             ...originalData,
             id: newWatchlistId,
-            name: name || `${originalData.name} (Copy)`,
-            createdBy: Number(userCid),
+            name: newName,
+            createdBy: userCidNum,
             visibility: 'private', // Copied watchlists are always private
             copiedFrom: id,
+            copiedFromCreator: originalCreatorCid,
+            originalName: originalData.name, // Store original name for comparison
+            hasBeenModified: false, // Track if user made meaningful changes
             createdAt: FieldValue.serverTimestamp(),
             updatedAt: FieldValue.serverTimestamp(),
             isAutoGenerated: false
@@ -388,19 +457,21 @@ async function copyWatchlist(req, res, dependencies, config) {
         delete watchlistData.copyCount;
         
         const newWatchlistRef = db.collection(config.watchlistsCollection || 'watchlists')
-            .doc(String(userCid))
+            .doc(String(userCidNum))
             .collection('lists')
             .doc(newWatchlistId);
         
         await newWatchlistRef.set(watchlistData);
         
-        // Increment copy count on original
-        await publicRef.update({
-            copyCount: FieldValue.increment(1),
-            updatedAt: FieldValue.serverTimestamp()
-        });
+        // Increment copy count on original (only if copying someone else's)
+        if (!isCopyingOwn) {
+            await publicRef.update({
+                copyCount: FieldValue.increment(1),
+                updatedAt: FieldValue.serverTimestamp()
+            });
+        }
         
-        logger.log('SUCCESS', `[copyWatchlist] User ${userCid} copied watchlist ${id} as ${newWatchlistId}`);
+        logger.log('SUCCESS', `[copyWatchlist] User ${userCid} copied watchlist ${id} as ${newWatchlistId}${isCopyingOwn ? ' (own watchlist)' : ''}`);
         
         return res.status(201).json({
             success: true,

package/package.json

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