Update menu.py

menu.py

@@ -60,26 +60,49 @@ def menu():
     first_letter = user_name[0].upper() if user_name else "A"
     user_image = session.get('user_image')  # Add avatar image from session
 
+    # Check if Avatar__c field exists on Customer_Login__c
+    try:
+        describe_result = sf.Customer_Login__c.describe()
+        fields = [field['name'] for field in describe_result['fields']]
+        avatar_field_exists = 'Avatar__c' in fields
+    except Exception as e:
+        logger.error(f"Error describing Customer_Login__c object: {str(e)}")
+        avatar_field_exists = False
+
+    # Build the SOQL query dynamically based on field availability
+    query_fields = ["Id", "Referral__c", "Reward_Points__c"]
+    if avatar_field_exists:
+        query_fields.append("Avatar__c")
+    user_query = f"SELECT {', '.join(query_fields)} FROM Customer_Login__c WHERE Email__c = '{user_email}'"
+
     # Fetch user referral and reward points
-    user_query = f"SELECT Id, Referral__c, Reward_Points__c, Avatar__c FROM Customer_Login__c WHERE Email__c = '{user_email}'"
-    user_result = sf.query(user_query)
-    if not user_result.get('records'):
-        return redirect(url_for('login'))
+    try:
+        user_result = sf.query(user_query)
+        if not user_result.get('records'):
+            logger.warning(f"No user found with email: {user_email}")
+            return redirect(url_for('login'))
+    except Exception as e:
+        logger.error(f"Error querying user data: {str(e)}")
+        return jsonify({"success": False, "error": "Failed to fetch user data from Salesforce"}), 500
 
     user_record = user_result['records'][0]
     user_id = user_record['Id']
     referral_code = user_record.get('Referral__c', 'N/A')
     reward_points = user_record.get('Reward_Points__c', 0)
 
-    # If no session image, check Salesforce for stored avatar
-    if not user_image and user_record.get('Avatar__c'):
+    # If no session image, check Salesforce for stored avatar (if field exists)
+    if not user_image and avatar_field_exists and user_record.get('Avatar__c'):
         session['user_image'] = user_record['Avatar__c']
         user_image = session['user_image']
 
     # Get cart item count
     cart_query = f"SELECT COUNT() FROM Cart_Item__c WHERE Customer_Email__c = '{user_email}'"
-    cart_count_result = sf.query(cart_query)
-    cart_item_count = cart_count_result.get('totalSize', 0)
+    try:
+        cart_count_result = sf.query(cart_query)
+        cart_item_count = cart_count_result.get('totalSize', 0)
+    except Exception as e:
+        logger.error(f"Error fetching cart item count: {str(e)}")
+        cart_item_count = 0
 
     # Fetch all Menu_Item__c records with required fields
     menu_query = """
@@ -88,8 +111,12 @@ def menu():
                IngredientsInfo__c, NutritionalInfo__c, Allergens__c
         FROM Menu_Item__c
     """
-    menu_result = sf.query_all(menu_query)
-    food_items = menu_result.get('records', [])
+    try:
+        menu_result = sf.query_all(menu_query)
+        food_items = menu_result.get('records', [])
+    except Exception as e:
+        logger.error(f"Error fetching menu items: {str(e)}")
+        food_items = []
 
     # Process menu items
     for item in food_items:
@@ -109,8 +136,12 @@ def menu():
         FROM Custom_Dish__c
         WHERE CreatedDate >= LAST_N_DAYS:7
     """
-    custom_dish_result = sf.query_all(custom_dish_query)
-    custom_dishes = custom_dish_result.get('records', [])
+    try:
+        custom_dish_result = sf.query_all(custom_dish_query)
+        custom_dishes = custom_dish_result.get('records', [])
+    except Exception as e:
+        logger.error(f"Error fetching custom dishes: {str(e)}")
+        custom_dishes = []
 
     # Process custom dishes
     for item in custom_dishes:
@@ -203,7 +234,7 @@ def upload_avatar():
         session['user_image'] = image_data
         logger.info("Image stored in session successfully")
 
-        # Store in Salesforce (optional, for persistence)
+        # Store in Salesforce (if Avatar__c field exists)
         user_email = session.get('user_email')
         if user_email:
             try:
@@ -211,8 +242,14 @@ def upload_avatar():
                 user_result = sf.query(user_query)
                 if user_result.get('records'):
                     user_id = user_result['records'][0]['Id']
-                    sf.Customer_Login__c.update(user_id, {'Avatar__c': image_data})
-                    logger.info(f"Image stored in Salesforce for user {user_email}")
+                    # Check if Avatar__c field exists before updating
+                    describe_result = sf.Customer_Login__c.describe()
+                    fields = [field['name'] for field in describe_result['fields']]
+                    if 'Avatar__c' in fields:
+                        sf.Customer_Login__c.update(user_id, {'Avatar__c': image_data})
+                        logger.info(f"Image stored in Salesforce for user {user_email}")
+                    else:
+                        logger.warning("Avatar__c field does not exist; skipping Salesforce update")
                 else:
                     logger.warning(f"User not found in Salesforce: {user_email}")
             except Exception as e:
@@ -238,14 +275,20 @@ def delete_avatar():
             session.pop('user_image', None)
             logger.info("Image removed from session")
 
-        # Remove from Salesforce
+        # Remove from Salesforce (if Avatar__c field exists)
         try:
             user_query = f"SELECT Id FROM Customer_Login__c WHERE Email__c = '{user_email}'"
             user_result = sf.query(user_query)
             if user_result.get('records'):
                 user_id = user_result['records'][0]['Id']
-                sf.Customer_Login__c.update(user_id, {'Avatar__c': None})
-                logger.info(f"Image removed from Salesforce for user {user_email}")
+                # Check if Avatar__c field exists before updating
+                describe_result = sf.Customer_Login__c.describe()
+                fields = [field['name'] for field in describe_result['fields']]
+                if 'Avatar__c' in fields:
+                    sf.Customer_Login__c.update(user_id, {'Avatar__c': None})
+                    logger.info(f"Image removed from Salesforce for user {user_email}")
+                else:
+                    logger.warning("Avatar__c field does not exist; skipping Salesforce update")
             else:
                 logger.warning(f"User not found in Salesforce: {user_email}")
         except Exception as e: