fixe tsts

Author: pcrespov

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

@@ -276,7 +276,6 @@ async def search_merged_pre_and_registered_users(
     product_name: ProductName | None = None,
 ) -> list[Row]:
     users_alias = sa.alias(users, name="users_alias")
-    reviewer_alias = sa.alias(users, name="reviewer_alias")
 
     invited_by = (
         sa.select(
@@ -286,6 +285,7 @@ async def search_merged_pre_and_registered_users(
         .label("invited_by")
     )
 
+    reviewer_alias = sa.alias(users, name="reviewer_alias")
     account_request_reviewed_by_username = (
         sa.select(
             reviewer_alias.c.name,
@@ -400,6 +400,18 @@ async def list_merged_pre_and_registered_users(
 
     # Query for pre-registered users that are not yet in the users table
     # We need to left join with users to identify if the pre-registered user is already in the system
+
+    reviewer_alias = sa.alias(users, name="reviewer_alias")
+    account_request_reviewed_by_username = (
+        sa.select(
+            reviewer_alias.c.name,
+        )
+        .where(
+            users_pre_registration_details.c.account_request_reviewed_by
+            == reviewer_alias.c.id
+        )
+        .label("account_request_reviewed_by_username")
+    )
     pre_reg_query = (
         sa.select(
             users_pre_registration_details.c.id,
@@ -417,7 +429,7 @@ async def list_merged_pre_and_registered_users(
             users_pre_registration_details.c.extras,
             users_pre_registration_details.c.created,
             users_pre_registration_details.c.account_request_status,
-            users_pre_registration_details.c.account_request_reviewed_by,
+            account_request_reviewed_by_username,
             users_pre_registration_details.c.account_request_reviewed_at,
             users.c.id.label("user_id"),
             users.c.name.label("user_name"),

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

@@ -64,25 +64,25 @@ async def list_users_accounts(request: web.Request) -> web.Response:
         # ALL
         filter_any_account_request_status = None
 
-    users, total_count = await _accounts_service.list_user_accounts(
+    user_accounts, total_count = await _accounts_service.list_user_accounts(
         request.app,
         product_name=req_ctx.product_name,
         filter_any_account_request_status=filter_any_account_request_status,
         pagination_limit=query_params.limit,
         pagination_offset=query_params.offset,
     )
 
-    def _to_domain_model(user: dict[str, Any]) -> UserAccountGet:
+    def _to_domain_model(account_details: dict[str, Any]) -> UserAccountGet:
         return UserAccountGet(
-            extras=user.pop("extras") or {},
-            pre_registration_id=user.pop("id"),
-            pre_registration_created=user.pop("created"),
-            **user,
+            extras=account_details.pop("extras") or {},
+            pre_registration_id=account_details.pop("id"),
+            pre_registration_created=account_details.pop("created"),
+            **account_details,
         )
 
     page = Page[UserAccountGet].model_validate(
         paginate_data(
-            chunk=[_to_domain_model(user) for user in users],
+            chunk=[_to_domain_model(user) for user in user_accounts],
             request_url=request.url,
             total=total_count,
             limit=query_params.limit,

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

@@ -95,7 +95,7 @@ async def mock_send_message(msg):
         *(
             (role, status.HTTP_403_FORBIDDEN)
             for role in UserRole
-            if role not in {UserRole.PRODUCT_OWNER, UserRole.ADMIN, UserRole.ANONYMOUS}
+            if UserRole.ANONYMOUS < role < UserRole.PRODUCT_SUPPORT
         ),
         (UserRole.PRODUCT_SUPPORT, status.HTTP_200_OK),
         (UserRole.PRODUCT_OWNER, status.HTTP_200_OK),