bulltrackers-module 1.0.595 → 1.0.597

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

@@ -510,23 +510,6 @@ const fetchUserVerificationData = async (firestore, userId) => {
         const docRef = firestore.collection('SignedInUsers').doc(userId).collection('verification').doc('data');
         const docSnapshot = await docRef.get();
         if (!docSnapshot.exists) {
-            // Attempt migration from old location
-            const oldCollectionRef = firestore.collection('signedInUsers');
-            const oldSnapshot = await oldCollectionRef.get();
-            for (const doc of oldSnapshot.docs) {
-                const data = doc.data();
-                if (data.etoroCID && String(data.etoroCID) === String(userId)) {
-                    // Found old data, migrate it
-                    await docRef.set({
-                        ...data,
-                        migratedFromId: doc.id // Store old firestore ID
-                    });
-                    // Delete old document
-                    await oldCollectionRef.doc(doc.id).delete();
-                    return { id: doc.id, ...data, migratedFromId: doc.id };
-                }
-            }
-            // No data found
             throw new Error(`Verification data for User ID ${userId} not found`);
         }  
         return { id: docSnapshot.id, ...docSnapshot.data() };
@@ -1517,19 +1500,30 @@ const finalizeVerification = async (db, pubsub, userId, username) => {
         isOptOut
     });
 
-    // 2. Create/Update User Doc in SignedInUsers
-    // Note: We use the realCID as the document ID, matching the generic-api logic
-    await db.collection(signedInUsersCollection).doc(String(realCID)).set({
-        username: profileData.username,
-        cid: realCID,
-        fullName: `${profileData.firstName || ''} ${profileData.lastName || ''}`.trim(),
-        avatar: profileData.avatars?.find(a => a.type === 'Original')?.url || null,
-        isOptOut,
+    // 2. Create/Update verification data in new format location: /SignedInUsers/{cid}/verification/data
+    const verificationDataRef = db.collection('SignedInUsers').doc(String(realCID)).collection('verification').doc('data');
+    const existingVerificationDoc = await verificationDataRef.get();
+    
+    let emails = [];
+    if (existingVerificationDoc.exists()) {
+        const existingData = existingVerificationDoc.data();
+        // Preserve existing email array if present
+        emails = Array.isArray(existingData.email) ? existingData.email : (existingData.email ? [existingData.email] : []);
+    }
+    // Note: Email will be added by frontend completeAccountSetup when Firebase Auth email is available
+    
+    await verificationDataRef.set({
+        etoroUsername: profileData.username,
+        etoroCID: realCID,
+        email: emails, // Array - will be populated by frontend
+        displayName: `${profileData.firstName || ''} ${profileData.lastName || ''}`.trim(),
+        photoURL: profileData.avatars?.find(a => a.type === 'Original')?.url || null,
         verifiedAt: FieldValue.serverTimestamp(),
-        lastLogin: FieldValue.serverTimestamp()
+        accountSetupComplete: false, // Will be set to true by frontend completeAccountSetup
+        createdAt: FieldValue.serverTimestamp(),
     }, { merge: true });
 
-    // 3. Trigger Downstream Systems via Task Engine
+    // 4. Trigger Downstream Systems via Task Engine
     if (pubsub) {
         try {
             // Replicating the 'unifiedTask' payload from generic-api

package/package.json

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