feat: return PoolMemberResponse (include metadata) for /members entrypoints

Author: SalimKayal

components/renku_data_services/crc/blueprints.py

@@ -3,6 +3,7 @@
 import asyncio
 from contextlib import suppress
 from dataclasses import dataclass
+from typing import Any
 
 from sanic import HTTPResponse, Request, empty, json
 from sanic_ext import validate
@@ -24,7 +25,12 @@
     validate_resource_pool_post,
     validate_resource_pool_put_or_patch,
 )
-from renku_data_services.crc.db import ClusterRepository, MemberRepository, ResourcePoolRepository
+from renku_data_services.crc.db import (
+    ClusterRepository,
+    MemberRepository,
+    ResourcePoolMemberResult,
+    ResourcePoolRepository,
+)
 from renku_data_services.crc.models import MemberType, ResourcePoolMemberIdentifier
 from renku_data_services.users.db import UserRepo as KcUserRepo
 from renku_data_services.users.models import UserInfo
@@ -263,8 +269,8 @@ def get_all(self) -> BlueprintFactoryResponse:
         async def _get_all(_: Request, user: base_models.APIUser, resource_pool_id: int) -> HTTPResponse:
             members = await self.repo.get_resource_pool_members(user, resource_pool_id)
             return validated_json(
-                apispec.PoolMembers,
-                [{"member_type": m.member_type.value, "id": m.member_id, "relation": m.relation} for m in members],
+                apispec.PoolMembersResponse,
+                [self._dump_member_response(m) for m in members],
             )
 
         return "/resource_pools/<resource_pool_id>/members", ["GET"], _get_all
@@ -301,15 +307,10 @@ async def _put_post(
         self, user: base_models.APIUser, resource_pool_id: int, body: apispec.PoolMembers, post: bool = True
     ) -> HTTPResponse:
         identifiers = self._to_identifiers(body)
-        updated = await self.repo.update_resource_pool_members(
-            api_user=user,
-            resource_pool_id=resource_pool_id,
-            members=identifiers,
-            append=post,
-        )
+        members = await self.repo.update_resource_pool_members(user, resource_pool_id, identifiers, append=post)
         return validated_json(
-            apispec.PoolMembers,
-            [{"member_type": m.member_type.value, "id": m.member_id, "relation": m.relation} for m in updated],
+            apispec.PoolMembersResponse,
+            [self._dump_member_response(m) for m in members],
             status=201 if post else 200,
         )
 
@@ -325,14 +326,14 @@ async def _get(
             members = await self.repo.get_resource_pool_members(user, resource_pool_id)
             for m in members:
                 if m.member_type.value == member_type and m.member_id == member_id:
-                    payload = {"member_type": m.member_type.value, "id": m.member_id, "relation": m.relation}
+                    payload = self._dump_member_response(m)
                     match member_type:
                         case "user":
-                            return validated_json(apispec.PoolMemberUser, payload)
+                            return validated_json(apispec.PoolMemberUserResponse, payload)
                         case "group":
-                            return validated_json(apispec.PoolMemberGroup, payload)
+                            return validated_json(apispec.PoolMemberGroupResponse, payload)
                         case "project":
-                            return validated_json(apispec.PoolMemberProject, payload)
+                            return validated_json(apispec.PoolMemberProjectResponse, payload)
                         case _:
                             raise errors.ValidationError(message=f"Invalid member type: {member_type}")
             raise errors.MissingResourceError(
@@ -395,6 +396,25 @@ def _to_identifiers(body: apispec.PoolMembers) -> list[ResourcePoolMemberIdentif
                     )
         return identifiers
 
+    @staticmethod
+    def _dump_member_response(m: ResourcePoolMemberResult) -> dict[str, Any]:
+        """Serialize a member result for GET responses."""
+        result: dict[str, Any] = {
+            "member_type": m.member_type.value,
+            "id": m.member_id,
+            "relation": m.relation,
+        }
+        match m.member_type:
+            case MemberType.USER:
+                result["email"] = m.email or ""
+            case MemberType.PROJECT:
+                result["namespace"] = m.namespace or ""
+                result["name"] = m.name or ""
+            case MemberType.GROUP:
+                result["slug"] = m.slug or ""
+                result["name"] = m.name or ""
+        return result
+
 
 @dataclass(kw_only=True)
 class ClassesBP(CustomBlueprint):

components/renku_data_services/crc/db.py

@@ -929,6 +929,10 @@ class ResourcePoolMemberResult:
     member_type: MemberType
     member_id: str
     relation: str
+    slug: str | None = None
+    name: str | None = None
+    email: str | None = None
+    namespace: str | None = None
 
 
 class MemberRepository(_Base):
@@ -1380,17 +1384,25 @@ async def get_resource_pool_members(
         for subject_type, subject_id, relation in raw_members:
             match subject_type:
                 case ResourceType.user.value:
+                    user_info = await self.kc_user_repo.get_user(id=subject_id)
                     results.append(
-                        ResourcePoolMemberResult(member_type=MemberType.USER, member_id=subject_id, relation=relation)
+                        ResourcePoolMemberResult(
+                            member_type=MemberType.USER,
+                            member_id=subject_id,
+                            relation=relation,
+                            email=user_info.email or "" if user_info else "",
+                        )
                     )
                 case ResourceType.group.value:
                     try:
-                        await self.group_repo.get_group_by_id(api_user, ULID.from_str(subject_id))
+                        group = await self.group_repo.get_group_by_id(api_user, ULID.from_str(subject_id))
                         results.append(
                             ResourcePoolMemberResult(
                                 member_type=MemberType.GROUP,
                                 member_id=subject_id,
                                 relation=relation,
+                                slug=group.slug,
+                                name=group.name,
                             )
                         )
                     except (errors.MissingResourceError, ValueError):
@@ -1399,12 +1411,14 @@ async def get_resource_pool_members(
                         )
                 case ResourceType.project.value:
                     try:
-                        await self.project_repo.get_project_by_id(api_user, ULID.from_str(subject_id))
+                        project = await self.project_repo.get_project_by_id(api_user, ULID.from_str(subject_id))
                         results.append(
                             ResourcePoolMemberResult(
                                 member_type=MemberType.PROJECT,
                                 member_id=subject_id,
                                 relation=relation,
+                                namespace=project.path.serialize(),
+                                name=project.name,
                             )
                         )
                     except (errors.MissingResourceError, ValueError):