Update menu.py

menu.py

@@ -1,7 +1,13 @@
 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
@@ -17,7 +23,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()
-    print(f"Created placeholder video at {PLACEHOLDER_PATH}")
+    logger.info(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."""
@@ -31,7 +37,7 @@ 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()
-        print(f"Created missing placeholder video at {PLACEHOLDER_PATH}")
+        logger.info(f"Created missing placeholder video at {PLACEHOLDER_PATH}")
     return f"/static/{PLACEHOLDER_VIDEO}"
 
 @menu_blueprint.route("/menu", methods=["GET", "POST"])
@@ -55,13 +61,20 @@ def menu():
     user_image = session.get('user_image')  # Add avatar image from session
 
     # Fetch user referral and reward points
-    user_query = f"SELECT Referral__c, Reward_Points__c FROM Customer_Login__c WHERE Email__c = '{user_email}'"
+    user_query = f"SELECT Id, Referral__c, Reward_Points__c, Avatar__c FROM Customer_Login__c WHERE Email__c = '{user_email}'"
     user_result = sf.query(user_query)
     if not user_result.get('records'):
         return redirect(url_for('login'))
 
-    referral_code = user_result['records'][0].get('Referral__c', 'N/A')
-    reward_points = user_result['records'][0].get('Reward_Points__c', 0)
+    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)
+
+    # If no session image, check Salesforce for stored avatar
+    if not user_image and user_record.get('Avatar__c'):
+        session['user_image'] = user_record['Avatar__c']
+        user_image = session['user_image']
 
     # Get cart item count
     cart_query = f"SELECT COUNT() FROM Cart_Item__c WHERE Customer_Email__c = '{user_email}'"
@@ -152,33 +165,98 @@ def menu():
         user_name=user_name,
         first_letter=first_letter,
         cart_item_count=cart_item_count,
-        user_image=user_image  # Pass user_image to template
+        user_image=user_image,
+        user_id=user_id  # Pass user_id for avatar updates
     )
 
 @menu_blueprint.route('/upload_avatar', methods=['POST'])
 def upload_avatar():
-    data = request.get_json()
-    if not data or 'image' not in data:
-        return jsonify({'success': False, 'error': 'No image data provided'})
-    
-    image_data = data['image']
-    # Validate base64 image
-    if not image_data.startswith('data:image/'):
-        return jsonify({'success': False, 'error': 'Invalid image format'})
-    
-    # Limit size to ~1MB (base64 encoded size)
-    if len(image_data) > 1_400_000:
-        return jsonify({'success': False, 'error': 'Image too large (max 1MB)'})
-    
-    session['user_image'] = image_data
-    return jsonify({'success': True, 'image': image_data})
+    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:
+            # Extract the base64 part (after the comma)
+            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 (optional, for persistence)
+        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']
+                    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(f"User not found in Salesforce: {user_email}")
+            except Exception as e:
+                logger.error(f"Failed to store image in Salesforce: {str(e)}")
+                # Continue even if Salesforce fails, as session storage is the primary method
+
+        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():
-    if 'user_image' in session:
-        session.pop('user_image', None)
+    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
+
+        # Remove from session
+        if 'user_image' in session:
+            session.pop('user_image', None)
+            logger.info("Image removed from session")
+
+        # Remove from Salesforce
+        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']
+                sf.Customer_Login__c.update(user_id, {'Avatar__c': None})
+                logger.info(f"Image removed from Salesforce for user {user_email}")
+            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)}")
+            # Continue even if Salesforce fails, as session removal is the primary method
+
         return jsonify({'success': True})
-    return jsonify({'success': False, 'error': 'No image to delete'})
+
+    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():
@@ -216,7 +294,7 @@ def get_addons():
         return jsonify({"success": True, "addons": formatted_addons})
 
     except Exception as e:
-        print(f"Error fetching addons: {str(e)}")
+        logger.error(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'])
@@ -305,5 +383,5 @@ def add_to_cart():
     except ValueError as e:
         return jsonify({"success": False, "error": f"Invalid data format: {str(e)}"}), 400
     except Exception as e:
-        print(f"Error adding item to cart: {str(e)}")
+        logger.error(f"Error adding item to cart: {str(e)}")
         return jsonify({"success": False, "error": "An error occurred while adding the item to the cart."}), 500