Update utility_tunasonga.py

utility_tunasonga.py

@@ -111,67 +111,49 @@ def get_user_by_phone(phone_number: str, app_instance: Any) -> Optional[Dict[str
     try:
         users_ref = db.reference('users', app=app_instance)
         
-        # DEBUG: Get all users to see what phone numbers exist
-        all_users = users_ref.get()
-        if all_users:
-            logger.info("=== DEBUG: All phone numbers in database ===")
-            for uid, user_data in all_users.items():
-                if isinstance(user_data, dict) and 'phone_number' in user_data:
-                    stored_phone = user_data['phone_number']
-                    logger.info(f"User {uid}: phone_number = '{stored_phone}' (type: {type(stored_phone)})")
-            logger.info("=== END DEBUG ===")
-        
         # Normalize the input phone number by removing '+' if present
         normalized_input = phone_number.lstrip('+')
-        logger.info(f"Input phone: '{phone_number}' -> Normalized: '{normalized_input}'")
         
-        # First, try with '+' prefix since your database stores numbers with '+'
-        # This handles the case where database stores "+263..." and WhatsApp sends "263..."
-        prefixed_number = '+' + normalized_input
-        logger.info(f"Trying query 1 with: '{prefixed_number}' (len={len(prefixed_number)})")
-        query = users_ref.order_by_child('phone_number').equal_to(prefixed_number).limit_to_first(1)
-        snapshot = query.get()
-        logger.info(f"Query 1 result: {snapshot}")
-        logger.info(f"Query 1 result type: {type(snapshot)}, bool: {bool(snapshot)}")
+        # Create possible phone number variations to search for
+        search_variations = [
+            '+' + normalized_input,  # 
+            normalized_input,        # 
+            phone_number            # Original input
+        ]
+        
+        # Remove duplicates while preserving order
+        unique_variations = []
+        for variation in search_variations:
+            if variation not in unique_variations:
+                unique_variations.append(variation)
         
-        # Let's also try a manual search to see if Firebase indexing is the issue
-        logger.info("=== Manual search through all users ===")
+        logger.info(f"Searching for phone variations: {unique_variations}")
+        
+        # Try Firebase queries first (in case indexing gets fixed later)
+        for variation in unique_variations:
+            try:
+                query = users_ref.order_by_child('phone_number').equal_to(variation).limit_to_first(1)
+                snapshot = query.get()
+                if snapshot:
+                    for user_uid, user_data in snapshot.items():
+                        if isinstance(user_data, dict):
+                            user_data['uid'] = user_uid
+                            logger.info(f"User found via Firebase query for phone {phone_number}: UID {user_uid}")
+                            return user_data
+            except Exception as query_error:
+                logger.warning(f"Firebase query failed for '{variation}': {query_error}")
+        
+        # Fallback to manual search if queries fail (due to indexing issues)
+        logger.info("Firebase queries failed, falling back to manual search...")
         all_users = users_ref.get()
         if all_users:
             for uid, user_data in all_users.items():
                 if isinstance(user_data, dict) and 'phone_number' in user_data:
                     stored_phone = user_data['phone_number']
-                    if stored_phone == prefixed_number:
-                        logger.info(f"MANUAL MATCH FOUND! User {uid} has phone '{stored_phone}' matching '{prefixed_number}'")
-                        # Return this user manually
+                    if stored_phone in unique_variations:
+                        logger.info(f"User found via manual search for phone {phone_number}: UID {uid}")
                         user_data['uid'] = uid
                         return user_data
-        logger.info("=== End manual search ===")
-        
-        # If not found, try without '+' prefix
-        # This handles the case where database might store "263..." but input has "+"
-        if not snapshot:
-            logger.info(f"Trying query 2 with: '{normalized_input}'")
-            query = users_ref.order_by_child('phone_number').equal_to(normalized_input).limit_to_first(1)
-            snapshot = query.get()
-            logger.info(f"Query 2 result: {snapshot}")
-        
-        # If still not found, try the original input as-is
-        # This is a fallback in case there are other formatting differences
-        if not snapshot and phone_number != normalized_input and phone_number != prefixed_number:
-            logger.info(f"Trying query 3 with original: '{phone_number}'")
-            query = users_ref.order_by_child('phone_number').equal_to(phone_number).limit_to_first(1)
-            snapshot = query.get()
-            logger.info(f"Query 3 result: {snapshot}")
-
-        if snapshot:
-            for user_uid, user_data in snapshot.items():
-                if isinstance(user_data, dict): 
-                    user_data['uid'] = user_uid 
-                    logger.info(f"User found for phone {phone_number}: UID {user_uid}")
-                    return user_data
-                else:
-                    logger.warning(f"User data for phone {phone_number} (UID {user_uid}) is not a dictionary: {user_data}")
         
         logger.info(f"No user found for phone number: {phone_number}")
         return None
@@ -182,7 +164,7 @@ def get_user_by_phone(phone_number: str, app_instance: Any) -> Optional[Dict[str
     except Exception as e:
         logger.error(f"Unexpected error fetching user by phone {phone_number}: {e}")
         return None
-
+        
 def format_listings_for_whatsapp(listings_data: Dict[str, Any], list_type_description: str = "items") -> str:
     if not listings_data:
         return f"You currently have no active {list_type_description}."