Update menu.py

menu.py

@@ -1,5 +1,6 @@
 from flask import Blueprint, render_template, request, session, jsonify, redirect, url_for
 import os
+import re
 from salesforce import get_salesforce_connection
 
 menu_blueprint = Blueprint('menu', __name__)
@@ -36,97 +37,150 @@ def get_valid_video_path(item_name, video_url=None):
 
 def fetch_menu_data(selected_category, user_email):
     """Common function to fetch and process menu data."""
-    # Fetch user referral and reward points
-    user_query = f"SELECT Referral__c, Reward_Points__c FROM Customer_Login__c WHERE Email__c = '{user_email}'"
-    user_result = sf.query(user_query)
-    if not user_result.get('records'):
-        return None, None, None, None
-
-    referral_code = user_result['records'][0].get('Referral__c', 'N/A')
-    reward_points = user_result['records'][0].get('Reward_Points__c', 0)
-
-    # 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)
-
-    # Fetch all Menu_Item__c records with required fields
-    menu_query = """
-        SELECT Name, Price__c, Description__c, Image1__c, Image2__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)
-    food_items = menu_result.get('records', [])
-
-    # 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', "Others")
-        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")
-        item['is_menu_item'] = True  # Flag to identify Menu_Item__c records
-
-    # Fetch all Custom_Dish__c records with only existing fields
-    custom_dish_query = """
-        SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
-               Veg_NonVeg__c, Section__c, Total_Ordered__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
-    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', "Customized dish")
-        item['Description__c'] = item.get('Description__c', "No description available")
-        item['is_menu_item'] = False  # Flag to identify Custom_Dish__c records
-
-    # Merge all items
-    all_items = food_items + custom_dishes
-    ordered_menu = {section: [] for section in SECTION_ORDER}
-
-    # 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"]]
-    elif selected_category == "Non veg":
-        best_sellers = [item for item in best_sellers if item.get("Veg_NonVeg__c") in ["Non veg", "both"]]
-    ordered_menu["Best Sellers"] = best_sellers[:4]
-
-    # Organize items into sections
-    added_item_names = set()
-    for item in all_items:
-        section = item['Section__c']
-        if section not in ordered_menu:
-            ordered_menu[section] = []
-
-        if item['Name'] in added_item_names:
-            continue
-
-        veg_nonveg = item.get("Veg_NonVeg__c", "both")
-        if selected_category == "Veg" and veg_nonveg not in ["Veg", "both"]:
-            continue
-        if selected_category == "Non veg" and veg_nonveg not in ["Non veg", "both"]:
-            continue
-
-        ordered_menu[section].append(item)
-        added_item_names.add(item['Name'])
-
-    # Remove empty sections
-    ordered_menu = {section: items for section, items in ordered_menu.items() if items}
-    return ordered_menu, referral_code, reward_points, cart_item_count
+    try:
+        # Fetch user referral and reward points
+        user_query = f"SELECT Referral__c, Reward_Points__c FROM Customer_Login__c WHERE Email__c = '{user_email}'"
+        user_result = sf.query(user_query)
+        if not user_result.get('records'):
+            return None, None, None, None, None, None
+
+        referral_code = user_result['records'][0].get('Referral__c', 'N/A')
+        reward_points = user_result['records'][0].get('Reward_Points__c', 0)
+
+        # 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)
+
+        # Fetch all Menu_Item__c records with required fields
+        menu_query = """
+            SELECT Name, Price__c, Description__c, Image1__c, Image2__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)
+        food_items = menu_result.get('records', [])
+
+        # 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', "Others")
+            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")
+            item['is_menu_item'] = True  # Flag to identify Menu_Item__c records
+
+        # Fetch all Custom_Dish__c records with only existing fields
+        custom_dish_query = """
+            SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
+                   Veg_NonVeg__c, Section__c, Total_Ordered__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
+        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', "Customized dish")
+            item['Description__c'] = item.get('Description__c', "No description available")
+            item['is_menu_item'] = False  # Flag to identify Custom_Dish__c records
+
+        # Merge all items
+        all_items = food_items + custom_dishes
+        ordered_menu = {section: [] for section in SECTION_ORDER}
+
+        # 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"]]
+        elif selected_category == "Non veg":
+            best_sellers = [item for item in best_sellers if item.get("Veg_NonVeg__c") in ["Non veg", "both"]]
+        elif selected_category == "Customized Dish":
+            best_sellers = [item for item in best_sellers if item.get("Section__c") == "Customized dish"]
+        ordered_menu["Best Sellers"] = best_sellers[:4]
+
+        # Organize items into sections
+        added_item_names = set()
+        for item in all_items:
+            section = item['Section__c']
+            if section not in ordered_menu:
+                ordered_menu[section] = []
+
+            if item['Name'] in added_item_names:
+                continue
+
+            veg_nonveg = item.get("Veg_NonVeg__c", "both")
+            if selected_category == "Veg" and veg_nonveg not in ["Veg", "both"]:
+                continue
+            if selected_category == "Non veg" and veg_nonveg not in ["Non veg", "both"]:
+                continue
+            if selected_category == "Customized Dish" and section != "Customized dish":
+                continue
+
+            ordered_menu[section].append(item)
+            added_item_names.add(item['Name'])
+
+        # Remove empty sections
+        ordered_menu = {section: items for section, items in ordered_menu.items() if items}
+
+        # Fetch past orders for add-on and instruction analysis
+        past_orders_query = f"""
+            SELECT Order_Details__c FROM Order__c
+            WHERE Customer_Email__c = '{user_email}'
+        """
+        past_orders_result = sf.query(past_orders_query)
+        past_orders = past_orders_result.get('records', [])
+
+        # Frequency analysis for add-ons and instructions
+        addon_counts = {}
+        instruction_counts = {}
+        for order in past_orders:
+            order_details = order.get('Order_Details__c', '').split('\n')
+            for line in order_details:
+                item_parts = line.split('|')
+                if len(item_parts) >= 5:
+                    addons = item_parts[1].strip().replace('Add-Ons:', '').split(', ')
+                    instructions = item_parts[2].strip().replace('Instructions:', '').split(', ')
+                    cleaned_addons = [re.sub(r"\s?\(\$\d+(\.\d{2})?\)", "", addon).strip() for addon in addons]
+                    for addon in cleaned_addons:
+                        individual_addons = addon.split(';')
+                        for individual_addon in individual_addons:
+                            individual_addon = individual_addon.strip()
+                            if individual_addon:
+                                addon_counts[individual_addon] = addon_counts.get(individual_addon, 0) + 1
+                    for instruction in instructions:
+                        instruction = instruction.strip()
+                        if instruction:
+                            instruction_counts[instruction] = instruction_counts.get(instruction, 0) + 1
+
+        # Get most common add-ons and instructions (top 3)
+        most_common_addons = sorted(addon_counts, key=addon_counts.get, reverse=True)[:3]
+        most_common_instructions = sorted(instruction_counts, key=instruction_counts.get, reverse=True)[:3]
+
+        return ordered_menu, referral_code, reward_points, cart_item_count, most_common_addons, most_common_instructions
+
+    except Exception as e:
+        print(f"Error fetching menu data: {str(e)}")
+        return None, None, None, None, [], []
 
 @menu_blueprint.route("/menu", methods=["GET", "POST"])
 def menu():
+    # Handle filter parameters
     selected_category = request.args.get("category", "All")
+    is_veg_only = request.args.get("veg") == 'on'
+
+    # Prioritize Customized Dish, then Veg, then All
+    if request.args.get("category") == "Customized Dish":
+        selected_category = "Customized Dish"
+    else:
+        selected_category = "Veg" if is_veg_only else "All"
+
     user_email = session.get('user_email')
 
     # Handle user authentication
@@ -144,11 +198,11 @@ def menu():
     first_letter = user_name[0].upper() if user_name else "A"
 
     # Fetch menu data
-    ordered_menu, referral_code, reward_points, cart_item_count = fetch_menu_data(selected_category, user_email)
+    ordered_menu, referral_code, reward_points, cart_item_count, most_common_addons, most_common_instructions = fetch_menu_data(selected_category, user_email)
     if ordered_menu is None:
         return redirect(url_for('login'))
 
-    categories = ["All", "Veg", "Non veg"]
+    categories = ["All", "Veg", "Non veg", "Customized Dish"]
 
     return render_template(
         "menu.html",
@@ -159,7 +213,9 @@ def menu():
         reward_points=reward_points,
         user_name=user_name,
         first_letter=first_letter,
-        cart_item_count=cart_item_count
+        cart_item_count=cart_item_count,
+        most_common_addons=[addon.strip() for addon in most_common_addons],
+        most_common_instructions=most_common_instructions
     )
 
 @menu_blueprint.route("/search", methods=["GET"])
@@ -174,7 +230,7 @@ def search():
     first_letter = user_name[0].upper() if user_name else "A"
 
     # Fetch menu data
-    ordered_menu, referral_code, reward_points, cart_item_count = fetch_menu_data(selected_category, user_email)
+    ordered_menu, referral_code, reward_points, cart_item_count, most_common_addons, most_common_instructions = fetch_menu_data(selected_category, user_email)
     if ordered_menu is None:
         return redirect(url_for('login'))
 
@@ -183,7 +239,9 @@ def search():
         ordered_menu=ordered_menu,
         user_name=user_name,
         first_letter=first_letter,
-        cart_item_count=cart_item_count
+        cart_item_count=cart_item_count,
+        most_common_addons=[addon.strip() for addon in most_common_addons],
+        most_common_instructions=most_common_instructions
     )
 
 @menu_blueprint.route('/api/addons', methods=['GET'])