Update app.py

app.py

@@ -3,6 +3,7 @@ from simple_salesforce import Salesforce
 from dotenv import load_dotenv
 import os
 import logging
+import uuid
 
 # Load environment variables
 load_dotenv()
@@ -71,7 +72,7 @@ def get_menu_items():
         logger.error(f"Failed to fetch items from Sector_Detail__c: {str(e)}")
         return jsonify({"error": f"Failed to fetch items from Salesforce: {str(e)}"}), 500
 
-# Fetch suggestions from Ingredient_Object__c
+# Fetch suggestions from Ingredient_Object__c and Menu_Item__c
 @app.route('/suggest_items', methods=['POST'])
 def suggest_items():
     global sf
@@ -85,87 +86,33 @@ def suggest_items():
         return jsonify({"error": "Search term is required"}), 400
 
     try:
-        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)
+        # 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)
         suggestions = [
-            {"name": record['Ingredient_Name__c'], "image_url": record.get('Image_URL__c', '')}
-            for record in result['records'] if 'Ingredient_Name__c' in record
+            {"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
+        ]
+
+        # 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:
         logger.error(f"Failed to fetch suggestions: {str(e)}")
         return jsonify({"error": "Failed to fetch suggestions from Salesforce"}), 500
 
-# Fetch item details from Ingredient_Object__c
-@app.route('/get_item_details', methods=['POST'])
-def get_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 Ingredient_Name__c, Image_URL__c FROM Ingredient_Object__c WHERE Ingredient_Name__c 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 Ingredient_Object__c"}), 404
-
-        record = result['records'][0]
-        item_details = {
-            "name": record.get('Ingredient_Name__c', ''),
-            "image_url": record.get('Image_URL__c', '')
-        }
-        logger.info(f"Fetched details for '{item_name}'")
-        return jsonify({"item_details": item_details})
-    except Exception as e:
-        logger.error(f"Failed to fetch item details: {str(e)}")
-        return jsonify({"error": "Failed to fetch item details from Salesforce"}), 500
-
-# Fetch item details from Sector_Detail__c by name
-@app.route('/get_item_details_by_name', methods=['POST'])
-def get_item_details_by_name():
-    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, 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', ''),
-            "category": record.get('Category__c', 'Unknown'),
-            "description": record.get('Description__c', 'No description available')
-        }
-        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
-
-# Fetch item details (Name, Image_URL, Category, Description) from Sector_Detail__c by name
-@app.route('/get_sector_item_details', methods=['POST'])
-def get_sector_item_details():
+# Fetch item details from Menu_Item__c by name
+@app.route('/get_menu_item_details', methods=['POST'])
+def get_menu_item_details():
     global sf
     if not sf:
         sf = get_salesforce_connection()
@@ -177,27 +124,40 @@ def get_sector_item_details():
         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"
+        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)
 
         if result['totalSize'] == 0:
-            return jsonify({"error": f"No item found matching '{item_name}' in Sector_Detail__c"}), 404
+            return jsonify({"error": f"No item found matching '{item_name}' in Menu_Item__c"}), 404
 
         record = result['records'][0]
         item_details = {
             "name": record.get('Name', ''),
-            "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/30'),
+            "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'),
+            "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'),
-            "description": record.get('Description__c', 'No description available')
+            "dynamic_dish": record.get('Dynamic_Dish__c', False)
         }
-        logger.info(f"Fetched details for '{item_name}' from Sector_Detail__c")
+        logger.info(f"Fetched details for '{item_name}' from Menu_Item__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)}")
+        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
+# Submit selected items to Ingredient_Object__c or Menu_Item__c
 @app.route('/submit_items', methods=['POST'])
 def submit_items():
     global sf
@@ -213,12 +173,28 @@ def submit_items():
     try:
         for item in items:
             logger.info(f"Submitting item: {item}")
-            sf.Ingredient_Object__c.create({
-                'Ingredient_Name__c': item['name'],
-                'Category__c': item.get('category', 'Unknown'),  # Add Category__c
-                'Description__c': item.get('description', 'No description available')  # Ensure description is included
-            })
-            logger.info(f"Successfully submitted item to Ingredient_Object__c: {item['name']}")
+            # 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']}")
         return jsonify({"success": f"Successfully submitted {len(items)} items to Salesforce"})
     except Exception as e:
         logger.error(f"Failed to submit items: {str(e)}")