Update main.py

main.py

@@ -177,70 +177,8 @@ def get_user_profile():
     
     return jsonify({'uid': uid, **user_doc.to_dict()})
 
-# dashboard_server.py
 
 
-
-@app.route('/api/user/profile/phone', methods=['PUT'])
-def update_user_phone():
-    """
-    Allows a user to submit their WhatsApp phone number for admin approval.
-    **DEFINITIVE FIX**: Correctly handles the `datetime` object returned from Firestore,
-    preventing the JSON serialization error that causes the MutationFn to fail.
-    """
-    uid = verify_token(request.headers.get('Authorization'))
-    if not uid: return jsonify({'error': 'Invalid or expired token'}), 401
-
-    data = request.get_json()
-    phone_number = data.get('phone')
-
-    if not phone_number or not isinstance(phone_number, str) or not phone_number.strip():
-        return jsonify({'error': 'A valid phone number is required.'}), 400
-    
-    phone_number_stripped = phone_number.strip()
-
-    try:
-        # Validate uniqueness
-        existing_user_query = db.collection('users').where('phone', '==', phone_number_stripped).limit(1).stream()
-        conflicting_users = list(existing_user_query)
-        if len(conflicting_users) > 0 and conflicting_users[0].id != uid:
-            return jsonify({'error': 'This phone number is already registered to another account.'}), 409
-        
-        # Update the user's profile
-        user_ref = db.collection('users').document(uid)
-        user_ref.update({
-            'phone': phone_number_stripped, 
-            'phoneStatus': 'pending'
-        })
-        
-        logging.info(f"User {uid} submitted phone number {phone_number_stripped} for approval.")
-        
-        # --- THE FIX IS HERE ---
-        # 1. Re-fetch the updated user document
-        updated_user_doc = user_ref.get()
-        if not updated_user_doc.exists:
-             return jsonify({'error': 'Failed to retrieve updated profile.'}), 500
-
-        # 2. Convert the document to a dictionary
-        user_data = updated_user_doc.to_dict()
-
-        # 3. IMPORTANT: Check for and convert any datetime objects to strings
-        if 'createdAt' in user_data and isinstance(user_data['createdAt'], datetime):
-            user_data['createdAt'] = user_data['createdAt'].isoformat() + "Z"
-
-        # 4. Return the now JSON-safe data, with the correct top-level structure
-        return jsonify({
-            'success': True, 
-            'message': 'Phone number submitted for approval.',
-            'uid': uid, 
-            **user_data
-        }), 200
-        # --- END OF FIX ---
-
-    except Exception as e:
-        logging.error(f"Error updating phone for user {uid}: {e}", exc_info=True)
-        return jsonify({'error': 'Failed to update phone number'}), 500
-
 @app.route('/api/user/dashboard', methods=['GET'])
 def get_user_dashboard():
     """
@@ -299,12 +237,13 @@ def get_user_dashboard():
         logging.error(f"Error fetching dashboard data for user {uid} (phone: {phone_number}): {e}")
         return jsonify({'error': 'An error occurred while fetching your dashboard data.'}), 500
 
+
+# Replace your existing PUT /api/user/profile with this one.
 @app.route('/api/user/profile', methods=['PUT'])
 def update_user_profile():
     """
-    Allows a user to update their profile. If the phone number is changed,
-    it validates for uniqueness and stages the change based on user's choice
-    (migrate or start fresh).
+    A single, intelligent endpoint to handle all user profile updates,
+    including initial phone submission and subsequent changes/migrations.
     """
     uid = verify_token(request.headers.get('Authorization'))
     if not uid: return jsonify({'error': 'Invalid or expired token'}), 401
@@ -318,63 +257,76 @@ def update_user_profile():
     if not data: return jsonify({'error': 'No data provided'}), 400
 
     update_data = {}
+    response_message = "Profile updated successfully."
     
+    # --- Handle Display Name Update ---
     new_display_name = data.get('displayName')
     if new_display_name and new_display_name.strip() != current_user_data.get('displayName'):
         update_data['displayName'] = new_display_name.strip()
 
-    # --- REWORKED LOGIC FOR PHONE CHANGE ---
+    # --- Handle All Phone-Related Scenarios Intelligently ---
     new_phone = data.get('phone')
     if new_phone:
         new_phone_stripped = new_phone.strip()
         current_phone = current_user_data.get('phone')
 
-        if new_phone_stripped != current_phone:
-            # Get the user's choice: 'migrate' or 'start_fresh'
+        # Scenario 1: New user submitting a phone for the first time
+        if not current_phone:
+            # Validate uniqueness
+            existing_user_query = db.collection('users').where('phone', '==', new_phone_stripped).limit(1).stream()
+            if len(list(existing_user_query)) > 0:
+                return jsonify({'error': 'This phone number is already registered to another account.'}), 409
+            
+            # Stage the update for simple approval
+            update_data['phone'] = new_phone_stripped
+            update_data['phoneStatus'] = 'pending'
+            response_message += ' Your phone number has been submitted for approval.'
+            logging.info(f"New user {uid} submitted phone {new_phone_stripped} for initial approval.")
+
+        # Scenario 2: Existing user changing their phone number
+        elif new_phone_stripped != current_phone:
             action = data.get('phoneChangeAction')
             if action not in ['migrate', 'start_fresh']:
-                return jsonify({'error': "A choice ('migrate' or 'start_fresh') is required when changing phone numbers."}), 400
+                return jsonify({'error': "A choice ('migrate' or 'start_fresh') is required when changing an existing phone number."}), 400
 
-            # Validate that the new phone number is not already in use
+            # Validate uniqueness of the new number
             existing_user_query = db.collection('users').where('phone', '==', new_phone_stripped).limit(1).stream()
             if len(list(existing_user_query)) > 0:
                 return jsonify({'error': 'This phone number is already registered to another account.'}), 409
 
             # Stage the change based on the user's chosen action
-            update_data['migration_data'] = {
-                'from_phone': current_phone,
-                'to_phone': new_phone_stripped,
-                'action': action  # Store the user's choice
-            }
-            
-            # Use a descriptive status for the admin
-            if action == 'migrate':
-                update_data['phoneStatus'] = 'pending_migration'
-            else: # action == 'start_fresh'
-                update_data['phoneStatus'] = 'pending_fresh_start'
-            
-            logging.info(f"User {uid} initiated phone change to {new_phone_stripped} with action '{action}'. Awaiting admin approval.")
-            
-    # --- END OF REWORKED LOGIC ---
-    
+            update_data['migration_data'] = {'from_phone': current_phone, 'to_phone': new_phone_stripped, 'action': action}
+            update_data['phoneStatus'] = 'pending_migration' if action == 'migrate' else 'pending_fresh_start'
+            response_message += ' Your request to change your phone number has been submitted for approval.'
+            logging.info(f"User {uid} initiated phone change to {new_phone_stripped} with action '{action}'.")
+
     if not update_data:
         return jsonify({'message': 'No changes detected.'}), 200
 
     try:
+        # Commit all staged changes to Firestore
         user_ref.update(update_data)
         
+        # Also update Firebase Auth display name if it was changed
         if 'displayName' in update_data:
             auth.update_user(uid, display_name=update_data['displayName'])
         
+        # --- Create a Clean, JSON-Safe Response ---
         updated_user_doc = user_ref.get()
-        response_message = 'Profile updated successfully.'
-        if 'phoneStatus' in update_data:
-            response_message += ' Your request to change your phone number has been submitted for approval.'
+        final_user_data = updated_user_doc.to_dict()
+
+        # Convert datetime objects to strings
+        if 'createdAt' in final_user_data and isinstance(final_user_data['createdAt'], datetime):
+            final_user_data['createdAt'] = final_user_data['createdAt'].isoformat() + "Z"
         
+        # Do not send internal migration data to the frontend
+        if 'migration_data' in final_user_data:
+            del final_user_data['migration_data']
+
         return jsonify({
             'success': True, 
             'message': response_message,
-            'user': {'uid': uid, **updated_user_doc.to_dict()}
+            **final_user_data # Return the clean, flattened user object
         }), 200
         
     except Exception as e: