fixes phones

Author: pcrespov

packages/models-library/src/models_library/api_schemas_webserver/auth.py

@@ -5,6 +5,7 @@
 from models_library.rest_base import RequestParameters
 from pydantic import AliasGenerator, ConfigDict, Field, HttpUrl, SecretStr
 from pydantic.alias_generators import to_camel
+from pydantic.config import JsonDict
 
 from ..emails import LowerCaseEmailStr
 from ._base import InputSchema, OutputSchema
@@ -14,33 +15,39 @@ class AccountRequestInfo(InputSchema):
     form: dict[str, Any]
     captcha: str
 
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        schema.update(
+            {
+                "example": {
+                    "form": {
+                        "firstName": "James",
+                        "lastName": "Maxwel",
+                        "email": "[email protected]",
+                        "phone": "+41 44 245 96 96",
+                        "company": "EM Com",
+                        "address": "Infinite Loop",
+                        "city": "Washington",
+                        "postalCode": "98001",
+                        "country": "Switzerland",
+                        "application": "Antenna_Design",
+                        "description": "Description of something",
+                        "hear": "Search_Engine",
+                        "privacyPolicy": True,
+                        "eula": True,
+                    },
+                    "captcha": "A12B34",
+                }
+            }
+        )
+
     model_config = ConfigDict(
         str_strip_whitespace=True,
         str_max_length=200,
         # NOTE: this is just informative. The format of the form is defined
         # currently in the front-end and it might change
         # SEE image in  https://github.com/ITISFoundation/osparc-simcore/pull/5378
-        json_schema_extra={
-            "example": {
-                "form": {
-                    "firstName": "James",
-                    "lastName": "Maxwel",
-                    "email": "[email protected]",
-                    "phone": "+1 123456789",
-                    "company": "EM Com",
-                    "address": "Infinite Loop",
-                    "city": "Washington",
-                    "postalCode": "98001",
-                    "country": "USA",
-                    "application": "Antenna_Design",
-                    "description": "Description of something",
-                    "hear": "Search_Engine",
-                    "privacyPolicy": True,
-                    "eula": True,
-                },
-                "captcha": "A12B34",
-            }
-        },
+        json_schema_extra=_update_json_schema_extra,
     )
 
 

services/web/server/tests/unit/isolated/test_models.py

@@ -14,26 +14,37 @@
     PhoneNumberStr,
 )
 
-multiple_format_valid_phone_numbers = [
-    "+41763456789",
-    "+19104630364",
-    "+1 301-304-4567",
-] + [
-    # tests hand-made random_phone_number
-    # WARNING: keed constant since pytest-xdist will run this test in parallel
-    random_phone_number(Faker(seed=42))
-    for _ in range(6)
-]
-
-
-@pytest.mark.parametrize("phone", multiple_format_valid_phone_numbers)
+
+@pytest.mark.parametrize(
+    "phone",
+    [
+        "+41763456789",
+        "+19104630364",
+        "+1 301-304-4567",
+        "+41763456686",
+        "+19104630873",
+        "+19104630424",
+        "+34 950 453 772",
+        "+19104630700",
+        "+13013044719",
+    ],
+)
 def test_valid_phone_numbers(phone: str):
     # This test is used to tune options of PhoneNumberValidator
     assert MyPhoneRegister.model_validate({"phone": phone}).phone == TypeAdapter(
         PhoneNumberStr
     ).validate_python(phone)
 
 
+def test_random_phone_number():
+    # This test is used to tune options of PhoneNumberValidator
+    for _ in range(10):
+        phone = random_phone_number(Faker(seed=42))
+        assert MyPhoneRegister.model_validate({"phone": phone}).phone == TypeAdapter(
+            PhoneNumberStr
+        ).validate_python(phone)
+
+
 @pytest.mark.parametrize(
     "phone",
     [

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

@@ -90,6 +90,7 @@ async def test_wrong_confirm_pass(client: TestClient, new_password: str):
                     "field": "confirm",
                 }
             ],
+            "message": "Invalid field/s 'confirm' in request body",
         }
 
 

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

@@ -107,6 +107,7 @@ async def test_register_body_validation(
                 "field": "confirm",
             },
         ],
+        "message": "Invalid field/s 'email, confirm' in request body",
     }
 
 

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

@@ -602,7 +602,6 @@ async def test_phone_registration_basic_workflow(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
@@ -613,9 +612,11 @@ async def test_phone_registration_basic_workflow(
 
     initial_profile = MyProfileRestGet.model_validate(data)
     initial_phone = initial_profile.phone
+    assert initial_phone
 
     # REGISTER phone number
-    new_phone = user_phone_number
+    # Change the last 3 digits of the initial phone number to '999'
+    new_phone = f"{initial_phone[:-3]}999"
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",
@@ -658,7 +659,6 @@ async def test_phone_registration_workflow(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    user_phone_number: PhoneNumberStr,
 ):
     assert client.app
 
@@ -669,9 +669,10 @@ async def test_phone_registration_workflow(
 
     initial_profile = MyProfileRestGet.model_validate(data)
     initial_phone = initial_profile.phone
+    assert initial_phone
 
     # STEP 1: REGISTER phone number
-    new_phone = user_phone_number
+    new_phone = f"{initial_phone[:-3]}999"  # Change the last 3 digits to '999'
     url = client.app.router["my_phone_register"].url_for()
     resp = await client.post(
         f"{url}",