✨ users: Update account request status handling in API and tests

Author: pcrespov

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

@@ -241,24 +241,12 @@ def from_domain_model(cls, data):
 
 
 class UsersForAdminListFilter(Filters):
-    # 1. States of an Account Resquest: PENDING, REJECTED, APPROVED
-    # 2. If APPROVED AND user uses the invitation link, then it can be in any of these states:
-    #    CONFIRMATION_PENDING, ACTIVE, EXPIRED, BANNED, DELETED
+    # 1. account_request_status: PENDING, REJECTED, APPROVED
+    # 2. If APPROVED AND user uses the invitation link, then when user is registered,
+    #  it can be in any of these statuses:
+    #     CONFIRMATION_PENDING, ACTIVE, EXPIRED, BANNED, DELETED
     #
-    status: (
-        Literal[
-            "PENDING",
-            # NOTE: future states
-            # "REJECTED",
-            # "APPROVED",
-            # "CONFIRMATION_PENDING",
-            # "ACTIVE",
-            # "EXPIRED",
-            # "BANNED",
-            # "DELETED",
-        ]
-        | None
-    ) = None
+    account_request_status: Literal["PENDING", "REJECETED", "APPROVED"] | None = None
 
 
 class UsersForAdminListQueryParams(UsersForAdminListFilter, PageQueryParameters): ...

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

@@ -1387,15 +1387,18 @@ paths:
           type: integer
           default: 0
           title: Offset
-      - name: status
+      - name: account_request_status
         in: query
         required: false
         schema:
           anyOf:
-          - const: PENDING
+          - enum:
+            - PENDING
+            - REJECETED
+            - APPROVED
             type: string
           - type: 'null'
-          title: Status
+          title: Account Request Status
       responses:
         '200':
           description: Successful Response

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

@@ -183,7 +183,9 @@ async def list_users_for_admin(request: web.Request) -> web.Response:
         request.app,
         product_name=req_ctx.product_name,
         filter_account_request_status=(
-            AccountRequestStatus(query_params.status) if query_params.status else None
+            AccountRequestStatus(query_params.account_request_status)
+            if query_params.account_request_status
+            else None
         ),
         pagination_limit=query_params.limit,
         pagination_offset=query_params.offset,

services/web/server/tests/unit/with_dbs/03/test_users_rest_registration.py

@@ -267,15 +267,15 @@ async def test_list_users_for_admin(
     assert registered_email not in pending_emails
     assert len(pending_emails) >= len(pre_registered_users) - 1
 
-    # b. Check ACTIVE filter (should include only the registered user)
+    # b. Check all users
     resp = await client.get(
-        f"{url}?status=ACTIVE", headers={X_PRODUCT_NAME_HEADER: product_name}
+        f"{url}?status=APPROVED", headers={X_PRODUCT_NAME_HEADER: product_name}
     )
-    active_data, _ = await assert_status(resp, status.HTTP_200_OK)
+    approved_data, _ = await assert_status(resp, status.HTTP_200_OK)
 
     # Find the registered user in the active users
     active_user = next(
-        (item for item in active_data if item["email"] == registered_email),
+        (item for item in approved_data if item["email"] == registered_email),
         None,
     )
     assert active_user is not None