fixing phone

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py

@@ -34,6 +34,13 @@ def random_thumbnail_url(fake: Faker):
     return fake.image_url(width=32, height=32)
 
 
+def random_phone_number(faker: Faker) -> str:
+    # NOTE: faker.phone_number() does not validate with `phonenumbers` library.
+    phone = faker.random_element(["+41763456789", "+19104630364", "+13013044567"])
+    tail = f"{faker.pyint(100, 999)}"
+    return phone[: -len(tail)] + tail  # ensure phone keeps its length
+
+
 def _compute_hash(password: str) -> str:
     try:
         # 'passlib' will be used only if already installed.
@@ -105,7 +112,7 @@ def random_pre_registration_details(
         "pre_first_name": fake.first_name(),
         "pre_last_name": fake.last_name(),
         "pre_email": fake.email(),
-        "pre_phone": fake.phone_number(),
+        "pre_phone": random_phone_number(fake),
         "institution": fake.company(),
         "address": fake.address().replace("\n", ", "),
         "city": fake.city(),

services/web/server/tests/conftest.py

@@ -25,6 +25,7 @@
 from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
+from pytest_simcore.helpers.faker_factories import random_phone_number
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from pytest_simcore.helpers.webserver_login import LoggedUser
 from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
@@ -145,10 +146,8 @@ def fake_project(tests_data_dir: Path) -> ProjectDict:
 
 
 @pytest.fixture
-def user_phone(faker: Faker) -> PhoneNumberStr:
-    phone = faker.random_element(["+41763456789", "+19104630364", "+13013044567"])
-    tail = f"{faker.pyint(100, 999)}"
-    valid_phone = phone[: -len(tail)] + tail  # ensure phone keeps its length
+def user_phone_number(faker: Faker) -> PhoneNumberStr:
+    valid_phone = random_phone_number(faker)
     assert TypeAdapter(PhoneNumberStr).validate_python(valid_phone) == valid_phone
     return valid_phone
 
@@ -166,7 +165,10 @@ async def user(client: TestClient) -> AsyncIterator[UserInfoDict]:
 
 @pytest.fixture
 async def logged_user(
-    client: TestClient, user_role: UserRole, faker: Faker, user_phone: PhoneNumberStr
+    client: TestClient,
+    user_role: UserRole,
+    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ) -> AsyncIterator[UserInfoDict]:
     """adds a user in db and logs in with client
 
@@ -178,7 +180,7 @@ async def logged_user(
             "role": user_role.name,
             "first_name": faker.first_name(),
             "last_name": faker.last_name(),
-            "phone": user_phone,
+            "phone": user_phone_number,
         },
         check_if_succeeds=user_role != UserRole.ANONYMOUS,
     ) as user:

services/web/server/tests/unit/with_dbs/03/invitations/test_products_rest_invitations.py

@@ -23,6 +23,7 @@
 from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.users import UserRole
+from simcore_service_webserver.models import PhoneNumberStr
 
 
 @pytest.mark.parametrize(
@@ -131,13 +132,14 @@ async def test_pre_registration_and_invitation_workflow(
     expected_status: HTTPStatus,
     guest_email: str,
     faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ):
     requester_info = {
         "firstName": faker.first_name(),
         "lastName": faker.last_name(),
         "email": guest_email,
         "companyName": faker.company(),
-        "phone": faker.phone_number(),
+        "phone": user_phone_number,
         # billing info
         "address": faker.address().replace("\n", ", "),
         "city": faker.city(),

services/web/server/tests/unit/with_dbs/03/invitations/test_users_accounts_rest_registration.py

@@ -42,6 +42,7 @@
     users_pre_registration_details,
 )
 from simcore_service_webserver.db.plugin import get_asyncpg_engine
+from simcore_service_webserver.models import PhoneNumberStr
 
 
 @pytest.fixture
@@ -115,13 +116,16 @@ async def test_access_rights_on_search_users_only_product_owners_can_access(
 
 
 @pytest.fixture
-def account_request_form(faker: Faker) -> dict[str, Any]:
+def account_request_form(
+    faker: Faker,
+    user_phone_number: PhoneNumberStr,
+) -> dict[str, Any]:
     # This is AccountRequestInfo.form
     form = {
         "firstName": faker.first_name(),
         "lastName": faker.last_name(),
         "email": faker.email(),
-        "phone": faker.phone_number(),
+        "phone": user_phone_number,
         "company": faker.company(),
         # billing info
         "address": faker.address().replace("\n", ", "),

services/web/server/tests/unit/with_dbs/03/login/conftest.py

@@ -76,11 +76,6 @@ def app_environment(
     return {**app_environment, **envs_plugins, **envs_login, **envs_twilio}
 
 
-@pytest.fixture
-def user_phone_number(faker: Faker) -> str:
-    return faker.phone_number()
-
-
 @pytest.fixture
 def fake_weak_password(faker: Faker) -> str:
     return faker.password(

services/web/server/tests/unit/with_dbs/03/test_users_rest_models.py

@@ -14,20 +14,23 @@
 from faker import Faker
 from models_library.api_schemas_webserver.auth import AccountRequestInfo
 from pytest_simcore.helpers.faker_factories import random_pre_registration_details
+from simcore_service_webserver.models import PhoneNumberStr
 from simcore_service_webserver.users._controller.rest._rest_schemas import (
     MAX_BYTES_SIZE_EXTRAS,
     UserAccountRestPreRegister,
 )
 
 
 @pytest.fixture
-def account_request_form(faker: Faker) -> dict[str, Any]:
+def account_request_form(
+    faker: Faker, user_phone_number: PhoneNumberStr
+) -> dict[str, Any]:
     # This is AccountRequestInfo.form
     form = {
         "firstName": faker.first_name(),
         "lastName": faker.last_name(),
         "email": faker.email(),
-        "phone": faker.phone_number(),
+        "phone": user_phone_number,
         "company": faker.company(),
         # billing info
         "address": faker.address().replace("\n", ", "),

services/web/server/tests/unit/with_dbs/03/test_users_rest_profiles.py

@@ -17,7 +17,6 @@
 from aiohttp.test_utils import TestClient
 from aiopg.sa.connection import SAConnection
 from common_library.users_enums import UserRole
-from faker import Faker
 from models_library.api_schemas_webserver.groups import GroupUserGet
 from models_library.api_schemas_webserver.users import (
     MyProfileRestGet,
@@ -33,6 +32,7 @@
 from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
+from simcore_service_webserver.models import PhoneNumberStr
 from simcore_service_webserver.user_preferences._service import (
     get_frontend_user_preferences_aggregation,
 )
@@ -602,7 +602,7 @@ async def test_phone_registration_basic_workflow(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
@@ -615,7 +615,7 @@ async def test_phone_registration_basic_workflow(
     initial_phone = initial_profile.phone
 
     # REGISTER phone number
-    new_phone = faker.phone_number()
+    new_phone = user_phone_number
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",
@@ -658,7 +658,7 @@ async def test_phone_registration_workflow(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
@@ -671,7 +671,7 @@ async def test_phone_registration_workflow(
     initial_phone = initial_profile.phone
 
     # STEP 1: REGISTER phone number
-    new_phone = faker.phone_number()
+    new_phone = user_phone_number
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",
@@ -714,12 +714,12 @@ async def test_phone_registration_with_resend(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
     # STEP 1: REGISTER phone number
-    new_phone = faker.phone_number()
+    new_phone = user_phone_number
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",
@@ -760,12 +760,12 @@ async def test_phone_registration_change_existing_phone(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
     # Set initial phone
-    first_phone = faker.phone_number()
+    first_phone = user_phone_number
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",
@@ -785,7 +785,8 @@ async def test_phone_registration_change_existing_phone(
     await assert_status(resp, status.HTTP_204_NO_CONTENT)
 
     # Change to new phone
-    new_phone = faker.phone_number()
+    # Create a different phone number by changing the last digits
+    new_phone = user_phone_number[:-4] + "9999"
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",
@@ -859,12 +860,12 @@ async def test_phone_confirm_with_wrong_code(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
     # STEP 1: REGISTER phone number
-    new_phone = faker.phone_number()
+    new_phone = user_phone_number
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",
@@ -890,12 +891,12 @@ async def test_phone_confirm_with_invalid_code_format(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
     # STEP 1: REGISTER phone number
-    new_phone = faker.phone_number()
+    new_phone = user_phone_number
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",
@@ -950,12 +951,12 @@ async def test_phone_confirm_with_empty_code(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
     # STEP 1: REGISTER phone number
-    new_phone = faker.phone_number()
+    new_phone = user_phone_number
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",
@@ -988,7 +989,7 @@ async def test_phone_register_access_rights(
     logged_user: UserInfoDict,
     client: TestClient,
     expected: HTTPStatus,
-    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
@@ -997,7 +998,7 @@ async def test_phone_register_access_rights(
     resp = await client.post(
         f"{url}",
         json={
-            "phone": faker.phone_number(),
+            "phone": user_phone_number,
         },
     )
     await assert_status(resp, expected)

services/web/server/tests/unit/with_dbs/04/wallets/payments/conftest.py

@@ -39,6 +39,7 @@
     users_pre_registration_details,
 )
 from simcore_service_webserver.db.models import UserRole
+from simcore_service_webserver.models import PhoneNumberStr
 from simcore_service_webserver.payments._methods_api import (
     _fake_cancel_creation_of_wallet_payment_method,
     _fake_delete_wallet_payment_method,
@@ -320,7 +321,10 @@ async def _get_invoice_url(
 
 @pytest.fixture
 def setup_user_pre_registration_details_db(
-    postgres_db: sa.engine.Engine, logged_user: UserInfoDict, faker: Faker
+    postgres_db: sa.engine.Engine,
+    logged_user: UserInfoDict,
+    faker: Faker,
+    user_phone_number: PhoneNumberStr,
 ) -> Iterator[int]:
     with postgres_db.connect() as con:
         result = con.execute(
@@ -330,7 +334,7 @@ def setup_user_pre_registration_details_db(
                 pre_email=faker.email(),
                 pre_first_name=faker.first_name(),
                 pre_last_name=faker.last_name(),
-                pre_phone=faker.phone_number(),
+                pre_phone=user_phone_number,
                 institution=faker.company(),
                 address=faker.address().replace("\n", ", "),
                 city=faker.city(),