refactor: improve code readability by restructuring class inheritance and renaming variables

Author: pcrespov

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

@@ -241,16 +241,14 @@ def from_domain_model(cls, data):
 
 
 class UsersForAdminListFilter(Filters):
-    # TODO: create a filter for two views that OM needs
-    #
     # 1. States of an Account Resquest: PENDING, REJECTED, APPROVED
     # 2. If APPROVED AND user uses the invitation link, then it can be in any of these states:
     #    CONFIRMATION_PENDING, ACTIVE, EXPIRED, BANNED, DELETED
     #
     status: Literal["PENDING"] | None = None
 
 
-class UsersForAdminListQueryParams(PageQueryParameters, UsersForAdminListFilter): ...
+class UsersForAdminListQueryParams(UsersForAdminListFilter, PageQueryParameters): ...
 
 
 class UserApprove(InputSchema):

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

@@ -138,13 +138,14 @@ async def link_and_update_user_from_pre_registration(
                     users_pre_registration_details.c.pre_email == new_user_email
                 )
             )
-            if details := result.first():
+            if pre_registration_details_data := result.first():
+                # NOTE: could have many products! which to use?
                 await conn.execute(
                     users.update()
                     .where(users.c.id == new_user_id)
                     .values(
-                        first_name=details.pre_first_name,  # type: ignore[union-attr]
-                        last_name=details.pre_last_name,  # type: ignore[union-attr]
+                        first_name=pre_registration_details_data.pre_first_name,  # type: ignore[union-attr]
+                        last_name=pre_registration_details_data.pre_last_name,  # type: ignore[union-attr]
                     )
                 )
 

packages/postgres-database/tests/test_users_details.py

@@ -10,15 +10,18 @@
 import pytest
 import sqlalchemy as sa
 from aiopg.sa.result import RowProxy
+from common_library.groups_enums import GroupType
 from faker import Faker
 from pytest_simcore.helpers.faker_factories import (
+    random_group,
     random_pre_registration_details,
     random_product,
     random_user,
 )
 from pytest_simcore.helpers.postgres_tools import (
     insert_and_get_row_lifespan,
 )
+from simcore_postgres_database.models.groups import groups
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.users import UserRole, UserStatus, users
 from simcore_postgres_database.models.users_details import (
@@ -33,17 +36,25 @@
 
 
 @pytest.fixture
-async def product_name(
+async def product(
     faker: Faker,
     asyncpg_engine: AsyncEngine,
-) -> AsyncIterable[str]:
-    async with insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+) -> AsyncIterable[dict[str, Any]]:
+    async with insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup  # noqa: SIM117
         asyncpg_engine,
-        table=products,
-        values=random_product(fake=faker, name="s4l"),
+        table=groups,
+        values=random_group(faker=faker, type=GroupType.STANDARD.name),
         pk_col=products.c.name,
-    ) as row:
-        yield row["name"]
+    ) as product_group:
+        async with insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+            asyncpg_engine,
+            table=products,
+            values=random_product(
+                fake=faker, name="s4l", group_id=product_group["gid"]
+            ),
+            pk_col=products.c.name,
+        ) as row:
+            yield row
 
 
 @pytest.fixture
@@ -67,8 +78,10 @@ async def test_user_creation_workflow(
     asyncpg_engine: AsyncEngine,
     faker: Faker,
     po_user: dict[str, Any],
-    product_name: str,
+    product: dict[str, Any],
 ):
+    product_name = product["name"]
+
     # a PO creates an invitation
     fake_pre_registration_data = random_pre_registration_details(
         faker, created_by=po_user["id"], product_name=product_name

services/web/server/src/simcore_service_webserver/login/_controller/rest/preregistration.py

@@ -57,7 +57,10 @@ def _get_ipinfo(request: web.Request) -> dict[str, Any]:
     }
 
 
-@routes.post(f"/{API_VTAG}/auth/request-account", name="request_product_account")
+@routes.post(
+    f"/{API_VTAG}/auth/request-account",
+    name="request_product_account",
+)
 @global_rate_limit_route(number_of_requests=30, interval_seconds=MINUTE)
 async def request_product_account(request: web.Request):
     product = products_web.get_current_product(request)