renaming

Author: pcrespov

api/specs/web-server/_users_admin.py

@@ -19,7 +19,7 @@
 from models_library.generics import Envelope
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.users.schemas import PreRegisteredUserGet
+from simcore_service_webserver.users.schemas import UserAccountRestPreRegister
 
 router = APIRouter(prefix=f"/{API_VTAG}", tags=["users"])
 
@@ -69,4 +69,4 @@ async def search_user_accounts(
     response_model=Envelope[UserAccountGet],
     tags=_extra_tags,
 )
-async def pre_register_user_account(_body: PreRegisteredUserGet): ...
+async def pre_register_user_account(_body: UserAccountRestPreRegister): ...

services/web/server/src/simcore_service_webserver/login_accounts/_controller_rest.py

@@ -29,7 +29,7 @@
 from ..security.decorators import permission_required
 from ..session import api as session_service
 from ..users import users_service
-from ..users.schemas import PreRegisteredUserGet
+from ..users.schemas import UserAccountRestPreRegister
 from ..utils import MINUTE
 from ..utils_rate_limiting import global_rate_limit_route
 from ..web_utils import flash_response
@@ -91,7 +91,7 @@ async def request_product_account(request: web.Request):
     # create pre-regiatration or raise if already exists
     await _service.create_pre_registration(
         request.app,
-        profile=PreRegisteredUserGet.model_validate(body.form),
+        profile=UserAccountRestPreRegister.model_validate(body.form),
         product_name=product.name,
     )
 

services/web/server/src/simcore_service_webserver/login_accounts/_service.py

@@ -18,7 +18,7 @@
 from ..products import products_web
 from ..products.models import Product
 from ..users import _accounts_service
-from ..users.schemas import PreRegisteredUserGet
+from ..users.schemas import UserAccountRestPreRegister
 
 _logger = logging.getLogger(__name__)
 
@@ -133,7 +133,10 @@ def _run() -> tuple[str, bytes]:
 
 
 async def create_pre_registration(
-    app: web.Application, *, profile: PreRegisteredUserGet, product_name: ProductName
+    app: web.Application,
+    *,
+    profile: UserAccountRestPreRegister,
+    product_name: ProductName,
 ):
 
     await _accounts_service.pre_register_user(

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

@@ -18,7 +18,7 @@
     AlreadyPreRegisteredError,
     PendingPreRegistrationNotFoundError,
 )
-from .schemas import PreRegisteredUserGet
+from .schemas import UserAccountRestPreRegister
 
 _logger = logging.getLogger(__name__)
 
@@ -30,7 +30,7 @@
 async def pre_register_user(
     app: web.Application,
     *,
-    profile: PreRegisteredUserGet,
+    profile: UserAccountRestPreRegister,
     creator_user_id: UserID | None,
     product_name: ProductName,
 ) -> UserAccountGet:

services/web/server/src/simcore_service_webserver/users/_controller/rest/_rest_schemas.py

@@ -25,7 +25,7 @@ class UsersRequestContext(AuthenticatedRequestContext): ...
 MAX_BYTES_SIZE_EXTRAS: Final[int] = 512
 
 
-class PreRegisteredUserGet(InputSchema):
+class UserAccountRestPreRegister(InputSchema):
     # NOTE: validators need pycountry!
 
     first_name: str
@@ -105,7 +105,7 @@ def _pre_check_and_normalize_country(cls, v):
         return v
 
 
-assert set(PreRegisteredUserGet.model_fields).issubset(  # nosec
+assert set(UserAccountRestPreRegister.model_fields).issubset(  # nosec
     # asserts field names are in sync
     UserAccountGet.model_fields
 )

services/web/server/src/simcore_service_webserver/users/_controller/rest/accounts_rest.py

@@ -30,7 +30,7 @@
 from ....utils_aiohttp import create_json_response_from_page, envelope_json_response
 from ... import _accounts_service
 from ._rest_exceptions import handle_rest_requests_exceptions
-from ._rest_schemas import PreRegisteredUserGet, UsersRequestContext
+from ._rest_schemas import UserAccountRestPreRegister, UsersRequestContext
 
 _logger = logging.getLogger(__name__)
 
@@ -125,7 +125,7 @@ async def search_user_accounts(request: web.Request) -> web.Response:
 @handle_rest_requests_exceptions
 async def pre_register_user_account(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
-    pre_user_profile = await parse_request_body_as(PreRegisteredUserGet, request)
+    pre_user_profile = await parse_request_body_as(UserAccountRestPreRegister, request)
 
     user_profile = await _accounts_service.pre_register_user(
         request.app,

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

@@ -1,6 +1,9 @@
-from ._controller.rest._rest_schemas import PreRegisteredUserGet, UsersRequestContext
+from ._controller.rest._rest_schemas import (
+    UserAccountRestPreRegister,
+    UsersRequestContext,
+)
 
-__all__: tuple[str, ...] = ("PreRegisteredUserGet", "UsersRequestContext")
+__all__: tuple[str, ...] = ("UserAccountRestPreRegister", "UsersRequestContext")
 
 
 # nopycln: file

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

@@ -16,7 +16,7 @@
 from pytest_simcore.helpers.faker_factories import random_pre_registration_details
 from simcore_service_webserver.users._controller.rest._rest_schemas import (
     MAX_BYTES_SIZE_EXTRAS,
-    PreRegisteredUserGet,
+    UserAccountRestPreRegister,
 )
 
 
@@ -66,7 +66,7 @@ def test_preuserprofile_parse_model_from_request_form_data(
     data["comment"] = "extra comment"
 
     # pre-processors
-    pre_user_profile = PreRegisteredUserGet(**data)
+    pre_user_profile = UserAccountRestPreRegister(**data)
 
     print(pre_user_profile.model_dump_json(indent=1))
 
@@ -90,11 +90,11 @@ def test_preuserprofile_parse_model_without_extras(
 ):
     required = {
         f.alias or f_name
-        for f_name, f in PreRegisteredUserGet.model_fields.items()
+        for f_name, f in UserAccountRestPreRegister.model_fields.items()
         if f.is_required()
     }
     data = {k: account_request_form[k] for k in required}
-    assert not PreRegisteredUserGet(**data).extras
+    assert not UserAccountRestPreRegister(**data).extras
 
 
 def test_preuserprofile_max_bytes_size_extras_limits(faker: Faker):
@@ -114,7 +114,7 @@ def test_preuserprofile_pre_given_names(
     account_request_form["firstName"] = given_name
     account_request_form["lastName"] = given_name
 
-    pre_user_profile = PreRegisteredUserGet(**account_request_form)
+    pre_user_profile = UserAccountRestPreRegister(**account_request_form)
     print(pre_user_profile.model_dump_json(indent=1))
     assert pre_user_profile.first_name in ["Pedro-Luis", "Pedro Luis"]
     assert pre_user_profile.first_name == pre_user_profile.last_name