autogenerate username > 4

Author: pcrespov

packages/models-library/tests/test_api_schemas_webserver_users.py

@@ -1,7 +1,7 @@
 # pylint: disable=redefined-outer-name
+# pylint: disable=too-many-arguments
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
-# pylint: disable=too-many-arguments
 
 from copy import deepcopy
 

packages/postgres-database/src/simcore_postgres_database/utils_users.py

@@ -6,6 +6,7 @@
 import secrets
 import string
 from datetime import datetime
+from typing import Final
 
 import sqlalchemy as sa
 from aiopg.sa.connection import SAConnection
@@ -25,19 +26,29 @@ class UserNotFoundInRepoError(BaseUserRepoError):
     pass
 
 
+# NOTE: see MyProfilePatch.user_name
+_MIN_USERNAME_LEN: Final[int] = 4
+
+
+def _generate_random_chars(length: int = _MIN_USERNAME_LEN) -> str:
+    """returns `length` random digit character"""
+    return "".join(secrets.choice(string.digits) for _ in range(length))
+
+
 def _generate_username_from_email(email: str) -> str:
     username = email.split("@")[0]
 
     # Remove any non-alphanumeric characters and convert to lowercase
-    return re.sub(r"[^a-zA-Z0-9]", "", username).lower()
+    username = re.sub(r"[^a-zA-Z0-9]", "", username).lower()
 
+    # Ensure the username is at least 4 characters long
+    if len(username) < _MIN_USERNAME_LEN:
+        username += _generate_random_chars(length=_MIN_USERNAME_LEN - len(username))
 
-def _generate_random_chars(length=5) -> str:
-    """returns `length` random digit character"""
-    return "".join(secrets.choice(string.digits) for _ in range(length - 1))
+    return username
 
 
-def generate_alternative_username(username) -> str:
+def generate_alternative_username(username: str) -> str:
     return f"{username}_{_generate_random_chars()}"
 
 

services/web/server/src/simcore_service_webserver/users/_users_repository.py

@@ -557,11 +557,12 @@ async def update_user_profile(
                 )
 
         except IntegrityError as err:
-            user_name = updated_values.get("name")
-
-            raise UserNameDuplicateError(
-                user_name=user_name,
-                alternative_user_name=generate_alternative_username(user_name),
-                user_id=user_id,
-                updated_values=updated_values,
-            ) from err
+            if user_name := updated_values.get("name"):
+                raise UserNameDuplicateError(
+                    user_name=user_name,
+                    alternative_user_name=generate_alternative_username(user_name),
+                    user_id=user_id,
+                    updated_values=updated_values,
+                ) from err
+
+            raise  # not due to name duplication

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

@@ -1,7 +1,8 @@
+# pylint: disable=protected-access
 # pylint: disable=redefined-outer-name
+# pylint: disable=too-many-arguments
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
-# pylint: disable=too-many-arguments
 
 from datetime import UTC, datetime
 from typing import Any
@@ -16,6 +17,7 @@
 from models_library.generics import Envelope
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
+from simcore_postgres_database import utils_users
 from simcore_service_webserver.users._common.models import ToUserUpdateDB
 
 
@@ -136,3 +138,12 @@ def test_mapping_update_models_from_rest_to_db():
         "name": "foo1234",
         "privacy_hide_fullname": False,
     }
+
+
+def test_utils_user_generates_valid_myprofile_patch():
+    username = utils_users._generate_username_from_email("[email protected]")  # noqa: SLF001
+
+    MyProfilePatch.model_validate({"userName": username})
+    MyProfilePatch.model_validate(
+        {"userName": utils_users.generate_alternative_username(username)}
+    )