Upload 2 files

app.py

@@ -1103,6 +1103,90 @@ TWILIO_WHATSAPP_NUMBER = "whatsapp:+14155238886"
 WHATSAPP_CHAR_LIMIT = 1600
 PROPERTY_BASE_URL = "https://hiveprop.com/property/image-slider?id="
 MAX_PROPERTIES_TO_SEND = 5
+HIVEPROP_EMAIL_API_URL = "https://hivepropapi.azurewebsites.net/api/Email/sendPlainText"
+
+def send_email_recommendations(email, first_name, last_name, recommendations):
+    """Send property recommendations via email using HiveProp API"""
+    try:
+        # Take only the top properties
+        top_recommendations = recommendations[:MAX_PROPERTIES_TO_SEND]
+        
+        # Prepare email content
+        subject = f"Your Top {MAX_PROPERTIES_TO_SEND} Property Recommendations - HiveProp"
+        
+        # Create plain text email body (simpler format for testing)
+        email_body = f"🏡 Hello {first_name} {last_name}!\n\n"
+        email_body += f"Here are your top {MAX_PROPERTIES_TO_SEND} recommended properties in Hyderabad:\n\n"
+        
+        if not top_recommendations:
+            email_body += "⚠️ No specific properties found, but you can explore all available properties at https://hiveprop.com\n\n"
+        else:
+            for idx, prop in enumerate(top_recommendations, 1):
+                property_name = prop.get('propertyName', 'Unnamed Property')
+                property_id = prop.get('id', '')
+                property_link = f"{PROPERTY_BASE_URL}{property_id}"
+                
+                # Extract location from address or description
+                address = prop.get('address', '')
+                location = address.split(',')[-2].strip() if ',' in address else address
+                
+                email_body += f"{idx}. {property_name}\n"
+                email_body += f"   📍 Location: {location}\n"
+                email_body += f"   🔗 {property_link}\n\n"
+        
+        email_body += "---\n"
+        email_body += "🔎 Looking for more options? Explore all listings at https://hiveprop.com\n\n"
+        email_body += "Thank you for using HiveProp!\n"
+        email_body += "Best regards,\n"
+        email_body += "The HiveProp Team"
+        
+        # Send email via HiveProp API using query parameters
+        params = {
+            'toEmail': email,
+            'subject': subject,
+            'body': email_body
+        }
+        
+        logger.info(f"Sending email to {email} via HiveProp API")
+        logger.info(f"API URL: {HIVEPROP_EMAIL_API_URL}")
+        logger.info(f"Subject: {subject}")
+        logger.info(f"Request params: {params}")
+        
+        # Send POST request with query parameters
+        response = requests.post(HIVEPROP_EMAIL_API_URL, params=params, timeout=30)
+        logger.info(f"Email API response status: {response.status_code}")
+        logger.info(f"Email API response text: {response.text}")
+        
+        # Check for 404 or other errors before raising
+        if response.status_code == 404:
+            logger.error(f"Email API endpoint not found (404): {HIVEPROP_EMAIL_API_URL}")
+            return False, f"Email API endpoint not found. Please check the API URL."
+        elif response.status_code != 200:
+            logger.error(f"Email API returned status {response.status_code}: {response.text}")
+            return False, f"Email API error: Status {response.status_code} - {response.text}"
+        
+        response.raise_for_status()
+        
+        logger.info(f"Email sent successfully to {email}")
+        return True, "Email sent successfully"
+        
+    except requests.exceptions.Timeout:
+        logger.error("HiveProp Email API request timed out")
+        return False, "Email API timeout - service may be slow or unavailable"
+    except requests.exceptions.ConnectionError as e:
+        logger.error(f"HiveProp Email API connection error: {str(e)}")
+        return False, "Email API connection failed - service may be down"
+    except requests.exceptions.HTTPError as e:
+        error_text = e.response.text if e.response else "No response text"
+        status_code = e.response.status_code if e.response else "Unknown"
+        logger.error(f"HiveProp Email API error: Status {status_code}, Response: {error_text}")
+        return False, f"Email API error: Status {status_code} - {error_text}"
+    except requests.exceptions.RequestException as e:
+        logger.error(f"Request error sending email: {str(e)}")
+        return False, f"Email request failed: {str(e)}"
+    except Exception as e:
+        logger.error(f"Unexpected error sending email: {str(e)}")
+        return False, f"Failed to send email: {str(e)}"
 
 @app.route('/create_account_and_send_whatsapp', methods=['POST'])
 def create_account_and_send_whatsapp():
@@ -1113,7 +1197,16 @@ def create_account_and_send_whatsapp():
         first_name = data.get('firstName')
         last_name = data.get('lastName')
         phone = data.get('phone')
+        email = data.get('email')
         recommendations = data.get('recommendations', [])
+        
+        logger.info(f"Received data: firstName={first_name}, lastName={last_name}, email={email}, phone={phone}")
+        logger.info(f"Recommendations count: {len(recommendations)}")
+
+        # Validate email format
+        if not email or '@' not in email:
+            logger.error(f"Invalid email format: {email}")
+            return jsonify({"success": False, "error": "Invalid email format. Please provide a valid email address."}), 400
 
         # Clean and format phone number in E.164
         # Remove all spaces, dashes, and parentheses
@@ -1128,56 +1221,101 @@ def create_account_and_send_whatsapp():
             logger.error(f"Invalid phone number format: {phone}")
             return jsonify({"success": False, "error": "Invalid phone number format. Please provide a valid 10-digit Indian mobile number."}), 400
 
-        # Take only the top 10 properties
-        top_recommendations = recommendations[:MAX_PROPERTIES_TO_SEND]
+        # Track success status for both email and WhatsApp
+        whatsapp_success = False
+        email_success = False
+        messages = []
 
-        # Prepare the WhatsApp message with improved design
-        message_header = f"🏡 *Hello {first_name} {last_name}!*\n\nHere are your *top {MAX_PROPERTIES_TO_SEND} recommended properties* in Hyderabad:\n"
+        # Send via WhatsApp
+        try:
+            # Take only the top properties
+            top_recommendations = recommendations[:MAX_PROPERTIES_TO_SEND]
+            
+            logger.info(f"Total recommendations received: {len(recommendations)}")
+            logger.info(f"Top recommendations to send: {len(top_recommendations)}")
 
-        message_body = ""
-        for idx, prop in enumerate(top_recommendations, 1):
-            property_name = prop.get('propertyName', 'Unnamed Property')
-            property_id = prop.get('id', '')
-            property_link = f"{PROPERTY_BASE_URL}{property_id}"
+            # Prepare the WhatsApp message with improved design
+            message_header = f"🏡 *Hello {first_name} {last_name}!*\n\nHere are your *top {MAX_PROPERTIES_TO_SEND} recommended properties* in Hyderabad:\n"
 
-            # Extract location from address or description
-            address = prop.get('address', '')
-            location = address.split(',')[-2].strip() if ',' in address else address
+            message_body = ""
+            if not top_recommendations:
+                message_body = "⚠️ No specific properties found, but you can explore all available properties at https://hiveprop.com\n\n"
+            else:
+                for idx, prop in enumerate(top_recommendations, 1):
+                    property_name = prop.get('propertyName', 'Unnamed Property')
+                    property_id = prop.get('id', '')
+                    property_link = f"{PROPERTY_BASE_URL}{property_id}"
 
-            message_body += f"{idx}️⃣ *{property_name}*\n"
-            message_body += f"📍 *{location}*\n"
-            message_body += f"🔗{property_link}\n"
+                    # Extract location from address or description
+                    address = prop.get('address', '')
+                    location = address.split(',')[-2].strip() if ',' in address else address
 
-        # Add a call-to-action
-        message_footer = "---\n🔎 *Looking for more options?* Explore all listings at https://hiveprop.com."
+                    message_body += f"{idx}️⃣ *{property_name}*\n"
+                    message_body += f"📍 *{location}*\n"
+                    message_body += f"🔗{property_link}\n\n"
 
-        full_message = message_header + message_body + message_footer
+            # Add a call-to-action
+            message_footer = "---\n🔎 *Looking for more options?* Explore all listings at https://hiveprop.com."
 
-        # Encode credentials for Basic Auth
-        credentials = f"{TWILIO_ACCOUNT_SID}:{TWILIO_AUTH_TOKEN}"
-        encoded_credentials = base64.b64encode(credentials.encode('utf-8')).decode('utf-8')
+            full_message = message_header + message_body + message_footer
+            
+            logger.info(f"WhatsApp message length: {len(full_message)}")
 
-        # Send the message
-        payload = {
-            "To": f"whatsapp:{phone}",
-            "From": TWILIO_WHATSAPP_NUMBER,
-            "Body": full_message
-        }
+            # Encode credentials for Basic Auth
+            credentials = f"{TWILIO_ACCOUNT_SID}:{TWILIO_AUTH_TOKEN}"
+            encoded_credentials = base64.b64encode(credentials.encode('utf-8')).decode('utf-8')
 
-        headers = {
-            "Authorization": f"Basic {encoded_credentials}",
-            "Content-Type": "application/x-www-form-urlencoded"
-        }
+            # Send the message
+            payload = {
+                "To": f"whatsapp:{phone}",
+                "From": TWILIO_WHATSAPP_NUMBER,
+                "Body": full_message
+            }
 
-        response = requests.post(
-            f"https://api.twilio.com/2010-04-01/Accounts/{TWILIO_ACCOUNT_SID}/Messages.json",
-            data=payload,
-            headers=headers
-        )
-        response.raise_for_status()
+            headers = {
+                "Authorization": f"Basic {encoded_credentials}",
+                "Content-Type": "application/x-www-form-urlencoded"
+            }
+
+            response = requests.post(
+                f"https://api.twilio.com/2010-04-01/Accounts/{TWILIO_ACCOUNT_SID}/Messages.json",
+                data=payload,
+                headers=headers
+            )
+            response.raise_for_status()
+
+            logger.info("WhatsApp message sent successfully")
+            whatsapp_success = True
+            messages.append("WhatsApp message sent successfully!")
+            
+        except requests.exceptions.HTTPError as e:
+            logger.error(f"Twilio API error: {e.response.text}")
+            messages.append(f"WhatsApp error: {e.response.text}")
+        except Exception as e:
+            logger.error(f"Unexpected WhatsApp error: {str(e)}")
+            messages.append(f"WhatsApp error: {str(e)}")
+
+        # Send via Email
+        logger.info(f"Sending email to {email} with {len(recommendations)} recommendations")
+        email_success, email_message = send_email_recommendations(email, first_name, last_name, recommendations)
+        messages.append(email_message)
+
+        # Determine overall success and response message
+        success = whatsapp_success or email_success
+        if whatsapp_success and email_success:
+            overall_message = "Account created! Messages sent via WhatsApp and email!"
+        elif whatsapp_success:
+            overall_message = "Account created! WhatsApp message sent (email failed)"
+        elif email_success:
+            overall_message = "Account created! Email sent (WhatsApp failed)"
+        else:
+            overall_message = "Account created but failed to send messages"
 
-        logger.info("WhatsApp message sent successfully")
-        return jsonify({"success": True, "message": "Account created and WhatsApp message sent!"})
+        return jsonify({
+            "success": success, 
+            "message": overall_message,
+            "details": messages
+        })
 
     except requests.exceptions.HTTPError as e:
         logger.error(f"Twilio API error: {e.response.text}")

templates/index.html

@@ -436,6 +436,11 @@
             <div class="form-step" id="step4">
                 <h4 class="mb-3">Create Your Account</h4>
                 <p class="mb-4">Join us to get personalized property recommendations</p>
+                
+                <div class="alert alert-info mb-4" role="alert">
+                    <h6 class="alert-heading">📱📧 Recommendations Delivery</h6>
+                    <p class="mb-0">Your property recommendations will be sent to both your WhatsApp and email address automatically!</p>
+                </div>
 
                 <form id="accountForm">
                     <div class="mb-3">
@@ -456,7 +461,9 @@
 
                     <div class="mb-3">
                         <label for="phone" class="form-label">Phone Number *</label>
-                        <input type="tel" class="form-control" id="phone" placeholder="e.g., 9876543210" required>
+                        <input type="tel" class="form-control" id="phone" placeholder="e.g., 9876543210" pattern="[0-9]{10}" maxlength="10" required>
+                        <div class="form-text">Enter 10-digit mobile number without spaces or special characters</div>
+                        <div class="invalid-feedback">Please enter a valid 10-digit mobile number.</div>
                     </div>
 
                     <div class="mb-3">
@@ -812,6 +819,17 @@
                 document.getElementById('prefBudget').textContent = formData.price_range ? formData.price_range.map(range => `₹${range[0]} - ${range[1] ? `₹${range[1]}` : 'Above'}`).join(', ') : 'Any';
                 document.getElementById('prefFeatures').textContent = formData.features ? formData.features.join(', ') : 'None';
 
+                // Add phone number input formatting
+                document.getElementById('phone').addEventListener('input', function(e) {
+                    // Remove any non-digit characters
+                    let value = e.target.value.replace(/\D/g, '');
+                    // Limit to 10 digits
+                    if (value.length > 10) {
+                        value = value.substring(0, 10);
+                    }
+                    e.target.value = value;
+                });
+
                 // Handle account form submission
                 document.getElementById('accountForm').addEventListener('submit', async (e) => {
                     e.preventDefault();
@@ -819,9 +837,18 @@
                     const firstName = document.getElementById('firstName').value;
                     const lastName = document.getElementById('lastName').value;
                     const email = document.getElementById('email').value;
-                    const phone = document.getElementById('phone').value;
+                    let phone = document.getElementById('phone').value;
                     const password = document.getElementById('password').value;
 
+                    // Clean phone number (remove any remaining non-digits)
+                    phone = phone.replace(/\D/g, '');
+                    
+                    // Validate phone number
+                    if (phone.length !== 10) {
+                        alert('Please enter a valid 10-digit mobile number.');
+                        return;
+                    }
+
                     // Send account details and recommendations to the backend
                     const accountResponse = await fetch('/create_account_and_send_whatsapp', {
                         method: 'POST',
@@ -841,10 +868,33 @@
                     const result = await accountResponse.json();
 
                     if (result.success) {
-                        alert('Account created successfully! Recommendations sent to your WhatsApp.');
+                        // Show dynamic success message based on what was sent
+                        let successMessage = 'Account created successfully! ';
+                        if (result.details) {
+                            const whatsappSent = result.details.some(detail => detail.includes('WhatsApp message sent successfully'));
+                            const emailSent = result.details.some(detail => detail.includes('Email sent successfully'));
+                            
+                            if (whatsappSent && emailSent) {
+                                successMessage += 'Recommendations sent to your WhatsApp and email!';
+                            } else if (whatsappSent) {
+                                successMessage += 'Recommendations sent to your WhatsApp!';
+                            } else if (emailSent) {
+                                successMessage += 'Recommendations sent to your email!';
+                            } else {
+                                successMessage += 'Account created but there were issues sending messages.';
+                            }
+                        } else {
+                            successMessage += result.message || 'Recommendations sent!';
+                        }
+                        alert(successMessage);
                         displayRecommendations(recommendations);
                     } else {
-                        alert('Failed to create account: ' + result.error);
+                        // Show detailed error information
+                        let errorMessage = 'Failed to create account: ' + (result.error || result.message);
+                        if (result.details && result.details.length > 0) {
+                            errorMessage += '\n\nDetails:\n' + result.details.join('\n');
+                        }
+                        alert(errorMessage);
                     }
                 });