drafted invitation generation

Author: pcrespov

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

@@ -694,6 +694,7 @@ async def review_user_pre_registration(
     pre_registration_id: int,
     reviewed_by: UserID,
     new_status: AccountRequestStatus,
+    invitation_extras: dict[str, Any] | None = None,
 ) -> None:
     """Updates the account request status of a pre-registered user.
 
@@ -703,19 +704,44 @@ async def review_user_pre_registration(
         pre_registration_id: ID of the pre-registration record
         reviewed_by: ID of the user who reviewed the request
         new_status: New status (APPROVED or REJECTED)
+        invitation_extras: Optional invitation data to store in extras field
     """
     if new_status not in (AccountRequestStatus.APPROVED, AccountRequestStatus.REJECTED):
         msg = f"Invalid status for review: {new_status}. Must be APPROVED or REJECTED."
         raise ValueError(msg)
 
     async with transaction_context(engine, connection) as conn:
+        # Base update values
+        update_values = {
+            "account_request_status": new_status,
+            "account_request_reviewed_by": reviewed_by,
+            "account_request_reviewed_at": sa.func.now(),
+        }
+
+        # Add invitation extras to the existing extras if provided
+        if invitation_extras is not None:
+            assert list(invitation_extras.keys()) == "invitation"  # nosec
+
+            # Get the current extras first
+            current_extras_result = await conn.execute(
+                sa.select(users_pre_registration_details.c.extras).where(
+                    users_pre_registration_details.c.id == pre_registration_id
+                )
+            )
+            current_extras_row = current_extras_result.one_or_none()
+            current_extras = (
+                current_extras_row.extras
+                if current_extras_row and current_extras_row.extras
+                else {}
+            )
+
+            # Merge with invitation extras
+            merged_extras = {**current_extras, **invitation_extras}
+            update_values["extras"] = merged_extras
+
         await conn.execute(
             users_pre_registration_details.update()
-            .values(
-                account_request_status=new_status,
-                account_request_reviewed_by=reviewed_by,
-                account_request_reviewed_at=sa.func.now(),
-            )
+            .values(**update_values)
             .where(users_pre_registration_details.c.id == pre_registration_id)
         )
 

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

@@ -5,6 +5,7 @@
 from aiohttp import web
 from common_library.user_messages import user_message
 from common_library.users_enums import AccountRequestStatus
+from models_library.api_schemas_invitations.invitations import ApiInvitationInputs
 from models_library.api_schemas_webserver.users import (
     MyProfileGet,
     MyProfilePatch,
@@ -34,6 +35,7 @@
 )
 from ..groups import api as groups_api
 from ..groups.exceptions import GroupNotFoundError
+from ..invitations import api as invitations_service
 from ..login.decorators import login_required
 from ..products import products_web
 from ..products.models import Product
@@ -298,23 +300,46 @@ async def approve_user_account(request: web.Request) -> web.Response:
 
     approval_data = await parse_request_body_as(UserAccountApprove, request)
 
+    invitation_extras = None
     if approval_data.invitation:
         _logger.debug(
-            "TODO: User is being approved with invitation %s: \n"
-            "1. Approve user account\n"
-            "2. Generate invitation\n"
-            "3. Store invitation in extras\n"
-            "4. Send invitation to user %s\n",
+            "User is being approved with invitation %s for user %s",
             approval_data.invitation.model_dump_json(indent=1),
             approval_data.email,
         )
 
+        # Generate invitation
+        invitation_params = ApiInvitationInputs(
+            issuer=str(req_ctx.user_id),
+            guest=approval_data.email,
+            trial_account_days=approval_data.invitation.trial_account_days,
+            extra_credits_in_usd=approval_data.invitation.extra_credits_in_usd,
+        )
+
+        invitation_result = await invitations_service.generate_invitation(
+            request.app, params=invitation_params
+        )
+
+        assert (  # nosec
+            invitation_result.extra_credits_in_usd
+            == approval_data.invitation.extra_credits_in_usd
+        )
+        assert (  # nosec
+            invitation_result.trial_account_days
+            == approval_data.invitation.trial_account_days
+        )
+        assert invitation_result.guest == approval_data.email  # nosec
+
+        # Store invitation data in extras
+        invitation_extras = {"invitation": invitation_result.model_dump(mode="json")}
+
     # Approve the user account, passing the current user's ID as the reviewer
     pre_registration_id = await _users_service.approve_user_account(
         request.app,
         pre_registration_email=approval_data.email,
         product_name=req_ctx.product_name,
         reviewer_id=req_ctx.user_id,
+        invitation_extras=invitation_extras,
     )
     assert pre_registration_id  # nosec
 

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

@@ -477,6 +477,7 @@ async def approve_user_account(
     pre_registration_email: LowerCaseEmailStr,
     product_name: ProductName,
     reviewer_id: UserID,
+    invitation_extras: dict[str, Any] | None = None,
 ) -> int:
     """Approve a user account based on their pre-registration email.
 
@@ -517,6 +518,7 @@ async def approve_user_account(
         pre_registration_id=pre_registration_id,
         reviewed_by=reviewer_id,
         new_status=AccountRequestStatus.APPROVED,
+        invitation_extras=invitation_extras,
     )
 
     return pre_registration_id