rename

Author: pcrespov

packages/common-library/src/common_library/users_enums.py

@@ -60,8 +60,8 @@ class UserStatus(str, Enum):
 
 
 class AccountRequestStatus(str, Enum):
-    """Status of an account request"""
+    """Status of the request for an account"""
 
-    PENDING = "PENDING"
-    APPROVED = "APPROVED"
-    REJECTED = "REJECTED"
+    PENDING = "PENDING"  # Pending PO review to approve/reject the request
+    APPROVED = "APPROVED"  # PO approved the request
+    REJECTED = "REJECTED"  # PO rejected the request

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

@@ -241,12 +241,13 @@ def from_domain_model(cls, data):
 
 
 class UsersForAdminListFilter(Filters):
-    approved: Annotated[
-        bool | None,
-        Field(
-            description="Filter users by approval status: True for approved, False for pending/rejected, None for all"
-        ),
-    ] = None
+    # TODO: create a filter for two views that OM needs
+    #
+    # 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
+    #
+    approved: bool | None = None
 
 
 class UsersForAdminListQueryParams(PageQueryParameters, UsersForAdminListFilter): ...

packages/postgres-database/src/simcore_postgres_database/migration/versions/c2e3e38f115e_new_account_request_status_column.py

@@ -60,7 +60,6 @@
         sa.Enum(AccountRequestStatus),
         nullable=False,
         server_default=sa.text("'PENDING'::account_request_status"),
-        doc="Status of the account request: PENDING, APPROVED, REJECTED",
     ),
     # Billable address columns:
     sa.Column("institution", sa.String(), doc="the name of a company or university"),