bulltrackers-module 1.0.397 → 1.0.398

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

@@ -869,7 +869,7 @@ async function autoGenerateWatchlist(req, res, dependencies, config) {
             watchlistItems.push({
                 cid: Number(cidStr),
                 username: username,
-                addedAt: FieldValue.serverTimestamp(),
+                addedAt: new Date(), // Use regular Date (FieldValue.serverTimestamp() not allowed in arrays)
                 alertConfig: {
                     newPositions: true,
                     volatilityChanges: true,
@@ -917,6 +917,31 @@ async function autoGenerateWatchlist(req, res, dependencies, config) {
             const existingData = existingDoc.data();
             const existingItems = existingData.items || [];
             
+            // Create a map of existing items by CID to preserve their addedAt timestamps
+            const existingItemsMap = new Map();
+            for (const item of existingItems) {
+                if (item.cid) {
+                    existingItemsMap.set(item.cid, item);
+                }
+            }
+            
+            // Merge watchlist items, preserving addedAt for existing items
+            const syncedItems = watchlistItems.map(newItem => {
+                const existingItem = existingItemsMap.get(newItem.cid);
+                if (existingItem && existingItem.addedAt) {
+                    // Preserve existing addedAt timestamp
+                    return {
+                        ...newItem,
+                        addedAt: existingItem.addedAt
+                    };
+                }
+                // New item, use current date
+                return {
+                    ...newItem,
+                    addedAt: new Date()
+                };
+            });
+            
             // Calculate what changed
             const existingCIDs = new Set(existingItems.map(item => item.cid));
             const newCIDs = new Set(watchlistItems.map(item => item.cid));
@@ -926,7 +951,7 @@ async function autoGenerateWatchlist(req, res, dependencies, config) {
             
             // Replace entire items array to sync with current copied PIs
             await existingDoc.ref.update({
-                items: watchlistItems, // Full replacement to match current state
+                items: syncedItems, // Full replacement to match current state, preserving timestamps
                 updatedAt: FieldValue.serverTimestamp()
             });
             

package/package.json

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