✨ [Users] Enhance admin user listing with invited_by field and registration status

Author: pcrespov

packages/postgres-database/src/simcore_postgres_database/migration/versions/5a51c6cc961d_new_account_request_status_column.py

@@ -546,6 +546,14 @@ async def list_users_for_admin(
     )
 
     # Main query to get user data
+    invited_by = (
+        sa.select(
+            users.c.name,
+        )
+        .where(users_pre_registration_details.c.created_by == users.c.id)
+        .label("invited_by")
+    )
+
     main_query = (
         sa.select(
             users.c.id.label("user_id"),
@@ -571,14 +579,21 @@ async def list_users_for_admin(
             users.c.status,
             users.c.created,
             users_pre_registration_details.c.institution,
-            users_pre_registration_details.c.pre_phone.label("phone"),
+            sa.case(
+                (
+                    users.c.phone.is_(None),
+                    users_pre_registration_details.c.pre_phone,
+                ),
+                else_=users.c.phone,
+            ).label("phone"),
             users_pre_registration_details.c.address,
             users_pre_registration_details.c.city,
             users_pre_registration_details.c.state,
             users_pre_registration_details.c.postal_code,
             users_pre_registration_details.c.country,
             users_pre_registration_details.c.extras,
             users_pre_registration_details.c.account_request_status,
+            invited_by,
         )
         .select_from(joined_tables)
         .where(where_clause)

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

@@ -222,7 +222,7 @@ async def list_users_as_admin(
 
     # Get user data with pagination
     users_data, total_count = await _users_repository.list_users_for_admin(
-        engine=engine, filter_approved=filter_approved, limit=limit, offset=offset
+        engine, filter_approved=filter_approved, limit=limit, offset=offset
     )
 
     # For each user, append additional information if needed
@@ -239,6 +239,12 @@ async def list_users_as_admin(
             )
             user_dict["products"] = [p.product_name for p in products]
 
+        user_dict["registered"] = (
+            user_id is not None
+            if user.get("pre_email")
+            else user.get("status") is not None
+        )
+
         result.append(user_dict)
 
     return result, total_count

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

@@ -773,8 +773,7 @@ async def test_list_users_for_admin(
         form_data["email"] = faker.email()
 
         resp = await client.post("/v0/admin/users:pre-register", json=form_data)
-        assert resp.status == status.HTTP_200_OK
-        pre_registered_data = await resp.json()
+        pre_registered_data, _ = await assert_status(resp, status.HTTP_200_OK)
         pre_registered_users.append(pre_registered_data)
 
     # Register one of the pre-registered users