Merge pull request #6 from jpizquierdo/validation-url-contact-fix

Fix validation error in vCard when website is requested

Author: jpizquierdo

app/app.py

@@ -126,27 +126,34 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
     elif user_state == UserState.AWAITING_TITLE:
         context.user_data["title"] = update.message.text
         context.user_data["state"] = UserState.AWAITING_WEBSITE
-        await update.message.reply_text("Please send the URL 🔗:")
+        await update.message.reply_text("Please send the Website URL 🔗:")
     elif user_state == UserState.AWAITING_WEBSITE:
-        qr_code = await generate_contact_qr(
-            ContactQR(
-                name=context.user_data["name"],
-                surname=context.user_data["surname"],
-                phone_number=context.user_data["phone_number"],
-                email=context.user_data["email"],
-                company=context.user_data["company"],
-                title=context.user_data["title"],
-                url=update.message.text.strip(),
+        try:
+            qr_code = await generate_contact_qr(
+                ContactQR(
+                    name=context.user_data["name"],
+                    surname=context.user_data["surname"],
+                    phone_number=context.user_data["phone_number"],
+                    email=context.user_data["email"],
+                    company=context.user_data["company"],
+                    title=context.user_data["title"],
+                    url=update.message.text.strip(),
+                )
             )
-        )
+        except ValidationError:
+            await update.message.reply_text(
+                "❌ Invalid URL. Please send a valid URL starting with 'http://' or 'https://'."
+            )
+            return None
+
         await update.message.reply_photo(
             photo=qr_code, caption="📇 Scan to read de vcard 📞"
         )
         context.user_data.clear()
         await command_options(update, context)
 
     else:  # pragma: no cover
-        logger.error("❌ Invalid state. Please try again.")
+        logger.debug("❌ Invalid state. Please try again.")
         await command_options(update, context)
 
 
@@ -174,7 +181,6 @@ async def command_options(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
 async def button_callback(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     query = update.callback_query
     await query.answer()
-
     if query.data == "contact_info":
         await query.message.reply_text("Please send the name:")
         context.user_data["state"] = UserState.AWAITING_NAME

tests/test_handle_message.py

@@ -4,7 +4,7 @@
 from app.app import handle_message
 from app.core.models import UserState, URLQR, WifiQR, ContactQR
 from app.qrcodegen import generate_wifi_qr, generate_contact_qr, generate_url_qr
-from pydantic import ValidationError
+
 
 @pytest.mark.asyncio
 async def test_handle_message_awaiting_url():
@@ -32,6 +32,7 @@ async def test_handle_message_awaiting_url():
         photo=actual_call, caption="Here is your QR code!"
     )
 
+
 @pytest.mark.asyncio
 async def test_handle_message_awaiting_url_invalid():
 
@@ -41,13 +42,15 @@ async def test_handle_message_awaiting_url_invalid():
     context.user_data = {"state": UserState.AWAITING_URL}
     test_url = "invalid-url.com"
     update.message.text = test_url
-    
+
     await handle_message(update, context)
-    assert(context.user_data["state"]==UserState.AWAITING_URL)
-        # Assert that the bot sends an error message
+    assert context.user_data["state"] == UserState.AWAITING_URL
+    # Assert that the bot sends an error message
     update.message.reply_text.assert_called_once_with(
         "❌ Invalid URL. Please send a valid URL starting with 'http://' or 'https://'."
     )
+
+
 @pytest.mark.asyncio
 async def test_handle_message_awaiting_ssid():
     # Mock Update and Context
@@ -66,6 +69,8 @@ async def test_handle_message_awaiting_ssid():
 
     # Assert that the state is updated
     assert context.user_data["state"] == UserState.AWAITING_PASSWORD
+
+
 @pytest.mark.asyncio
 async def test_handle_message_awaiting_ssid_invalid():
 
@@ -75,14 +80,15 @@ async def test_handle_message_awaiting_ssid_invalid():
     context.user_data = {"state": UserState.AWAITING_SSID}
     test_ssid = "TestSSIDTestSSIDTestSSIDTestSSIDTestSSIDTestSSIDTestSSIDTestSSIDTestSSIDTestSSIDTestSSIDTestSSID"
     update.message.text = test_ssid
-    
+
     await handle_message(update, context)
-    assert(context.user_data["state"]==UserState.AWAITING_SSID)
-        # Assert that the bot sends an error message
+    assert context.user_data["state"] == UserState.AWAITING_SSID
+    # Assert that the bot sends an error message
     update.message.reply_text.assert_called_once_with(
         "❌ Invalid SSID. Please send a valid SSID (1-32 characters)."
     )
 
+
 @pytest.mark.asyncio
 async def test_handle_message_awaiting_password():
     # Mock Update and Context
@@ -110,6 +116,8 @@ async def test_handle_message_awaiting_password():
     assert context.user_data == {}
     # Assert by content
     assert update.message.reply_photo.call_count == 1
+
+
 @pytest.mark.asyncio
 async def test_handle_message_awaiting_password_invalid():
 
@@ -119,14 +127,15 @@ async def test_handle_message_awaiting_password_invalid():
     context.user_data = {"state": UserState.AWAITING_PASSWORD, "ssid": "TestSSID"}
     test_password = "T"
     update.message.text = test_password
-    
+
     await handle_message(update, context)
-    assert(context.user_data["state"]==UserState.AWAITING_PASSWORD)
-        # Assert that the bot sends an error message
+    assert context.user_data["state"] == UserState.AWAITING_PASSWORD
+    # Assert that the bot sends an error message
     update.message.reply_text.assert_called_once_with(
         "❌ Invalid SSID or Password. Please send a valid SSID (1-32 characters) and a Valid Password between 8 and 63 characters."
     )
 
+
 @pytest.mark.asyncio
 async def test_handle_message_awaiting_name():
     # Mock Update and Context
@@ -221,6 +230,7 @@ async def test_handle_message_awaiting_email():
     assert context.user_data["state"] == UserState.AWAITING_COMPANY
     assert context.user_data["email"] == test_email
 
+
 @pytest.mark.asyncio
 async def test_handle_message_awaiting_email_invalid():
 
@@ -235,13 +245,15 @@ async def test_handle_message_awaiting_email_invalid():
     }
     test_email = "joelperez91.gmail.com"
     update.message.text = test_email
-    
+
     await handle_message(update, context)
-    assert(context.user_data["state"]==UserState.AWAITING_EMAIL)
-        # Assert that the bot sends an error message
+    assert context.user_data["state"] == UserState.AWAITING_EMAIL
+    # Assert that the bot sends an error message
     update.message.reply_text.assert_called_once_with(
         "❌ Invalid email. Please send a valid email address."
     )
+
+
 @pytest.mark.asyncio
 async def test_handle_message_awaiting_company():
     # Mock Update and Context
@@ -290,7 +302,7 @@ async def test_handle_message_awaiting_title():
     await handle_message(update, context)
 
     # Assert that the bot asks for the website URL
-    update.message.reply_text.assert_called_once_with("Please send the URL 🔗:")
+    update.message.reply_text.assert_called_once_with("Please send the Website URL 🔗:")
 
     # Assert that the state is updated
     assert context.user_data["state"] == UserState.AWAITING_WEBSITE
@@ -343,4 +355,3 @@ async def test_handle_message_awaiting_website():
     )
     # Assert that user data is cleared
     assert context.user_data == {}
-