Update app.py

app.py

@@ -49,8 +49,20 @@ def get_ingredients():
         if not sf:
             return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
+    data = request.json
+    dietary_preference = data.get('dietary_preference', 'both').lower()
+
     try:
-        soql = "SELECT Name, Image_URL__c, Category__c FROM Sector_Detail__c WHERE Category__c = 'Both'"
+        category_map = {
+            'vegetarian': 'Veg',
+            'non-vegetarian': 'Non-Veg',
+            'chicken': 'Non-Veg',
+            'beef': 'Non-Veg',
+            'lamb': 'Non-Veg',
+            'both': 'both'
+        }
+        category = category_map.get(dietary_preference, 'both')
+        soql = f"SELECT Name, Image_URL__c, Category__c FROM Sector_Detail__c WHERE Category__c = '{category}'"
         soql += " LIMIT 200"
         logger.debug(f"Executing SOQL query for Sector_Detail__c: {soql}")
         result = sf.query(soql)
@@ -70,50 +82,6 @@ def get_ingredients():
 
 @app.route('/get_menu_items', methods=['POST'])
 def get_menu_items():
-    global sf
-    if not sf:
-        sf = get_salesforce_connection()
-        if not sf:
-            logger.error("Salesforce connection failed after retry")
-            return jsonify({"error": "Unable to connect to Salesforce"}), 500
-
-    data = request.json
-    dietary_preference = data.get('dietary_preference', 'both').lower()
-    search_term = data.get('search_term', '').strip()
-
-    try:
-        soql_menu = "SELECT Name, Description__c, Image1__c, Image2__c, Ingredientsinfo__c, Price__c, Section__c, Veg_NonVeg__c, Total_Ordered__c FROM Menu_Item__c"
-        if search_term:
-            soql_menu += f" WHERE Name LIKE '%{search_term}%'"
-        elif 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.debug(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', '') or record.get('Image2__c', ''),
-                "ingredients": record.get('Ingredientsinfo__c', ''),
-                "price": record.get('Price__c', 0.0),
-                "section": record.get('Section__c', ''),
-                "veg_nonveg": record.get('Veg_NonVeg__c', ''),
-                "total_ordered": record.get('Total_Ordered__c', 0),
-                "source": "Menu_Item__c"
-            }
-            for record in result_menu['records'] if 'Name' in record
-        ]
-        logger.debug(f"Fetched {len(menu_items)} menu items")
-        return jsonify({"menu_items": menu_items})
-    except Exception as e:
-        logger.error(f"Failed to fetch menu items: {str(e)}")
-        return jsonify({"error": f"Failed to fetch menu items from Salesforce: {str(e)}"}), 500
-
-@app.route('/get_related_menu_items', methods=['POST'])
-def get_related_menu_items():
     global sf
     if not sf:
         sf = get_salesforce_connection()
@@ -121,43 +89,46 @@ def get_related_menu_items():
             return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
     data = request.json
-    ingredient_name = data.get('ingredient_name', '').strip()
-    dietary_preference = data.get('dietary_preference', 'both').lower()
-
-    if not ingredient_name:
-        return jsonify({"error": "Ingredient name is required"}), 400
+    ingredient_names = data.get('ingredient_names', '')
+    category = data.get('category', '')
 
     try:
-        soql = "SELECT Name, Description__c, Image1__c, Image2__c, Ingredientsinfo__c, Price__c, Section__c, Veg_NonVeg__c, Total_Ordered__c FROM Menu_Item__c WHERE Ingredientsinfo__c LIKE '%" + ingredient_name + "%'"
-        if dietary_preference == 'vegetarian':
-            soql += " AND Veg_NonVeg__c = 'Vegetarian'"
-        elif dietary_preference == 'non-vegetarian':
-            soql += " AND Veg_NonVeg__c = 'Non-Vegetarian'"
+        soql = "SELECT Name, Description__c, Image1__c, Image2__c, Price__c, Section__c, Veg_NonVeg__c, Total_Ordered__c FROM Menu_Item__c"
+        conditions = []
+        if ingredient_names:
+            words = ingredient_names.split()
+            name_conditions = [f"Name LIKE '%{word}%'" for word in words]
+            conditions.append(f"({' OR '.join(name_conditions)})")
+        if category:
+            if category.lower() == 'vegetarian':
+                conditions.append("Veg_NonVeg__c = 'Vegetarian'")
+            elif category.lower() == 'non-vegetarian':
+                conditions.append("Veg_NonVeg__c = 'Non-Vegetarian'")
+        if conditions:
+            soql += " WHERE " + " AND ".join(conditions)
         soql += " LIMIT 200"
-        logger.debug(f"Executing SOQL query for related Menu_Item__c: {soql}")
+        logger.debug(f"Executing SOQL query for Menu_Item__c: {soql}")
         result = sf.query(soql)
         menu_items = [
             {
                 "name": record['Name'],
                 "description": record.get('Description__c', 'No description available'),
                 "image_url": record.get('Image1__c', '') or record.get('Image2__c', ''),
-                "ingredients": record.get('Ingredientsinfo__c', ''),
                 "price": record.get('Price__c', 0.0),
                 "section": record.get('Section__c', ''),
                 "veg_nonveg": record.get('Veg_NonVeg__c', ''),
-                "total_ordered": record.get('Total_Ordered__c', 0),
-                "source": "Menu_Item__c"
+                "total_ordered": record.get('Total_Ordered__c', 0)
             }
             for record in result['records'] if 'Name' in record
         ]
-        logger.debug(f"Fetched {len(menu_items)} related menu items for {ingredient_name}")
+        logger.debug(f"Fetched {len(menu_items)} menu items")
         return jsonify({"menu_items": menu_items})
     except Exception as e:
-        logger.error(f"Failed to fetch related menu items: {str(e)}")
-        return jsonify({"error": f"Failed to fetch related menu items from Salesforce: {str(e)}"}), 500
+        logger.error(f"Failed to fetch menu items: {str(e)}")
+        return jsonify({"error": f"Failed to fetch menu items from Salesforce: {str(e)}"}), 500
 
-@app.route('/submit_ingredients', methods=['POST'])
-def submit_ingredients():
+@app.route('/submit_customization_ingredients', methods=['POST'])
+def submit_customization_ingredients():
     global sf
     if not sf:
         sf = get_salesforce_connection()
@@ -166,35 +137,47 @@ def submit_ingredients():
 
     data = request.json
     items = data.get('items', [])
-    custom_order_name = data.get('custom_order_name', '')
-    ingredients_info = data.get('ingredients_info', '')
-
-    if not items:
-        return jsonify({'error': 'No items selected'}), 400
+    menu_item = data.get('menu_item', {})
+    ingredients = data.get('ingredients', [])
+    instructions = data.get('instructions', '')
 
     try:
-        ingredient_name = custom_order_name or f"Order_{datetime.now().strftime('%Y%m%d')}_{uuid.uuid4().hex[:8]}"
-        item_names = ', '.join(item['name'] for item in items)
-        description = f"Contains: {item_names}"
-
-        for item in items:
-            item_description = item['description']
-            if item.get('ingredientsInfo'):
-                item_description += f", additional info: {item['ingredientsInfo']}"
+        if items:  # Cart submission
+            ingredient_name = f"Order_{datetime.now().strftime('%Y%m%d')}_{uuid.uuid4().hex[:8]}"
+            for item in items:
+                description = f"{item['name']} ({item.get('instructions', 'No instructions')})"
+                if item.get('ingredients'):
+                    description += f", Ingredients: {', '.join(i['name'] for i in item['ingredients'])}"
+                sf.Ingredient_Object__c.create({
+                    'Ingredient_Name__c': ingredient_name,
+                    'Category__c': item.get('veg_nonveg', ''),
+                    'Description__c': description,
+                    'Image_URL__c': item.get('image_url', ''),
+                    'Quantity__c': 1,
+                    'Ingredientsinfo__c': item.get('instructions', '')
+                })
+            logger.debug(f"Submitted {len(items)} items under {ingredient_name}")
+            return jsonify({"success": True, "message": f"Submitted {len(items)} items"})
+        elif menu_item:  # Single item customization
+            ingredient_name = f"Custom_{menu_item['name']}_{uuid.uuid4().hex[:8]}"
+            description = f"{menu_item['name']} ({instructions or 'No instructions'})"
+            if ingredients:
+                description += f", Ingredients: {', '.join(i['name'] for i in ingredients)}"
             sf.Ingredient_Object__c.create({
                 'Ingredient_Name__c': ingredient_name,
-                'Category__c': item.get('category', ''),
-                'Description__c': item_description,
-                'Image_URL__c': item.get('image_url', ''),
-                'Quantity__c': item.get('quantity', 1),
-                'Ingredientsinfo__c': ingredients_info or item.get('ingredientsInfo', '')
+                'Category__c': menu_item.get('veg_nonveg', ''),
+                'Description__c': description,
+                'Image_URL__c': menu_item.get('image_url', ''),
+                'Quantity__c': 1,
+                'Ingredientsinfo__c': instructions
             })
-
-        logger.debug(f"Submitted {len(items)} items under {ingredient_name}")
-        return jsonify({"success": f"Submitted {len(items)} items under {ingredient_name}", "ingredient_name": ingredient_name})
+            logger.debug(f"Submitted customization for {menu_item['name']}")
+            return jsonify({"success": True, "message": "Customization submitted"})
+        else:
+            return jsonify({"error": "No items or menu item provided"}), 400
     except Exception as e:
-        logger.error(f"Failed to submit items: {str(e)}")
-        return jsonify({"error": f"Failed to submit items: {str(e)}"}), 500
+        logger.error(f"Failed to submit: {str(e)}")
+        return jsonify({"error": f"Failed to submit: {str(e)}"}), 500
 
 if __name__ == '__main__':
     app.run(debug=True, host='0.0.0.0', port=7860)