account_request_review_by returns a username instead of a user_id

Author: pcrespov

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

@@ -340,9 +340,9 @@ class UserAccountGet(OutputSchema):
     # pre-registration NOTE: that some users have no pre-registartion and therefore all options here can be none
     pre_registration_id: int | None
     pre_registration_created: datetime | None
-    invited_by: str | None = None
+    invited_by: UserNameID | None = None
     account_request_status: AccountRequestStatus | None
-    account_request_reviewed_by: UserID | None = None
+    account_request_reviewed_by: UserNameID | None = None
     account_request_reviewed_at: datetime | None = None
 
     # user status

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

@@ -2,7 +2,6 @@
 from typing import Annotated, TypeAlias
 
 from common_library.users_enums import UserRole
-from models_library.basic_types import IDStr
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt, StringConstraints
 from pydantic.config import JsonDict
 from typing_extensions import (  # https://docs.pydantic.dev/latest/api/standard_library_types/#typeddict
@@ -12,8 +11,9 @@
 from .emails import LowerCaseEmailStr
 
 UserID: TypeAlias = PositiveInt
-UserNameID: TypeAlias = IDStr
-
+UserNameID: TypeAlias = Annotated[
+    str, StringConstraints(strip_whitespace=True, min_length=1, max_length=100)
+]
 
 FirstNameStr: TypeAlias = Annotated[
     str, StringConstraints(strip_whitespace=True, max_length=255)

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -18361,6 +18361,8 @@ components:
         invitedBy:
           anyOf:
           - type: string
+            maxLength: 100
+            minLength: 1
           - type: 'null'
           title: Invitedby
         accountRequestStatus:
@@ -18369,9 +18371,9 @@ components:
           - type: 'null'
         accountRequestReviewedBy:
           anyOf:
-          - type: integer
-            exclusiveMinimum: true
-            minimum: 0
+          - type: string
+            maxLength: 100
+            minLength: 1
           - type: 'null'
           title: Accountrequestreviewedby
         accountRequestReviewedAt:

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

@@ -276,6 +276,7 @@ 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(
@@ -285,6 +286,17 @@ async def search_merged_pre_and_registered_users(
         .label("invited_by")
     )
 
+    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")
+    )
+
     async with pass_or_acquire_connection(engine, connection) as conn:
         columns = (
             users_pre_registration_details.c.id,
@@ -305,7 +317,7 @@ async def search_merged_pre_and_registered_users(
             users_pre_registration_details.c.user_id,
             users_pre_registration_details.c.extras,
             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.status,
             invited_by,

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

@@ -193,7 +193,7 @@ async def _list_products_or_none(user_id):
             pre_registration_id=r.id,
             pre_registration_created=r.created,
             account_request_status=r.account_request_status,
-            account_request_reviewed_by=r.account_request_reviewed_by,
+            account_request_reviewed_by=r.account_request_reviewed_by_username,
             account_request_reviewed_at=r.account_request_reviewed_at,
             products=await _list_products_or_none(r.user_id),
             # NOTE: old users will not have extra details