feat: enhance user listing with product name and account request status filtering

Author: pcrespov

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

@@ -1,4 +1,5 @@
 import contextlib
+import logging
 from typing import Any
 
 import sqlalchemy as sa
@@ -48,6 +49,8 @@
     UserNotFoundError,
 )
 
+_logger = logging.getLogger(__name__)
+
 
 def _parse_as_user(user_id: Any) -> UserID:
     try:
@@ -381,45 +384,33 @@ async def list_users_for_admin(
     engine: AsyncEngine,
     connection: AsyncConnection | None = None,
     *,
-    filter_approved: bool | None = None,
-    limit: int = 50,
-    offset: int = 0,
-    include_deleted: bool = False,
+    product_name: ProductName,
+    filter_account_request_status: AccountRequestStatus | None = None,
+    filter_include_deleted: bool = False,
+    pagination_limit: int = 50,
+    pagination_offset: int = 0,
 ) -> tuple[list[dict[str, Any]], int]:
     """
     Gets users data for admin with pagination support using SQLAlchemy expressions
 
-    Args:
-        engine: The database engine
-        connection: Optional existing connection to reuse
-        filter_approved: If set, filters users by their approval status
-        limit: Maximum number of users to return
-        offset: Number of users to skip for pagination
-        include_deleted: Whether to include users marked as deleted
-
     Returns:
         Tuple of (list of user data, total count)
     """
     joined_user_tables = users.outerjoin(
         users_pre_registration_details,
-        users.c.id == users_pre_registration_details.c.user_id,
+        (users.c.id == users_pre_registration_details.c.user_id)
+        & (users_pre_registration_details.c.product_name == product_name),
     )
 
     where_conditions = []
-    if not include_deleted:
+    if not filter_include_deleted:
         where_conditions.append(users.c.status != UserStatus.DELETED)
 
-    if filter_approved is not None:
-        if filter_approved:
-            where_conditions.append(
-                users_pre_registration_details.c.account_request_status
-                == AccountRequestStatus.APPROVED
-            )
-        else:
-            where_conditions.append(
-                users_pre_registration_details.c.account_request_status
-                != AccountRequestStatus.APPROVED
-            )
+    if filter_account_request_status is not None:
+        where_conditions.append(
+            users_pre_registration_details.c.account_request_status
+            == filter_account_request_status
+        )
 
     where_clause = sa.and_(*where_conditions) if where_conditions else sa.true()
 
@@ -478,18 +469,17 @@ async def list_users_for_admin(
             users_pre_registration_details.c.created.desc(),  # newest pre-registered first
             users_pre_registration_details.c.pre_email,
         )
-        .limit(limit)
-        .offset(offset)
+        .limit(pagination_limit)
+        .offset(pagination_offset)
     )
 
-    print(
+    _logger.debug(
+        "%s\n%s\n%s\n%s",
         "-" * 100,
-        "\n",
         as_postgres_sql_query_str(main_query),
         "-" * 100,
-        "\n",
         as_postgres_sql_query_str(count_query),
-    )  # DEBUG
+    )
 
     async with pass_or_acquire_connection(engine, connection) as conn:
         # Get total count

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

@@ -1,6 +1,3 @@
-import logging
-from contextlib import suppress
-
 from aiohttp import web
 from models_library.api_schemas_webserver.users import (
     MyProfileGet,
@@ -178,9 +175,11 @@ async def list_users_for_admin(request: web.Request) -> web.Response:
 
     users, total_count = await _users_service.list_users_as_admin(
         request.app,
-        filter_approved=query_params.approved,
-        limit=query_params.limit,
-        offset=query_params.offset,
+        filter_account_request_status={"PENDING": AccountRequestStatus.PENDING}.get(
+            query_params.status or ""
+        ),
+        pagination_limit=query_params.limit,
+        pagination_offset=query_params.offset,
     )
 
     page = Page[UserForAdminGet].model_validate(
@@ -236,6 +235,7 @@ async def pre_register_user_for_admin(request: web.Request) -> web.Response:
         creator_user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
     )
+
     return envelope_json_response(
         user_profile.model_dump(**_RESPONSE_MODEL_MINIMAL_POLICY)
     )

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

@@ -3,6 +3,7 @@
 
 import pycountry
 from aiohttp import web
+from common_library.users_enums import AccountRequestStatus
 from models_library.api_schemas_webserver.users import MyProfilePatch, UserForAdminGet
 from models_library.basic_types import IDStr
 from models_library.emails import LowerCaseEmailStr
@@ -208,9 +209,10 @@ async def is_user_in_product(
 async def list_users_as_admin(
     app: web.Application,
     *,
-    filter_approved: bool | None = None,
-    limit: int = 50,
-    offset: int = 0,
+    product_name: ProductName,
+    filter_account_request_status: AccountRequestStatus | None = None,
+    pagination_limit: int = 50,
+    pagination_offset: int = 0,
 ) -> tuple[list[dict[str, Any]], int]:
     """
     Get a paginated list of users for admin view with filtering options.
@@ -228,7 +230,11 @@ async def list_users_as_admin(
 
     # Get user data with pagination
     users_data, total_count = await _users_repository.list_users_for_admin(
-        engine, filter_approved=filter_approved, limit=limit, offset=offset
+        engine,
+        product_name=product_name,
+        filter_account_request_status=filter_account_request_status,
+        pagination_limit=pagination_limit,
+        pagination_offset=pagination_offset,
     )
 
     # For each user, append additional information if needed