Update app.py

app.py

@@ -3,7 +3,6 @@ from simple_salesforce import Salesforce
 from dotenv import load_dotenv
 import os
 import logging
-import uuid
 
 # Load environment variables
 load_dotenv()
@@ -36,7 +35,7 @@ sf = get_salesforce_connection()
 def index():
     return render_template('index.html')
 
-# Fetch items from Sector_Detail__c for dietary preferences
+# Fetch items from Sector_Detail__c and Menu_Item__c for dietary preferences
 @app.route('/get_menu_items', methods=['POST'])
 def get_menu_items():
     global sf
@@ -48,31 +47,63 @@ def get_menu_items():
 
     dietary_preference = request.json.get('dietary_preference', 'both').lower()
     try:
-        soql = "SELECT Name, Image_URL__c, Category__c, Description__c FROM Sector_Detail__c"
+        # Query Sector_Detail__c
+        soql_sector = "SELECT Name, Image_URL__c, Category__c, Description__c FROM Sector_Detail__c"
         if dietary_preference == 'vegetarian':
-            soql += " WHERE Category__c = 'Veg'"
+            soql_sector += " WHERE Category__c = 'Veg'"
         elif dietary_preference == 'non-vegetarian':
-            soql += " WHERE Category__c = 'Non-Veg'"
-        soql += " LIMIT 200"
+            soql_sector += " WHERE Category__c = 'Non-Veg'"
+        soql_sector += " LIMIT 200"
         
-        logger.info(f"Executing SOQL query: {soql}")
-        result = sf.query(soql)
-        items = [
+        logger.info(f"Executing SOQL query for Sector_Detail__c: {soql_sector}")
+        result_sector = sf.query(soql_sector)
+        sector_items = [
             {
                 "name": record['Name'],
                 "image_url": record.get('Image_URL__c', ''),
                 "category": record.get('Category__c', ''),
-                "description": record.get('Description__c', 'No description available')
+                "description": record.get('Description__c', 'No description available'),
+                "source": "Sector_Detail__c"
+            }
+            for record in result_sector['records'] if 'Name' in record
+        ]
+
+        # Query Menu_Item__c
+        soql_menu = "SELECT Name, Description__c, Image1__c, Ingredientsinfo__c, NutritionalInfo__c, Price__c, Sector__c, Spice_Levels__c, Veg_NonVeg__c, Category__c, Dynamic_Dish__c FROM Menu_Item__c"
+        if dietary_preference == 'vegetarian':
+            soql_menu += " WHERE Veg_NonVeg__c = 'Vegetarian'"
+        elif dietary_preference == 'non-vegetarian':
+            soql_menu += " WHERE Veg_NonVeg__c = 'Non-Vegetarian'"
+        soql_menu += " LIMIT 200"
+        
+        logger.info(f"Executing SOQL query for Menu_Item__c: {soql_menu}")
+        result_menu = sf.query(soql_menu)
+        menu_items = [
+            {
+                "name": record['Name'],
+                "description": record.get('Description__c', 'No description available'),
+                "image_url": record.get('Image1__c', ''),
+                "ingredients": record.get('Ingredientsinfo__c', ''),
+                "nutritional_info": record.get('NutritionalInfo__c', ''),
+                "price": record.get('Price__c', 0.0),
+                "sector": record.get('Sector__c', ''),
+                "spice_levels": record.get('Spice_Levels__c', ''),
+                "veg_nonveg": record.get('Veg_NonVeg__c', ''),
+                "category": record.get('Category__c', ''),
+                "dynamic_dish": record.get('Dynamic_Dish__c', False),
+                "source": "Menu_Item__c"
             }
-            for record in result['records'] if 'Name' in record
+            for record in result_menu['records'] if 'Name' in record
         ]
-        logger.info(f"Fetched {len(items)} items from Sector_Detail__c for {dietary_preference}")
+
+        items = sector_items + menu_items
+        logger.info(f"Fetched {len(items)} items (Sector_Detail__c: {len(sector_items)}, Menu_Item__c: {len(menu_items)}) for {dietary_preference}")
         return jsonify({"menu_items": items})
     except Exception as e:
-        logger.error(f"Failed to fetch items from Sector_Detail__c: {str(e)}")
+        logger.error(f"Failed to fetch items: {str(e)}")
         return jsonify({"error": f"Failed to fetch items from Salesforce: {str(e)}"}), 500
 
-# Fetch suggestions from Ingredient_Object__c and Menu_Item__c
+# Fetch suggestions from Ingredient_Object__c
 @app.route('/suggest_items', methods=['POST'])
 def suggest_items():
     global sf
@@ -86,24 +117,13 @@ def suggest_items():
         return jsonify({"error": "Search term is required"}), 400
 
     try:
-        # Query Ingredient_Object__c
-        soql_ingredient = f"SELECT Ingredient_Name__c, Image_URL__c FROM Ingredient_Object__c WHERE Ingredient_Name__c LIKE '%{search_term}%' LIMIT 5"
-        logger.info(f"Executing SOQL query for Ingredient_Object__c: {soql_ingredient}")
-        result_ingredient = sf.query(soql_ingredient)
+        soql = f"SELECT Ingredient_Name__c, Image_URL__c FROM Ingredient_Object__c WHERE Ingredient_Name__c LIKE '%{search_term}%' LIMIT 10"
+        logger.info(f"Executing SOQL query: {soql}")
+        result = sf.query(soql)
         suggestions = [
-            {"name": record['Ingredient_Name__c'], "image_url": record.get('Image_URL__c', ''), "source": "Ingredient_Object__c"}
-            for record in result_ingredient['records'] if 'Ingredient_Name__c' in record
+            {"name": record['Ingredient_Name__c'], "image_url": record.get('Image_URL__c', '')}
+            for record in result['records'] if 'Ingredient_Name__c' in record
         ]
-
-        # Query Menu_Item__c
-        soql_menu = f"SELECT Name, Image1__c, Veg_NonVeg__c FROM Menu_Item__c WHERE Name LIKE '%{search_term}%' LIMIT 5"
-        logger.info(f"Executing SOQL query for Menu_Item__c: {soql_menu}")
-        result_menu = sf.query(soql_menu)
-        suggestions += [
-            {"name": record['Name'], "image_url": record.get('Image1__c', ''), "source": "Menu_Item__c", "veg_nonveg": record.get('Veg_NonVeg__c', '')}
-            for record in result_menu['records'] if 'Name' in record
-        ]
-
         logger.info(f"Fetched {len(suggestions)} suggestions for '{search_term}'")
         return jsonify({"suggestions": suggestions})
     except Exception as e:
@@ -124,13 +144,7 @@ def get_menu_item_details():
         return jsonify({"error": "Item name is required"}), 400
 
     try:
-        soql = f"""
-            SELECT Name, Description__c, Image1__c, Ingredientsinfo__c, NutritionalInfo__c, Price__c,
-                   Sector__c, Spice_Levels__c, Veg_NonVeg__c, Category__c, Dynamic_Dish__c
-            FROM Menu_Item__c
-            WHERE Name LIKE '%{item_name}%'
-            LIMIT 1
-        """
+        soql = f"SELECT Name, Description__c, Image1__c, Ingredientsinfo__c, NutritionalInfo__c, Price__c, Sector__c, Spice_Levels__c, Veg_NonVeg__c, Category__c, Dynamic_Dish__c FROM Menu_Item__c WHERE Name LIKE '%{item_name}%' LIMIT 1"
         logger.info(f"Executing SOQL query: {soql}")
         result = sf.query(soql)
 
@@ -141,15 +155,16 @@ def get_menu_item_details():
         item_details = {
             "name": record.get('Name', ''),
             "description": record.get('Description__c', 'No description available'),
-            "image_url": record.get('Image1__c', 'https://via.placeholder.com/100'),
-            "ingredients": record.get('Ingredientsinfo__c', 'No ingredients info'),
-            "nutritional_info": record.get('NutritionalInfo__c', 'No nutritional info'),
+            "image_url": record.get('Image1__c', 'https://via.placeholder.com/30'),
+            "ingredients": record.get('Ingredientsinfo__c', ''),
+            "nutritional_info": record.get('NutritionalInfo__c', ''),
             "price": record.get('Price__c', 0.0),
-            "sector": record.get('Sector__c', 'Unknown'),
-            "spice_levels": record.get('Spice_Levels__c', 'Not specified'),
-            "veg_nonveg": record.get('Veg_NonVeg__c', 'Unknown'),
-            "category": record.get('Category__c', 'Unknown'),
-            "dynamic_dish": record.get('Dynamic_Dish__c', False)
+            "sector": record.get('Sector__c', ''),
+            "spice_levels": record.get('Spice_Levels__c', ''),
+            "veg_nonveg": record.get('Veg_NonVeg__c', ''),
+            "category": record.get('Category__c', ''),
+            "dynamic_dish": record.get('Dynamic_Dish__c', False),
+            "source": "Menu_Item__c"
         }
         logger.info(f"Fetched details for '{item_name}' from Menu_Item__c")
         return jsonify({"item_details": item_details})
@@ -157,7 +172,42 @@ def get_menu_item_details():
         logger.error(f"Failed to fetch item details from Menu_Item__c: {str(e)}")
         return jsonify({"error": f"Failed to fetch item details from Salesforce: {str(e)}"}), 500
 
-# Submit selected items to Ingredient_Object__c or Menu_Item__c
+# Fetch item details from Sector_Detail__c by name
+@app.route('/get_sector_item_details', methods=['POST'])
+def get_sector_item_details():
+    global sf
+    if not sf:
+        sf = get_salesforce_connection()
+        if not sf:
+            return jsonify({"error": "Unable to connect to Salesforce"}), 500
+
+    item_name = request.json.get('item_name', '').strip()
+    if not item_name:
+        return jsonify({"error": "Item name is required"}), 400
+
+    try:
+        soql = f"SELECT Name, Image_URL__c, Category__c, Description__c FROM Sector_Detail__c WHERE Name LIKE '%{item_name}%' LIMIT 1"
+        logger.info(f"Executing SOQL query: {soql}")
+        result = sf.query(soql)
+
+        if result['totalSize'] == 0:
+            return jsonify({"error": f"No item found matching '{item_name}' in Sector_Detail__c"}), 404
+
+        record = result['records'][0]
+        item_details = {
+            "name": record.get('Name', ''),
+            "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/30'),
+            "category": record.get('Category__c', 'Unknown'),
+            "description": record.get('Description__c', 'No description available'),
+            "source": "Sector_Detail__c"
+        }
+        logger.info(f"Fetched details for '{item_name}' from Sector_Detail__c")
+        return jsonify({"item_details": item_details})
+    except Exception as e:
+        logger.error(f"Failed to fetch item details from Sector_Detail__c: {str(e)}")
+        return jsonify({"error": f"Failed to fetch item details from Salesforce: {str(e)}"}), 500
+
+# Submit selected items to Ingredient_Object__c
 @app.route('/submit_items', methods=['POST'])
 def submit_items():
     global sf
@@ -173,28 +223,12 @@ def submit_items():
     try:
         for item in items:
             logger.info(f"Submitting item: {item}")
-            # Check if item is from Menu_Item__c or Ingredient_Object__c
-            if item.get('source') == 'Menu_Item__c':
-                sf.Menu_Item__c.create({
-                    'Name': item['name'],
-                    'Description__c': item.get('description', 'No description available'),
-                    'Image1__c': item.get('image_url', ''),
-                    'Ingredientsinfo__c': item.get('ingredients', 'No ingredients info'),
-                    'NutritionalInfo__c': item.get('nutritional_info', 'No nutritional info'),
-                    'Price__c': item.get('price', 0.0),
-                    'Sector__c': item.get('sector', 'Unknown'),
-                    'Spice_Levels__c': item.get('spice_levels', 'Not specified'),
-                    'Veg_NonVeg__c': item.get('veg_nonveg', 'Unknown'),
-                    'Category__c': item.get('category', 'Unknown'),
-                    'Dynamic_Dish__c': item.get('dynamic_dish', False)
-                })
-            else:
-                sf.Ingredient_Object__c.create({
-                    'Ingredient_Name__c': item['name'],
-                    'Category__c': item.get('category', 'Unknown'),
-                    'Description__c': item.get('description', 'No description available')
-                })
-            logger.info(f"Successfully submitted item to {item.get('source', 'Ingredient_Object__c')}: {item['name']}")
+            sf.Ingredient_Object__c.create({
+                'Ingredient_Name__c': item['name'],
+                'Category__c': item.get('category', 'Unknown'),
+                'Description__c': item.get('description', 'No description available')
+            })
+            logger.info(f"Successfully submitted item to Ingredient_Object__c: {item['name']}")
         return jsonify({"success": f"Successfully submitted {len(items)} items to Salesforce"})
     except Exception as e:
         logger.error(f"Failed to submit items: {str(e)}")