Update menu.py

menu.py

@@ -22,7 +22,7 @@ SECTION_ORDER = ["Best Sellers", "Starters", "Biryanis", "Curries", "Breads", "C
 # Create placeholder video at startup if it doesn't exist
 if not os.path.exists(PLACEHOLDER_PATH):
     with open(PLACEHOLDER_PATH, 'wb') as f:
-        f.write(b'')  # Create an empty placeholder file
+        f.close()
     logger.info(f"Created placeholder video at {PLACEHOLDER_PATH}")
 
 def get_valid_video_path(item_name, video_url=None):
@@ -36,7 +36,7 @@ def get_valid_video_path(item_name, video_url=None):
             return f"https://biryanihub-dev-ed.develop.my.salesforce.com/sfc/servlet.shepherd/version/download/{video_url}"
     if not os.path.exists(PLACEHOLDER_PATH):
         with open(PLACEHOLDER_PATH, 'wb') as f:
-            f.write(b'')  # Create an empty placeholder file
+            f.close()
         logger.info(f"Created missing placeholder video at {PLACEHOLDER_PATH}")
     return f"/static/{PLACEHOLDER_VIDEO}"
 
@@ -56,9 +56,9 @@ def menu():
         else:
             return redirect(url_for("login"))
     else:
-        user_name = session.get('user_name', 'Guest')
+        user_name = session.get('user_name')
 
-    first_letter = user_name[0].upper() if user_name and user_name != 'Guest' else "A"
+    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
@@ -74,7 +74,7 @@ def menu():
     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}' LIMIT 1"
+    user_query = f"SELECT {', '.join(query_fields)} FROM Customer_Login__c WHERE Email__c = '{user_email}'"
 
     # Fetch user referral and reward points
     try:
@@ -82,11 +82,11 @@ def menu():
         if not user_result.get('records'):
             logger.warning(f"No user found with email: {user_email}")
             return redirect(url_for('login'))
-        user_record = user_result['records'][0]
     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)
@@ -133,7 +133,7 @@ def menu():
     # 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, Ingredients__c
+               Veg_NonVeg__c, Section__c, Total_Ordered__c
         FROM Custom_Dish__c
         WHERE CreatedDate >= LAST_N_DAYS:7
     """
@@ -150,9 +150,6 @@ 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['IngredientsInfo__c'] = item.get('Ingredients__c', "Not specified")  # Map Ingredients__c to IngredientsInfo__c
-        item['NutritionalInfo__c'] = "Not available"  # Custom dishes may not have this
-        item['Allergens__c'] = "None listed"  # Default for custom dishes
         item['is_menu_item'] = False
 
     # Merge all items
@@ -160,7 +157,7 @@ def menu():
     ordered_menu = {section: [] for section in SECTION_ORDER}
 
     # Process best sellers
-    best_sellers = sorted(all_items, key=lambda x: x.get('Total_Ordered__c', 0), reverse=True)
+    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":
@@ -202,7 +199,7 @@ def menu():
         cart_item_count=cart_item_count,
         user_image=user_image,
         user_id=user_id,
-        highlight_item=highlight_item
+        highlight_item=highlight_item  # Pass the item to highlight to the template
     )
 
 @menu_blueprint.route('/search', methods=['GET'])
@@ -211,8 +208,8 @@ def search():
     if not user_email:
         return redirect(url_for("login"))
 
-    user_name = session.get('user_name', 'Guest')
-    first_letter = user_name[0].upper() if user_name and user_name != 'Guest' else "A"
+    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
@@ -251,7 +248,7 @@ def search():
     # 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, Ingredients__c
+               Veg_NonVeg__c, Section__c, Total_Ordered__c
         FROM Custom_Dish__c
         WHERE CreatedDate >= LAST_N_DAYS:7
     """
@@ -267,9 +264,6 @@ def search():
         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['IngredientsInfo__c'] = item.get('Ingredients__c', "Not specified")  # Map Ingredients__c to IngredientsInfo__c
-        item['NutritionalInfo__c'] = "Not available"  # Custom dishes may not have this
-        item['Allergens__c'] = "None listed"  # Default for custom dishes
         item['is_menu_item'] = False
 
     all_items = food_items + custom_dishes
@@ -320,7 +314,7 @@ def upload_avatar():
         user_email = session.get('user_email')
         if user_email:
             try:
-                user_query = f"SELECT Id FROM Customer_Login__c WHERE Email__c = '{user_email}' LIMIT 1"
+                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']
@@ -355,7 +349,7 @@ def delete_avatar():
             logger.info("Image removed from session")
 
         try:
-            user_query = f"SELECT Id FROM Customer_Login__c WHERE Email__c = '{user_email}' LIMIT 1"
+            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']
@@ -389,7 +383,7 @@ def get_addons():
         query = f"""
             SELECT Name, Customization_Type__c, Options__c, Max_Selections__c, Extra_Charge__c, Extra_Charge_Amount__c
             FROM Customization_Options__c
-            WHERE Section__c = '{item_section}' LIMIT 100
+            WHERE Section__c = '{item_section}'
         """
         result = sf.query_all(query)
         addons = result.get('records', [])
@@ -400,14 +394,14 @@ def get_addons():
         formatted_addons = []
         for addon in addons:
             options = addon.get("Options__c", "")
-            options = [opt.strip() for opt in options.split(",")] if options else []
+            options = options.split(", ") if options else []
             formatted_addons.append({
                 "name": addon.get("Name", ""),
                 "type": addon.get("Customization_Type__c", ""),
                 "options": options,
-                "max_selections": int(addon.get("Max_Selections__c", 1)),
-                "extra_charge": bool(addon.get("Extra_Charge__c", False)),
-                "extra_charge_amount": float(addon.get("Extra_Charge_Amount__c", 0))
+                "max_selections": addon.get("Max_Selections__c", 1),
+                "extra_charge": addon.get("Extra_Charge__c", False),
+                "extra_charge_amount": addon.get("Extra_Charge_Amount__c", 0)
             })
 
         return jsonify({"success": True, "addons": formatted_addons})
@@ -420,10 +414,6 @@ def get_addons():
 def add_to_cart():
     try:
         data = request.json
-        if not data:
-            logger.error("No data provided in request")
-            return jsonify({"success": False, "error": "No data provided"}), 400
-
         item_name = data.get('itemName', '').strip()
         item_price = float(data.get('itemPrice', 0))
         item_image = data.get('itemImage', '')
@@ -441,19 +431,17 @@ def add_to_cart():
         # Sanitize inputs to prevent SOQL injection
         item_name = item_name.replace("'", "''")
         customer_email = customer_email.replace("'", "''")
-        instructions = instructions.replace("'", "''")
 
         query = f"""
             SELECT Id, Quantity__c, Add_Ons__c, Add_Ons_Price__c, Instructions__c, Price__c
             FROM Cart_Item__c
             WHERE Customer_Email__c = '{customer_email}' AND Name = '{item_name}'
-            LIMIT 1
         """
         result = sf.query(query)
         cart_items = result.get("records", [])
 
-        addons_price = sum(float(addon.get('price', 0)) for addon in addons if isinstance(addon.get('price'), (int, float)))
-        new_addons = "; ".join([f"{addon['name']} (${addon['price']})" for addon in addons if 'name' in addon and 'price' in addon]) if addons else "None"
+        addons_price = sum(float(addon.get('price', 0)) for addon in addons)
+        new_addons = "; ".join([f"{addon['name']} (${addon['price']})" for addon in addons]) if addons else "None"
 
         if cart_items:
             cart_item = cart_items[0]
@@ -471,8 +459,10 @@ def add_to_cart():
             if instructions:
                 combined_instructions = f"{combined_instructions} | {instructions}".strip(" | ")
 
-            combined_addons_list = [addon for addon in combined_addons.split("; ") if addon]
-            combined_addons_price = sum(float(addon.split("($")[1][:-1]) for addon in combined_addons_list if "($" in addon)
+            combined_addons_list = combined_addons.split("; ")
+            combined_addons_price = sum(
+                float(addon.split("($")[1][:-1]) for addon in combined_addons_list if "($" in addon
+            )
 
             total_price = (existing_quantity + quantity) * item_price + combined_addons_price
 
@@ -504,7 +494,7 @@ def add_to_cart():
         # Fetch updated cart for UI update
         cart_query = f"SELECT Name, Quantity__c FROM Cart_Item__c WHERE Customer_Email__c = '{customer_email}'"
         cart_result = sf.query_all(cart_query)
-        cart = [{"itemName": item["Name"], "quantity": int(item["Quantity__c"])} for item in cart_result.get("records", [])]
+        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})
@@ -516,60 +506,4 @@ def add_to_cart():
         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
 
-@menu_blueprint.route('/customdish/generate_custom_dish', methods=['POST'])
-def generate_custom_dish():
-    try:
-        # Get data from the request
-        data = request.form
-        name = data.get('name', '').strip()
-        ingredients = data.get('ingredients', '').strip()
-        description = data.get('description', '').strip()
-        price = float(data.get('price', 0))
-
-        # Validate inputs
-        if not all([name, ingredients, description]) or price <= 0:
-            logger.error(f"Invalid custom dish data: name={name}, ingredients={ingredients}, description={description}, price={price}")
-            return jsonify({"success": False, "error": "All fields are required and price must be positive."}), 400
-
-        # Sanitize inputs to prevent SOQL injection
-        name = name.replace("'", "''")
-        ingredients = ingredients.replace("'", "''")
-        description = description.replace("'", "''")
-
-        # Get user information
-        customer_email = session.get('user_email')
-        if not customer_email:
-            logger.error("No user email in session")
-            return jsonify({"success": False, "error": "User not authenticated"}), 401
-
-        # Create custom dish in Salesforce
-        custom_dish_data = {
-            "Name": name,
-            "Price__c": price,
-            "Description__c": description,
-            "Ingredients__c": ingredients,
-            "Customer_Email__c": customer_email,
-            "Section__c": "Customized dish",
-            "Veg_NonVeg__c": data.get('veg_nonveg', 'Veg'),  # Allow frontend to specify
-            "Total_Ordered__c": 0
-        }
-
-        # Validate required Salesforce fields
-        required_fields = ['Name', 'Price__c', 'Description__c', 'Ingredients__c', 'Customer_Email__c', 'Section__c']
-        if not all(field in custom_dish_data for field in required_fields):
-            logger.error(f"Missing required fields in custom_dish_data: {custom_dish_data}")
-            return jsonify({"success": False, "error": "Missing required fields for custom dish creation"}), 400
-
-        sf.Custom_Dish__c.create(custom_dish_data)
-        logger.info(f"Custom dish '{name}' created for {customer_email}")
-
-        return jsonify({"success": True, "message": "Custom dish submitted successfully."})
-
-    except ValueError as e:
-        logger.error(f"Invalid data format in custom dish submission: {str(e)}")
-        return jsonify({"success": False, "error": f"Invalid data format: {str(e)}"}), 400
-    except Exception as e:
-        logger.error(f"Error creating custom dish: {str(e)}", exc_info=True)
-        return jsonify({"success": False, "error": f"Server error: {str(e)}. Data saved locally on client."}), 500
-
 # Note: Ensure 'login' route exists in your app or adjust redirect accordingly