Update menu.py

menu.py

@@ -1,13 +1,7 @@
 from flask import Blueprint, render_template, request, session, jsonify, redirect, url_for
 import os
-import base64
-import logging
 from salesforce import get_salesforce_connection
 
-# Configure logging
-logging.basicConfig(level=logging.DEBUG)
-logger = logging.getLogger(__name__)
-
 menu_blueprint = Blueprint('menu', __name__)
 
 # Initialize Salesforce connection
@@ -23,7 +17,7 @@ SECTION_ORDER = ["Best Sellers", "Starters", "Biryanis", "Curries", "Breads", "C
 if not os.path.exists(PLACEHOLDER_PATH):
     with open(PLACEHOLDER_PATH, 'wb') as f:
         f.close()
-    logger.info(f"Created placeholder video at {PLACEHOLDER_PATH}")
+    print(f"Created placeholder video at {PLACEHOLDER_PATH}")
 
 def get_valid_video_path(item_name, video_url=None):
     """Get valid video path for item with placeholder fallback."""
@@ -37,73 +31,24 @@ def get_valid_video_path(item_name, video_url=None):
     if not os.path.exists(PLACEHOLDER_PATH):
         with open(PLACEHOLDER_PATH, 'wb') as f:
             f.close()
-        logger.info(f"Created missing placeholder video at {PLACEHOLDER_PATH}")
+        print(f"Created missing placeholder video at {PLACEHOLDER_PATH}")
     return f"/static/{PLACEHOLDER_VIDEO}"
 
-@menu_blueprint.route("/menu", methods=["GET", "POST"])
-def menu():
-    selected_category = request.args.get("category", "All")
-    highlight_item = request.args.get("highlight")  # Get item to highlight from query parameter
-    user_email = session.get('user_email')
-
-    # Handle user authentication
-    if not user_email:
-        user_email = request.args.get("email")
-        user_name = request.args.get("name")
-        if user_email and user_name:
-            session['user_email'] = user_email
-            session['user_name'] = user_name
-        else:
-            return redirect(url_for("login"))
-    else:
-        user_name = session.get('user_name')
-
-    first_letter = user_name[0].upper() if user_name else "A"
-    user_image = session.get('user_image')
-
-    # 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}'"
-
+def fetch_menu_data(selected_category, user_email):
+    """Common function to fetch and process menu data."""
     # Fetch user referral and reward points
-    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)
+    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
 
-    # 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']
+    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}'"
-    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
+    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 = """
@@ -112,12 +57,8 @@ def menu():
                IngredientsInfo__c, NutritionalInfo__c, Allergens__c
         FROM Menu_Item__c
     """
-    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 = []
+    menu_result = sf.query_all(menu_query)
+    food_items = menu_result.get('records', [])
 
     # Process menu items
     for item in food_items:
@@ -128,7 +69,7 @@ def menu():
         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
+        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 = """
@@ -137,12 +78,8 @@ def menu():
         FROM Custom_Dish__c
         WHERE CreatedDate >= LAST_N_DAYS:7
     """
-    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 = []
+    custom_dish_result = sf.query_all(custom_dish_query)
+    custom_dishes = custom_dish_result.get('records', [])
 
     # Process custom dishes
     for item in custom_dishes:
@@ -150,7 +87,7 @@ def menu():
         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
+        item['is_menu_item'] = False  # Flag to identify Custom_Dish__c records
 
     # Merge all items
     all_items = food_items + custom_dishes
@@ -185,6 +122,32 @@ def menu():
 
     # 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
+
+@menu_blueprint.route("/menu", methods=["GET", "POST"])
+def menu():
+    selected_category = request.args.get("category", "All")
+    user_email = session.get('user_email')
+
+    # Handle user authentication
+    if not user_email:
+        user_email = request.args.get("email")
+        user_name = request.args.get("name")
+        if user_email and user_name:
+            session['user_email'] = user_email
+            session['user_name'] = user_name
+        else:
+            return redirect(url_for("login"))
+    else:
+        user_name = session.get('user_name')
+
+    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)
+    if ordered_menu is None:
+        return redirect(url_for('login'))
+
     categories = ["All", "Veg", "Non veg"]
 
     return render_template(
@@ -196,181 +159,33 @@ def menu():
         reward_points=reward_points,
         user_name=user_name,
         first_letter=first_letter,
-        cart_item_count=cart_item_count,
-        user_image=user_image,
-        user_id=user_id,
-        highlight_item=highlight_item  # Pass the item to highlight to the template
+        cart_item_count=cart_item_count
     )
 
-@menu_blueprint.route('/search', methods=['GET'])
+@menu_blueprint.route("/search", methods=["GET"])
 def search():
+    selected_category = request.args.get("category", "All")
     user_email = session.get('user_email')
+
+    # Handle user authentication
     if not user_email:
         return redirect(url_for("login"))
-
     user_name = session.get('user_name')
     first_letter = user_name[0].upper() if user_name else "A"
-    user_image = session.get('user_image')
-
-    # Get cart item count
-    cart_query = f"SELECT COUNT() FROM Cart_Item__c WHERE Customer_Email__c = '{user_email}'"
-    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 = """
-        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
-    """
-    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 = []
-
-    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
 
-    # Fetch all Custom_Dish__c records
-    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
-    """
-    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 = []
-
-    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
-
-    all_items = food_items + custom_dishes
+    # Fetch menu data
+    ordered_menu, referral_code, reward_points, cart_item_count = fetch_menu_data(selected_category, user_email)
+    if ordered_menu is None:
+        return redirect(url_for('login'))
 
     return render_template(
         "search.html",
-        all_items=all_items,
+        ordered_menu=ordered_menu,
         user_name=user_name,
         first_letter=first_letter,
-        cart_item_count=cart_item_count,
-        user_image=user_image
+        cart_item_count=cart_item_count
     )
 
-@menu_blueprint.route('/upload_avatar', methods=['POST'])
-def upload_avatar():
-    try:
-        data = request.get_json()
-        if not data or 'image' not in data:
-            logger.error("No image data provided in request")
-            return jsonify({'success': False, 'error': 'No image data provided'}), 400
-
-        image_data = data['image']
-        logger.debug(f"Received image data with length: {len(image_data)}")
-
-        # Validate base64 image
-        if not image_data.startswith('data:image/'):
-            logger.error("Invalid image format: does not start with 'data:image/'")
-            return jsonify({'success': False, 'error': 'Invalid image format'}), 400
-
-        # Check size limit (~1.5MB for base64, roughly 1MB actual image)
-        if len(image_data) > 2_000_000:
-            logger.error(f"Image too large: {len(image_data)} characters (max 2,000,000)")
-            return jsonify({'success': False, 'error': 'Image too large (max ~1.5MB)'}), 400
-
-        # Validate base64 decoding
-        try:
-            base64_string = image_data.split(',')[1]
-            base64.b64decode(base64_string)
-        except Exception as e:
-            logger.error(f"Invalid base64 data: {str(e)}")
-            return jsonify({'success': False, 'error': 'Invalid base64 data'}), 400
-
-        # Store in session
-        session['user_image'] = image_data
-        logger.info("Image stored in session successfully")
-
-        # Store in Salesforce (if Avatar__c field exists)
-        user_email = session.get('user_email')
-        if user_email:
-            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']
-                    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:
-                logger.error(f"Failed to store image in Salesforce: {str(e)}")
-
-        return jsonify({'success': True, 'image': image_data})
-
-    except Exception as e:
-        logger.error(f"Error in upload_avatar: {str(e)}", exc_info=True)
-        return jsonify({'success': False, 'error': f'Server error: {str(e)}'}), 500
-
-@menu_blueprint.route('/delete_avatar', methods=['POST'])
-def delete_avatar():
-    try:
-        user_email = session.get('user_email')
-        if not user_email:
-            logger.error("No user email in session")
-            return jsonify({'success': False, 'error': 'User not authenticated'}), 401
-
-        if 'user_image' in session:
-            session.pop('user_image', None)
-            logger.info("Image removed from session")
-
-        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']
-                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:
-            logger.error(f"Failed to remove image from Salesforce: {str(e)}")
-
-        return jsonify({'success': True})
-
-    except Exception as e:
-        logger.error(f"Error in delete_avatar: {str(e)}", exc_info=True)
-        return jsonify({'success': False, 'error': f'Server error: {str(e)}'}), 500
-
 @menu_blueprint.route('/api/addons', methods=['GET'])
 def get_addons():
     item_name = request.args.get('item_name')
@@ -407,7 +222,7 @@ def get_addons():
         return jsonify({"success": True, "addons": formatted_addons})
 
     except Exception as e:
-        logger.error(f"Error fetching addons: {str(e)}")
+        print(f"Error fetching addons: {str(e)}")
         return jsonify({"success": False, "error": "An error occurred while fetching customization options."}), 500
 
 @menu_blueprint.route('/cart/add', methods=['POST'])
@@ -425,13 +240,8 @@ def add_to_cart():
         customer_email = session.get('user_email')
 
         if not item_name or not item_price or not customer_email:
-            logger.error(f"Missing required fields: item_name={item_name}, item_price={item_price}, customer_email={customer_email}")
             return jsonify({"success": False, "error": "Item name, price, and user email are required."}), 400
 
-        # Sanitize inputs to prevent SOQL injection
-        item_name = item_name.replace("'", "''")
-        customer_email = customer_email.replace("'", "''")
-
         query = f"""
             SELECT Id, Quantity__c, Add_Ons__c, Add_Ons_Price__c, Instructions__c, Price__c
             FROM Cart_Item__c
@@ -457,7 +267,7 @@ def add_to_cart():
 
             combined_instructions = existing_instructions
             if instructions:
-                combined_instructions = f"{combined_instructions} | {instructions}".strip(" | ")
+                combined_instructions = f"{existing_instructions} | {instructions}".strip(" | ")
 
             combined_addons_list = combined_addons.split("; ")
             combined_addons_price = sum(
@@ -496,14 +306,10 @@ def add_to_cart():
         cart_result = sf.query_all(cart_query)
         cart = [{"itemName": item["Name"], "quantity": item["Quantity__c"]} for item in cart_result.get("records", [])]
         
-        logger.info(f"Item '{item_name}' added to cart for {customer_email}")
         return jsonify({"success": True, "message": "Item added to cart successfully.", "cart": cart})
 
     except ValueError as e:
-        logger.error(f"Invalid data format: {str(e)}")
         return jsonify({"success": False, "error": f"Invalid data format: {str(e)}"}), 400
     except Exception as e:
-        logger.error(f"Error adding item to cart: {str(e)}", exc_info=True)
-        return jsonify({"success": False, "error": f"An error occurred while adding the item to the cart: {str(e)}"}), 500
-
-# Note: Ensure 'login' route exists in your app or adjust redirect accordingly
+        print(f"Error adding item to cart: {str(e)}")
+        return jsonify({"success": False, "error": "An error occurred while adding the item to the cart."}), 500