Update menu.py

menu.py

@@ -23,14 +23,19 @@ 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://yourdomain.my.salesforce.com/sfc/servlet.shepherd/version/download/{video_url}"
     
+    # Final fallback: placeholder.mp4
     if not os.path.exists(PLACEHOLDER_PATH):
         open(PLACEHOLDER_PATH, 'wb').close()
         print(f"Created missing placeholder video at {PLACEHOLDER_PATH}")
@@ -72,11 +77,10 @@ def menu():
         cart_count_result = sf.query(cart_query)
         cart_item_count = cart_count_result['totalSize']
 
-        # Query to fetch Menu_Item__c records including additional fields
+        # Query to fetch Menu_Item__c records including Ingredients__c
         menu_query = """
-            SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
-                   Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c,
-                   All_Ingredients__c, Allergen__c, Nutritional_Information__c
+            SELECT Name, Price__c, Description__c, Ingredients__c, Image1__c, Image2__c, 
+                   Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c
             FROM Menu_Item__c
         """
         result = sf.query(menu_query)
@@ -87,16 +91,14 @@ def menu():
             if 'Total_Ordered__c' not in item or item['Total_Ordered__c'] is None:
                 item['Total_Ordered__c'] = 0
             item['Video1__c'] = get_valid_video_path(item['Name'], item.get('Video1__c'))
-            # Ensure fields are present even if null
-            item['All_Ingredients__c'] = item.get('All_Ingredients__c', 'Not specified')
-            item['Allergen__c'] = item.get('Allergen__c', 'None')
-            item['Nutritional_Information__c'] = item.get('Nutritional_Information__c', 'Not available')
+            # Set default values for Ingredients__c and Description__c if null
+            item['Ingredients__c'] = item.get('Ingredients__c', 'Not specified')
+            item['Description__c'] = item.get('Description__c', 'No description available')
 
-        # Query to fetch Custom_Dish__c records including additional fields
+        # Query to fetch Custom_Dish__c records including Ingredients__c
         custom_dish_query = """
-            SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
-                   Veg_NonVeg__c, Section__c, Total_Ordered__c,
-                   All_Ingredients__c, Allergen__c, Nutritional_Information__c
+            SELECT Name, Price__c, Description__c, Ingredients__c, Image1__c, Image2__c, 
+                   Veg_NonVeg__c, Section__c, Total_Ordered__c
             FROM Custom_Dish__c
             WHERE CreatedDate >= LAST_N_DAYS:7
         """
@@ -108,9 +110,9 @@ def menu():
             if 'Total_Ordered__c' not in item or item['Total_Ordered__c'] is None:
                 item['Total_Ordered__c'] = 0
             item['Video1__c'] = get_valid_video_path(item['Name'])
-            item['All_Ingredients__c'] = item.get('All_Ingredients__c', 'Not specified')
-            item['Allergen__c'] = item.get('Allergen__c', 'None')
-            item['Nutritional_Information__c'] = item.get('Nutritional_Information__c', 'Not available')
+            # Set default values for Ingredients__c and Description__c if null
+            item['Ingredients__c'] = item.get('Ingredients__c', 'Not specified')
+            item['Description__c'] = item.get('Description__c', 'No description available')
 
         # Merge both Menu_Item__c and Custom_Dish__c records
         all_items = food_items + custom_dishes
@@ -151,19 +153,18 @@ def menu():
 
     except Exception as e:
         print(f"Error fetching menu data: {str(e)}")
+        # Fallback data with video support and Ingredients__c
         ordered_menu = {section: [] for section in SECTION_ORDER}
         best_sellers = ["Chicken Biryani", "Paneer Butter Masala", "Veg Manchurian", "Prawn Fry"]
         ordered_menu["Best Sellers"] = [{
             "Name": name,
             "Price__c": "12.99",
             "Description__c": f"Popular {name}",
+            "Ingredients__c": "Not specified",
             "Image1__c": "/static/placeholder.jpg",
             "Video1__c": get_valid_video_path(name),
             "Total_Ordered__c": 100,
-            "Veg_NonVeg__c": "Veg" if "Paneer" in name or "Veg" in name else "Non veg",
-            "All_Ingredients__c": "Not specified",
-            "Allergen__c": "None",
-            "Nutritional_Information__c": "Not available"
+            "Veg_NonVeg__c": "Veg" if "Paneer" in name or "Veg" in name else "Non veg"
         } for name in best_sellers]
         
         categories = ["All", "Veg", "Non veg"]
@@ -183,7 +184,6 @@ def menu():
         cart_item_count=cart_item_count
     )
 
-# Rest of the routes remain unchanged
 @menu_blueprint.route('/api/addons', methods=['GET'])
 def get_addons():
     item_name = request.args.get('item_name')