updates db queries

Author: pcrespov

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

@@ -390,10 +390,15 @@ async def search_merged_pre_and_registered_users(
         invited_by,
         account_request_reviewed_by_username,  # account_request_reviewed_by converted to username
         users_pre_registration_details.c.created,
+        users.c.id.label("user_id"),
+        users.c.name.label("user_name"),
+        users.c.primary_gid.label("user_primary_group_id"),
     )
 
     left_outer_join = _build_left_outer_join_query(
-        filter_by_email_like, product_name, columns
+        filter_by_email_like,
+        product_name,
+        columns,
     )
     right_outer_join = _build_right_outer_join_query(
         filter_by_email_like,
@@ -494,6 +499,7 @@ async def list_merged_pre_and_registered_users(
             users_pre_registration_details.c.account_request_reviewed_at,
             users.c.id.label("user_id"),
             users.c.name.label("user_name"),
+            users.c.primary_gid.label("user_primary_group_id"),
             users.c.status,
             # Use created_by directly instead of a subquery
             users_pre_registration_details.c.created_by.label("created_by"),
@@ -530,6 +536,7 @@ async def list_merged_pre_and_registered_users(
             sa.literal(None).label("account_request_reviewed_at"),
             users.c.id.label("user_id"),
             users.c.name.label("user_name"),
+            users.c.primary_gid.label("user_primary_group_id"),
             users.c.status,
             # Match the created_by field from the pre_reg query
             sa.literal(None).label("created_by"),

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

@@ -223,6 +223,10 @@ async def _list_products_or_none(user_id):
             # NOTE: old users will not have extra details
             registered=r.user_id is not None if r.pre_email else r.status is not None,
             status=r.status,
+            # user
+            user_id=r.user_id,
+            user_name=r.user_name,
+            user_primary_group_id=r.primary_group_id,
         )
         for r in rows
     ]

services/web/server/tests/unit/with_dbs/03/invitations/test_users_accounts_rest_registration.py

@@ -261,6 +261,9 @@ async def test_search_and_pre_registration(
         "extras": {},
         "registered": True,
         "status": UserStatus.ACTIVE,
+        "user_id": logged_user["id"],
+        "user_name": logged_user["name"],
+        "user_primary_group_id": logged_user.get("primary_group_id"),
     }
     assert got.model_dump(include=set(expected)) == expected