Update menu.py

menu.py

@@ -24,19 +24,14 @@ def get_valid_video_path(item_name, video_url=None):
     Get valid video path for item with placeholder fallback
     Priority: 1. Video1__c from Salesforce 2. placeholder.mp4
     """
-    # First try: Video1__c from Salesforce if provided
     if video_url:
-        # If it's a complete URL (http/https)
         if video_url.startswith(('http://', 'https://')):
             return video_url
-        # If it's a relative path (/videos/xxx.mp4)
         elif video_url.startswith('/'):
             return video_url
-        # If it's a Salesforce File ID (starts with '069')
         elif video_url.startswith('069'):
             return f"https://biryanihub-dev-ed.develop.my.salesforce.com/sfc/servlet.shepherd/version/download/{video_url}"
     
-    # Final fallback: placeholder.mp4
     if not os.path.exists(PLACEHOLDER_PATH):
         with open(PLACEHOLDER_PATH, 'wb') as f:
             f.close()
@@ -78,42 +73,54 @@ def menu():
         cart_count_result = sf.query(cart_query)
         cart_item_count = cart_count_result.get('totalSize', 0)
 
-        # Fetch all Menu_Item__c records
+        # Fetch all Menu_Item__c records with additional fields
         menu_query = """
             SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
-                   Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c
+                   Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c,
+                   IngredientsInfo__c, NutritionalInfo__c, Allergens__c
             FROM Menu_Item__c
         """
-        menu_result = sf.query_all(menu_query)  # Use query_all to fetch all records
+        menu_result = sf.query_all(menu_query)  # Fetch all records
         food_items = menu_result.get('records', [])
 
-        # Process menu items and add video paths
+        # Process menu items
         for item in food_items:
             item['Total_Ordered__c'] = item.get('Total_Ordered__c', 0) or 0
             item['Video1__c'] = get_valid_video_path(item['Name'], item.get('Video1__c'))
-            item['Section__c'] = item.get('Section__c') or "Others"  # Default section
-
-        # Fetch all Custom_Dish__c records from the last 7 days
+            item['Section__c'] = item.get('Section__c', "Others")
+            # Default values for new fields if null
+            item['Description__c'] = item.get('Description__c', "No description available")
+            item['IngredientsInfo__c'] = item.get('IngredientsInfo__c', "Not specified")
+            item['NutritionalInfo__c'] = item.get('NutritionalInfo__c', "Not available")
+            item['Allergens__c'] = item.get('Allergens__c', "None listed")
+
+        # Fetch all Custom_Dish__c records with additional fields
         custom_dish_query = """
             SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
-                   Veg_NonVeg__c, Section__c, Total_Ordered__c
+                   Veg_NonVeg__c, Section__c, Total_Ordered__c,
+                   IngredientsInfo__c, NutritionalInfo__c, Allergens__c
             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', [])
 
-        # Process custom dishes and add video paths
+        # Process custom dishes
         for item in custom_dishes:
             item['Total_Ordered__c'] = item.get('Total_Ordered__c', 0) or 0
             item['Video1__c'] = get_valid_video_path(item['Name'])
-            item['Section__c'] = item.get('Section__c') or "Customized dish"  # Default section
+            item['Section__c'] = item.get('Section__c', "Customized dish")
+            # Default values for new fields if null
+            item['Description__c'] = item.get('Description__c', "No description available")
+            item['IngredientsInfo__c'] = item.get('IngredientsInfo__c', "Not specified")
+            item['NutritionalInfo__c'] = item.get('NutritionalInfo__c', "Not available")
+            item['Allergens__c'] = item.get('Allergens__c', "None listed")
 
         # Merge all items
         all_items = food_items + custom_dishes
         ordered_menu = {section: [] for section in SECTION_ORDER}
 
-        # Process best sellers (top 4 by Total_Ordered__c)
+        # Process best sellers
         best_sellers = sorted(all_items, key=lambda x: x['Total_Ordered__c'], reverse=True)
         if selected_category == "Veg":
             best_sellers = [item for item in best_sellers if item.get("Veg_NonVeg__c") in ["Veg", "both"]]
@@ -122,7 +129,7 @@ def menu():
         ordered_menu["Best Sellers"] = best_sellers[:4]
 
         # Organize items into sections
-        added_item_names = set()  # To avoid duplicates
+        added_item_names = set()
         for item in all_items:
             section = item['Section__c']
             if section not in ordered_menu:
@@ -131,7 +138,6 @@ def menu():
             if item['Name'] in added_item_names:
                 continue
 
-            # Apply category filter
             veg_nonveg = item.get("Veg_NonVeg__c", "both")
             if selected_category == "Veg" and veg_nonveg not in ["Veg", "both"]:
                 continue
@@ -147,13 +153,13 @@ def menu():
 
     except Exception as e:
         print(f"Error fetching menu data: {str(e)}")
-        # Fallback data
+        # Fallback data with all required fields
         ordered_menu = {section: [] for section in SECTION_ORDER}
         best_sellers = [
-            {"Name": "Chicken Biryani", "Price__c": 12.99, "Description__c": "Popular Chicken Biryani", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Chicken Biryani"), "Total_Ordered__c": 100, "Veg_NonVeg__c": "Non veg", "Section__c": "Best Sellers"},
-            {"Name": "Paneer Butter Masala", "Price__c": 11.99, "Description__c": "Popular Paneer Butter Masala", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Paneer Butter Masala"), "Total_Ordered__c": 90, "Veg_NonVeg__c": "Veg", "Section__c": "Best Sellers"},
-            {"Name": "Veg Manchurian", "Price__c": 9.99, "Description__c": "Popular Veg Manchurian", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Veg Manchurian"), "Total_Ordered__c": 80, "Veg_NonVeg__c": "Veg", "Section__c": "Best Sellers"},
-            {"Name": "Prawn Fry", "Price__c": 14.99, "Description__c": "Popular Prawn Fry", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Prawn Fry"), "Total_Ordered__c": 70, "Veg_NonVeg__c": "Non veg", "Section__c": "Best Sellers"}
+            {"Name": "Chicken Biryani", "Price__c": 12.99, "Description__c": "Spicy chicken with rice", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Chicken Biryani"), "Total_Ordered__c": 100, "Veg_NonVeg__c": "Non veg", "Section__c": "Best Sellers", "IngredientsInfo__c": "Chicken, rice, spices", "NutritionalInfo__c": "600 cal, 30g protein", "Allergens__c": "None"},
+            {"Name": "Paneer Butter Masala", "Price__c": 11.99, "Description__c": "Creamy paneer curry", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Paneer Butter Masala"), "Total_Ordered__c": 90, "Veg_NonVeg__c": "Veg", "Section__c": "Best Sellers", "IngredientsInfo__c": "Paneer, cream, tomatoes", "NutritionalInfo__c": "700 cal, 20g protein", "Allergens__c": "Dairy"},
+            {"Name": "Veg Manchurian", "Price__c": 9.99, "Description__c": "Indo-Chinese veggie dish", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Veg Manchurian"), "Total_Ordered__c": 80, "Veg_NonVeg__c": "Veg", "Section__c": "Best Sellers", "IngredientsInfo__c": "Vegetables, soy sauce", "NutritionalInfo__c": "400 cal, 10g protein", "Allergens__c": "Soy"},
+            {"Name": "Prawn Fry", "Price__c": 14.99, "Description__c": "Crispy fried prawns", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Prawn Fry"), "Total_Ordered__c": 70, "Veg_NonVeg__c": "Non veg", "Section__c": "Best Sellers", "IngredientsInfo__c": "Prawns, spices", "NutritionalInfo__c": "500 cal, 25g protein", "Allergens__c": "Shellfish"}
         ]
         ordered_menu["Best Sellers"] = best_sellers
         categories = ["All", "Veg", "Non veg"]
@@ -229,7 +235,6 @@ def add_to_cart():
         if not item_name or not item_price or not customer_email:
             return jsonify({"success": False, "error": "Item name, price, and user email are required."}), 400
 
-        # Check if item already exists in cart
         query = f"""
             SELECT Id, Quantity__c, Add_Ons__c, Add_Ons_Price__c, Instructions__c, Price__c
             FROM Cart_Item__c
@@ -242,7 +247,6 @@ def add_to_cart():
         new_addons = "; ".join([f"{addon['name']} (${addon['price']})" for addon in addons]) if addons else "None"
 
         if cart_items:
-            # Update existing cart item
             cart_item = cart_items[0]
             cart_item_id = cart_item['Id']
             existing_quantity = int(cart_item.get('Quantity__c', 0))
@@ -275,7 +279,6 @@ def add_to_cart():
                 "Section__c": section
             })
         else:
-            # Create new cart item
             total_price = item_price * quantity + addons_price
             sf.Cart_Item__c.create({
                 "Name": item_name,