drafting tests for users repository

Author: pcrespov

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

@@ -319,6 +319,7 @@ async def search_users_and_get_profile(
     connection: AsyncConnection | None = None,
     *,
     email_like: str,
+    product_name: ProductName | None = None,
 ) -> list[Row]:
     users_alias = sa.alias(users, name="users_alias")
 
@@ -352,12 +353,16 @@ async def search_users_and_get_profile(
             invited_by,
         )
 
+        join_condition = users.c.id == users_pre_registration_details.c.user_id
+        if product_name:
+            join_condition = join_condition & (
+                users_pre_registration_details.c.product_name == product_name
+            )
+
         left_outer_join = (
             sa.select(*columns)
             .select_from(
-                users_pre_registration_details.outerjoin(
-                    users, users.c.id == users_pre_registration_details.c.user_id
-                )
+                users_pre_registration_details.outerjoin(users, join_condition)
             )
             .where(users_pre_registration_details.c.pre_email.like(email_like))
         )
@@ -366,7 +371,7 @@ async def search_users_and_get_profile(
             .select_from(
                 users.outerjoin(
                     users_pre_registration_details,
-                    users.c.id == users_pre_registration_details.c.user_id,
+                    join_condition,
                 )
             )
             .where(users.c.email.like(email_like))
@@ -412,22 +417,27 @@ async def get_user_products(
         return [row async for row in result]
 
 
-async def create_user_details(
+async def create_user_pre_registration(
     engine: AsyncEngine,
     connection: AsyncConnection | None = None,
     *,
     email: str,
     created_by: UserID,
+    product_name: ProductName,
     **other_values,
-) -> None:
+) -> int:
     async with transaction_context(engine, connection) as conn:
-        await conn.execute(
-            sa.insert(users_pre_registration_details).values(
+        result = await conn.execute(
+            sa.insert(users_pre_registration_details)
+            .values(
                 created_by=created_by,
                 pre_email=email,
+                product_name=product_name,
                 **other_values,
             )
+            .returning(users_pre_registration_details.c.id)
         )
+        return result.scalar_one()
 
 
 async def get_user_billing_details(

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

@@ -1,5 +1,6 @@
 import logging
 from contextlib import suppress
+from itertools import product
 
 from aiohttp import web
 from models_library.api_schemas_webserver.users import (
@@ -195,7 +196,10 @@ async def pre_register_user_for_admin(request: web.Request) -> web.Response:
     pre_user_profile = await parse_request_body_as(PreRegisteredUserGet, request)
 
     user_profile = await _users_service.pre_register_user(
-        request.app, profile=pre_user_profile, creator_user_id=req_ctx.user_id
+        request.app,
+        profile=pre_user_profile,
+        creator_user_id=req_ctx.user_id,
+        product_name=req_ctx.product_name,
     )
     return envelope_json_response(
         user_profile.model_dump(**_RESPONSE_MODEL_MINIMAL_POLICY)

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

@@ -41,12 +41,14 @@
 
 async def pre_register_user(
     app: web.Application,
+    *,
     profile: PreRegisteredUserGet,
     creator_user_id: UserID,
+    product_name: ProductName,
 ) -> UserForAdminGet:
 
     found = await search_users_as_admin(
-        app, email_glob=profile.email, include_products=False
+        app, email_glob=profile.email, product_name=product_name, include_products=False
     )
     if found:
         raise AlreadyPreRegisteredError(num_found=len(found), email=profile.email)
@@ -71,15 +73,16 @@ async def pre_register_user(
         if key in details:
             details[f"pre_{key}"] = details.pop(key)
 
-    await _users_repository.create_user_details(
+    await _users_repository.create_user_pre_registration(
         get_asyncpg_engine(app),
         email=profile.email,
         created_by=creator_user_id,
+        product_name=product_name,
         **details,
     )
 
     found = await search_users_as_admin(
-        app, email_glob=profile.email, include_products=False
+        app, email_glob=profile.email, product_name=product_name, include_products=False
     )
 
     assert len(found) == 1  # nosec
@@ -130,7 +133,11 @@ async def get_user_id_from_gid(app: web.Application, primary_gid: GroupID) -> Us
 
 
 async def search_users_as_admin(
-    app: web.Application, email_glob: str, *, include_products: bool = False
+    app: web.Application,
+    *,
+    email_glob: str,
+    product_name: ProductName | None = None,
+    include_products: bool = False,
 ) -> list[UserForAdminGet]:
     """
     WARNING: this information is reserved for admin users. Note that the returned model include UserForAdminGet
@@ -148,7 +155,9 @@ def _glob_to_sql_like(glob_pattern: str) -> str:
         return sql_like_pattern.replace("*", "%").replace("?", "_")
 
     rows = await _users_repository.search_users_and_get_profile(
-        get_asyncpg_engine(app), email_like=_glob_to_sql_like(email_glob)
+        get_asyncpg_engine(app),
+        email_like=_glob_to_sql_like(email_glob),
+        product_name=product_name,
     )
 
     async def _list_products_or_none(user_id):