✨ users: Update user schema and repository queries to use 'created_by' instead of 'invited_by' and adjust related tests

Author: pcrespov

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

@@ -291,7 +291,7 @@ class UserForAdminGet(OutputSchema):
     ] = DEFAULT_FACTORY
 
     # authorization
-    invited_by: str | None = None
+    invited_by: Annotated[str | None, Field(alias="created_by")] = None
 
     # user status
     registered: bool

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

@@ -807,21 +807,6 @@ async def list_merged_pre_and_registered_users(
     Returns:
         Tuple of (list of merged user data, total count)
     """
-    # Create alias for users table for creator and reviewer lookups
-    creators_alias = sa.alias(users, name="creators")
-    reviewers_alias = sa.alias(users, name="reviewers")
-
-    # Query for pre-registered users
-    invited_by = (
-        sa.select(
-            creators_alias.c.name,
-        )
-        .where(users_pre_registration_details.c.created_by == creators_alias.c.id)
-        .correlate(None)
-        .scalar_subquery()
-        .label("invited_by")
-    )
-
     # Base where conditions for both queries
     pre_reg_where = [users_pre_registration_details.c.product_name == product_name]
     users_where = []
@@ -851,15 +836,16 @@ async def list_merged_pre_and_registered_users(
             users_pre_registration_details.c.state,
             users_pre_registration_details.c.postal_code,
             users_pre_registration_details.c.country,
-            users_pre_registration_details.c.user_id,
+            users_pre_registration_details.c.user_id.label("pre_reg_user_id"),
             users_pre_registration_details.c.extras,
             users_pre_registration_details.c.created,
             users_pre_registration_details.c.account_request_status,
             users.c.id.label("user_id"),
             users.c.name.label("user_name"),
             users.c.status,
             users.c.created_at,
-            invited_by,
+            # Use created_by directly instead of a subquery
+            users_pre_registration_details.c.created_by.label("created_by"),
             sa.literal(True).label("is_pre_registered"),
         )
         .select_from(
@@ -883,15 +869,16 @@ async def list_merged_pre_and_registered_users(
             sa.literal(None).label("state"),
             sa.literal(None).label("postal_code"),
             sa.literal(None).label("country"),
-            users.c.id.label("user_id"),
+            sa.literal(None).label("pre_reg_user_id"),
             sa.literal(None).label("extras"),
             users.c.created_at.label("created"),
             sa.literal(None).label("account_request_status"),
             users.c.id.label("user_id"),
             users.c.name.label("user_name"),
             users.c.status,
             users.c.created_at,
-            sa.literal(None).label("invited_by"),
+            # Match the created_by field from the pre_reg query
+            sa.literal(None).label("created_by"),
             sa.literal(False).label("is_pre_registered"),
         )
         .select_from(
@@ -905,24 +892,28 @@ async def list_merged_pre_and_registered_users(
     # Combine with a UNION ALL query
     merged_query = pre_reg_query.union_all(users_query)
 
-    # Add distinct on user_id to eliminate duplicates
+    # Add distinct on email to eliminate duplicates
+    merged_query_subq = merged_query.subquery()
     distinct_query = (
-        sa.select(merged_query.c)
-        .select_from(merged_query)
-        .distinct(merged_query.c.email)
+        sa.select(merged_query_subq)
+        .select_from(merged_query_subq)
+        .distinct(merged_query_subq.c.email)
         .order_by(
-            merged_query.c.email,
+            merged_query_subq.c.email,
             # Prioritize pre-registration records if duplicate emails exist
-            merged_query.c.is_pre_registered.desc(),
-            merged_query.c.created.desc(),
+            merged_query_subq.c.is_pre_registered.desc(),
+            merged_query_subq.c.created.desc(),
         )
         .limit(pagination_limit)
         .offset(pagination_offset)
     )
 
     # Count query (for pagination)
     count_query = sa.select(sa.func.count().label("total")).select_from(
-        sa.select(merged_query.c.email).select_from(merged_query).distinct().subquery()
+        sa.select(merged_query_subq.c.email)
+        .select_from(merged_query_subq)
+        .distinct()
+        .subquery()
     )
 
     _logger.debug(

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

@@ -177,7 +177,7 @@ async def list_users_for_admin(request: web.Request) -> web.Response:
         UsersForAdminListQueryParams, request
     )
 
-    users, total_count = await _users_service.list_users_as_admin(
+    users, total_count = await _users_service.list_all_users_as_admin(
         request.app,
         product_name=req_ctx.product_name,
         filter_account_request_status=(

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

@@ -209,7 +209,7 @@ async def is_user_in_product(
     )
 
 
-async def list_users_as_admin(
+async def list_all_users_as_admin(
     app: web.Application,
     *,
     product_name: ProductName,

services/web/server/tests/unit/with_dbs/03/users/test_users_repository.py

@@ -419,15 +419,19 @@ async def test_list_merged_pre_and_registered_users(
         )
         assert pre_reg_only_user is not None, "Pre-registered user should be in results"
         assert pre_reg_only_user["is_pre_registered"] is True
+        # Check the pre_registration user_id is None but using the new column name
+        assert pre_reg_only_user["pre_reg_user_id"] is None
+        # For non-linked users, user_id is still None
         assert (
             pre_reg_only_user["user_id"] is None
         ), "Pre-registered only user shouldn't have a user_id"
         assert pre_reg_only_user["institution"] == "Pre-Reg Institution"
         assert pre_reg_only_user["first_name"] == "Pre-Registered"
         assert pre_reg_only_user["last_name"] == "Only"
+        # Check created_by field instead of invited_by
         assert (
-            pre_reg_only_user["invited_by"] is not None
-        ), "Should have invited_by field"
+            pre_reg_only_user["created_by"] == created_by_user_id
+        ), "Should have created_by field with the creator's ID"
 
         # 3. Check the product owner (both registered and pre-registered)
         product_owner = next(
@@ -442,6 +446,10 @@ async def test_list_merged_pre_and_registered_users(
         assert (
             product_owner["is_pre_registered"] is True
         ), "Should prefer pre-registration record"
+        # Check both the pre_reg_user_id (from pre-registration) and user_id (from users table)
+        assert (
+            product_owner["pre_reg_user_id"] == product_owner_user["id"]
+        ), "pre_reg_user_id should match the product owner id"
         assert (
             product_owner["user_id"] == product_owner_user["id"]
         ), "Should be linked to existing user"
@@ -455,6 +463,9 @@ async def test_list_merged_pre_and_registered_users(
         assert (
             product_owner["status"] is not None
         ), "Should include status from users table"
+        assert (
+            product_owner["created_by"] == created_by_user_id
+        ), "Should have created_by field with the creator's ID"
 
         # 4. Test filtering by account request status
         pending_users, pending_count = (