🎨 Added user identifiers to the UserAccountGetmodel

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

@@ -24,7 +24,7 @@
 
 from ..basic_types import IDStr
 from ..emails import LowerCaseEmailStr
-from ..groups import AccessRightsDict, Group, GroupID, GroupsByTypeTuple
+from ..groups import AccessRightsDict, Group, GroupID, GroupsByTypeTuple, PrimaryGroupID
 from ..products import ProductName
 from ..rest_base import RequestParameters
 from ..users import (
@@ -389,6 +389,25 @@ class UserAccountGet(OutputSchema):
         ),
     ] = None
 
+    # user (if an account was created)
+    user_id: Annotated[
+        UserID | None,
+        Field(description="Unique identifier of the user if an account was created"),
+    ]
+    user_name: Annotated[
+        UserNameID | None,
+        Field(description="Username of the user if an account was created"),
+    ]
+    user_primary_group_id: Annotated[
+        PrimaryGroupID | None,
+        Field(
+            description="Primary group ID of the user if an account was created",
+            gt=2,
+            alias="groupId",
+            # SEE https://github.com/ITISFoundation/osparc-simcore/pull/8358#issuecomment-3279491740
+        ),
+    ]
+
     @field_validator("status")
     @classmethod
     def _consistency_check(cls, v, info: ValidationInfo):

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

@@ -15,12 +15,14 @@
 EVERYONE_GROUP_ID: Final[int] = 1
 
 GroupID: TypeAlias = PositiveInt
+PrimaryGroupID: TypeAlias = Annotated[GroupID, Field(gt=2)]
+StandardGroupID: TypeAlias = Annotated[GroupID, Field(gt=2)]
 
 __all__: tuple[str, ...] = ("GroupType",)
 
 
 class Group(BaseModel):
-    gid: PositiveInt
+    gid: GroupID
     name: str
     description: str
     group_type: Annotated[GroupType, Field(alias="type")]

services/web/server/VERSION

@@ -1 +1 @@
-0.78.0
+0.79.0

services/web/server/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.78.0
+current_version = 0.79.0
 commit = True
 message = services/webserver api version: {current_version} → {new_version}
 tag = False

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

@@ -2,7 +2,7 @@ openapi: 3.1.0
 info:
   title: simcore-service-webserver
   description: Main service with an interface (http-API & websockets) to the web front-end
-  version: 0.78.0
+  version: 0.79.0
 servers:
 - url: ''
   description: webserver
@@ -18429,6 +18429,30 @@ components:
           title: Products
           description: List of products this users is included or None if fields is
             unset
+        userId:
+          anyOf:
+          - type: integer
+            exclusiveMinimum: true
+            minimum: 0
+          - type: 'null'
+          title: Userid
+          description: Unique identifier of the user if an account was created
+        userName:
+          anyOf:
+          - type: string
+            maxLength: 100
+            minLength: 1
+          - type: 'null'
+          title: Username
+          description: Username of the user if an account was created
+        groupId:
+          anyOf:
+          - type: integer
+            exclusiveMinimum: true
+            minimum: 2
+          - type: 'null'
+          title: Groupid
+          description: Primary group ID of the user if an account was created
       type: object
       required:
       - firstName
@@ -18446,6 +18470,9 @@ components:
       - accountRequestStatus
       - registered
       - status
+      - userId
+      - userName
+      - groupId
       title: UserAccountGet
     UserAccountReject:
       properties:

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

@@ -381,7 +381,7 @@ async def search_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,  # user_id from pre-registration
         users_pre_registration_details.c.extras,
         users_pre_registration_details.c.account_request_status,
         users_pre_registration_details.c.account_request_reviewed_by,
@@ -390,10 +390,14 @@ 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.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 +498,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 +535,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.user_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