rename tests

Author: pcrespov

services/web/server/src/simcore_service_webserver/login/_controller/confirmation_rest.py

@@ -39,7 +39,7 @@
     MSG_PASSWORD_CHANGED,
     MSG_UNAUTHORIZED_PHONE_CONFIRMATION,
 )
-from .._invitations_service import InvitationData
+from .._invitations_service import ConfirmedInvitationData
 from .._login_repository_legacy import (
     AsyncpgStorage,
     ConfirmationTokenDict,
@@ -76,7 +76,7 @@ def _parse_extra_credits_in_usd_or_none(
 ) -> PositiveInt | None:
     with suppress(ValidationError, JSONDecodeError):
         confirmation_data = confirmation.get("data", "EMPTY") or "EMPTY"
-        invitation = InvitationData.model_validate_json(confirmation_data)
+        invitation = ConfirmedInvitationData.model_validate_json(confirmation_data)
         return invitation.extra_credits_in_usd
     return None
 

services/web/server/src/simcore_service_webserver/login/_invitations_service.py

@@ -61,7 +61,7 @@ class ConfirmationTokenInfoDict(ConfirmationTokenDict):
     url: str
 
 
-class InvitationData(BaseModel):
+class ConfirmedInvitationData(BaseModel):
     issuer: str | None = Field(
         None,
         description="Who has issued this invitation? (e.g. an email or a uid)",
@@ -80,7 +80,7 @@ class InvitationData(BaseModel):
 
 class _InvitationValidator(BaseModel):
     action: ConfirmationAction
-    data: Json[InvitationData]  # pylint: disable=unsubscriptable-object
+    data: Json[ConfirmedInvitationData]  # pylint: disable=unsubscriptable-object
 
     @field_validator("action", mode="before")
     @classmethod
@@ -91,7 +91,7 @@ def ensure_enum(cls, v):
 
 
 ACTION_TO_DATA_TYPE: dict[ConfirmationAction, type | None] = {
-    ConfirmationAction.INVITATION: InvitationData,
+    ConfirmationAction.INVITATION: ConfirmedInvitationData,
     ConfirmationAction.REGISTRATION: None,
 }
 
@@ -188,7 +188,7 @@ async def create_invitation_token(
     :type host: Dict-like
     :param guest: some description of the guest, e.g. email, name or a json
     """
-    data_model = InvitationData(
+    data_model = ConfirmedInvitationData(
         issuer=user_email,
         guest=tag,
         trial_account_days=trial_days,
@@ -269,7 +269,7 @@ async def check_and_consume_invitation(
     db: AsyncpgStorage,
     cfg: LoginOptions,
     app: web.Application,
-) -> InvitationData:
+) -> ConfirmedInvitationData:
     """Consumes invitation: the code is validated, the invitation retrieives and then deleted
        since it only has one use
 
@@ -292,7 +292,7 @@ async def check_and_consume_invitation(
                 "Consuming invitation from service:\n%s",
                 content.model_dump_json(indent=1),
             )
-            return InvitationData(
+            return ConfirmedInvitationData(
                 issuer=content.issuer,
                 guest=content.guest,
                 trial_account_days=content.trial_account_days,
@@ -305,9 +305,9 @@ async def check_and_consume_invitation(
         invitation_code, db, cfg
     ):
         try:
-            invitation_data: InvitationData = _InvitationValidator.model_validate(
-                confirmation_token
-            ).data
+            invitation_data: ConfirmedInvitationData = (
+                _InvitationValidator.model_validate(confirmation_token).data
+            )
             return invitation_data
 
         except ValidationError as err:

services/web/server/src/simcore_service_webserver/login/cli.py

@@ -6,7 +6,7 @@
 from simcore_postgres_database.models.confirmations import ConfirmationAction
 from yarl import URL
 
-from ._invitations_service import InvitationData, get_invitation_url
+from ._invitations_service import ConfirmedInvitationData, get_invitation_url
 
 
 def invitations(
@@ -19,7 +19,7 @@ def invitations(
 ):
     """Generates a list of invitation links for registration"""
 
-    invitation = InvitationData(issuer=issuer_email, trial_account_days=trial_days)  # type: ignore[call-arg] # guest field is deprecated
+    invitation = ConfirmedInvitationData(issuer=issuer_email, trial_account_days=trial_days)  # type: ignore[call-arg] # guest field is deprecated
 
     codes = [generate_password(code_length) for _ in range(num_codes)]