Updated account seeding and tests

Author: Robert Segal

e2e_config.test.json

@@ -1,9 +1,8 @@
 {
   "accounts.account.id": "ACC-9042-0088",
   "accounts.api_token.id": "TKN-8857-1729",
-  "accounts.buyer.account.id": "ACC-1086-6867",
+  "accounts.client_account.id": "ACC-1086-6867",
   "accounts.buyer.id": "BUY-1591-2112",
-  "accounts.licensee.account.id": "ACC-1086-6867",
   "accounts.licensee.group.id": "UGR-2757-7226",
   "accounts.licensee.id": "LCE-5758-4071-6507",
   "accounts.module.id": "MOD-1756",

mpt_api_client/resources/accounts/account.py

@@ -39,11 +39,11 @@ class AccountsServiceConfig:
 
 
 class AccountsService(
-    CreateFileMixin[Model],
-    UpdateFileMixin[Model],
-    ActivatableMixin[Model],
-    EnablableMixin[Model],
-    ValidateMixin[Model],
+    CreateFileMixin[Account],
+    UpdateFileMixin[Account],
+    ActivatableMixin[Account],
+    EnablableMixin[Account],
+    ValidateMixin[Account],
     GetMixin[Account],
     CollectionMixin[Account],
     Service[Account],
@@ -59,11 +59,11 @@ def users(self, account_id: str) -> AccountsUsersService:
 
 
 class AsyncAccountsService(
-    AsyncCreateFileMixin[Model],
-    AsyncUpdateFileMixin[Model],
-    AsyncActivatableMixin[Model],
-    AsyncEnablableMixin[Model],
-    AsyncValidateMixin[Model],
+    AsyncCreateFileMixin[Account],
+    AsyncUpdateFileMixin[Account],
+    AsyncActivatableMixin[Account],
+    AsyncEnablableMixin[Account],
+    AsyncValidateMixin[Account],
     AsyncGetMixin[Account],
     AsyncCollectionMixin[Account],
     AsyncService[Account],

mpt_api_client/resources/accounts/buyers.py

@@ -38,11 +38,11 @@ class BuyersServiceConfig:
 
 
 class BuyersService(
-    CreateFileMixin[Model],
-    UpdateFileMixin[Model],
-    ActivatableMixin[Model],
-    EnablableMixin[Model],
-    ValidateMixin[Model],
+    CreateFileMixin[Buyer],
+    UpdateFileMixin[Buyer],
+    ActivatableMixin[Buyer],
+    EnablableMixin[Buyer],
+    ValidateMixin[Buyer],
     GetMixin[Buyer],
     DeleteMixin,
     CollectionMixin[Buyer],
@@ -71,11 +71,11 @@ def transfer(self, resource_id: str, resource_data: ResourceData | None = None)
 
 
 class AsyncBuyersService(
-    AsyncCreateFileMixin[Model],
-    AsyncUpdateFileMixin[Model],
-    AsyncActivatableMixin[Model],
-    AsyncEnablableMixin[Model],
-    AsyncValidateMixin[Model],
+    AsyncCreateFileMixin[Buyer],
+    AsyncUpdateFileMixin[Buyer],
+    AsyncActivatableMixin[Buyer],
+    AsyncEnablableMixin[Buyer],
+    AsyncValidateMixin[Buyer],
     AsyncGetMixin[Buyer],
     AsyncDeleteMixin,
     AsyncCollectionMixin[Buyer],

mpt_api_client/resources/accounts/licensees.py

@@ -33,9 +33,9 @@ class LicenseesServiceConfig:
 
 
 class LicenseesService(
-    CreateFileMixin[Model],
-    UpdateFileMixin[Model],
-    EnablableMixin[Model],
+    CreateFileMixin[Licensee],
+    UpdateFileMixin[Licensee],
+    EnablableMixin[Licensee],
     GetMixin[Licensee],
     DeleteMixin,
     CollectionMixin[Licensee],
@@ -46,9 +46,9 @@ class LicenseesService(
 
 
 class AsyncLicenseesService(
-    AsyncCreateFileMixin[Model],
-    AsyncUpdateFileMixin[Model],
-    AsyncEnablableMixin[Model],
+    AsyncCreateFileMixin[Licensee],
+    AsyncUpdateFileMixin[Licensee],
+    AsyncEnablableMixin[Licensee],
     AsyncGetMixin[Licensee],
     AsyncDeleteMixin,
     AsyncCollectionMixin[Licensee],

seed/accounts/account.py

@@ -0,0 +1,39 @@
+import logging
+import os
+
+from dependency_injector.wiring import Provide, inject
+
+from mpt_api_client.resources.accounts.account import Account
+from seed.container import Container
+from seed.context import Context
+from seed.helper import init_resource
+
+logger = logging.getLogger(__name__)
+
+
+@inject
+async def init_vendor_account_id(context: Context = Provide[Container.context]) -> Account:  # noqa: RUF029
+    """Initialize account ID in context."""
+    account_id = os.getenv("VENDOR_ACCOUNT_ID")
+    if not account_id:
+        raise ValueError("VENDOR_ACCOUNT_ID environment variable is required")
+    context["accounts.account.id"] = account_id
+    return Account({"id": account_id})
+
+
+@inject
+async def init_client_account_id(context: Context = Provide[Container.context]) -> Account:  # noqa: RUF029
+    """Initialize client account ID in context."""
+    account_id = os.getenv("CLIENT_ACCOUNT_ID")
+    if not account_id:
+        raise ValueError("CLIENT_ACCOUNT_ID environment variable is required")
+    context["accounts.client_account.id"] = account_id
+    return Account({"id": account_id})
+
+
+async def seed_account_ids() -> None:
+    """Seed account."""
+    logger.debug("Seeding vendor account ...")
+    await init_resource("accounts.account.id", init_vendor_account_id)
+    await init_resource("accounts.client_account.id", init_client_account_id)
+    logger.debug("Seeding account completed.")

seed/accounts/accounts.py

@@ -1,5 +1,6 @@
 import logging
 
+from seed.accounts.account import seed_account_ids
 from seed.accounts.api_tokens import seed_api_token
 from seed.accounts.buyer import seed_buyer
 from seed.accounts.licensee import seed_licensee
@@ -10,9 +11,12 @@
 logger = logging.getLogger(__name__)
 
 
-async def seed_accounts() -> None:  # noqa: WPS217
+async def seed_accounts() -> None:  # noqa: WPS217, WPS213
     """Seed accounts data including account."""
     logger.debug("Seeding accounts ...")
+
+    await seed_account_ids()
+
     await seed_seller()
     await seed_buyer()
     await seed_module()

seed/accounts/api_tokens.py

@@ -1,44 +1,23 @@
 import logging
-import os
 
 from dependency_injector.wiring import Provide, inject
 
 from mpt_api_client import AsyncMPTClient
 from mpt_api_client.resources.accounts.api_tokens import ApiToken
 from seed.container import Container
 from seed.context import Context
+from seed.helper import init_resource, require_context_id
 
 logger = logging.getLogger(__name__)
 
 
-@inject
-async def get_api_token(
-    context: Context = Provide[Container.context],
-    mpt_ops: AsyncMPTClient = Provide[Container.mpt_operations],
-) -> ApiToken | None:
-    """Get API token from context or fetch from API."""
-    api_token_id = context.get_string("accounts.api_token.id")
-    if not api_token_id:
-        return None
-    try:
-        api_token = context.get_resource("accounts.api_token", api_token_id)
-    except ValueError:
-        api_token = None
-    if not isinstance(api_token, ApiToken):
-        api_token = await mpt_ops.accounts.api_tokens.get(api_token_id)
-        context.set_resource("accounts.api_token", api_token)
-        context["accounts.api_token.id"] = api_token.id
-        return api_token
-    return api_token
-
-
 @inject
 def build_api_token_data(
     context: Context = Provide[Container.context],
 ) -> dict[str, object]:
     """Get API token data dictionary for creation."""
-    account_id = os.getenv("CLIENT_ACCOUNT_ID")
-    module_id = context.get_string("accounts.module.id")
+    account_id = require_context_id(context, "accounts.client_account.id", "creating API token")
+    module_id = require_context_id(context, "accounts.module.id", "creating API token")
     return {
         "account": {"id": account_id},
         "name": "E2E Seeded API Token",
@@ -49,27 +28,18 @@ def build_api_token_data(
 
 
 @inject
-async def init_api_token(
+async def create_api_token(
     context: Context = Provide[Container.context],
     mpt_ops: AsyncMPTClient = Provide[Container.mpt_operations],
 ) -> ApiToken:
-    """Get or create API token."""
-    api_token = await get_api_token(context=context, mpt_ops=mpt_ops)
-    if api_token is None:
-        logger.debug("Creating API token ...")
-        api_token_data = build_api_token_data(context=context)
-        api_token = await mpt_ops.accounts.api_tokens.create(api_token_data)
-        context.set_resource("accounts.api_token", api_token)
-        context["accounts.api_token.id"] = api_token.id
-        logger.info("API token created: %s", api_token.id)
-    else:
-        logger.info("API token found: %s", api_token.id)
-    return api_token
+    """Creates an API token."""
+    logger.debug("Creating API token ...")
+    api_token_data = build_api_token_data(context=context)
+    return await mpt_ops.accounts.api_tokens.create(api_token_data)
 
 
-@inject
 async def seed_api_token() -> None:
     """Seed API token."""
     logger.debug("Seeding API token ...")
-    await init_api_token()
+    await init_resource("accounts.api_token.id", create_api_token)
     logger.debug("Seeding API token completed.")

seed/accounts/buyer.py

@@ -1,50 +1,26 @@
 import logging
-import os
 
 from dependency_injector.wiring import Provide, inject
 
 from mpt_api_client import AsyncMPTClient
 from mpt_api_client.resources.accounts.buyers import Buyer
 from seed.container import Container
 from seed.context import Context
+from seed.helper import init_resource, require_context_id
 from seed.static.static import ICON
 
 logger = logging.getLogger(__name__)
 
 
-@inject
-async def get_buyer(
-    context: Context = Provide[Container.context],
-    mpt_operations: AsyncMPTClient = Provide[Container.mpt_operations],
-) -> Buyer | None:
-    """Get buyer from context or fetch from API."""
-    buyer_id = context.get_string("accounts.buyer.id")
-    if not buyer_id:
-        return None
-    try:
-        buyer = context.get_resource("accounts.buyer", buyer_id)
-    except ValueError:
-        buyer = None
-    if not isinstance(buyer, Buyer):
-        buyer = await mpt_operations.accounts.buyers.get(buyer_id)
-        context.set_resource("accounts.buyer", buyer)
-        context["accounts.buyer.id"] = buyer.id
-        return buyer
-    return buyer
-
-
 @inject
 def build_buyer_data(context: Context = Provide[Container.context]) -> dict[str, object]:
     """Build buyer data dictionary for creation."""
-    buyer_account_id = os.getenv("CLIENT_ACCOUNT_ID")
-    if not buyer_account_id:
-        raise ValueError("CLIENT_ACCOUNT_ID environment variable is required")
-    seller_id = context.get_string("accounts.seller.id")
-    if not seller_id:
-        raise ValueError("accounts.seller.id missing from context; seed seller before buyer.")
+    client_account_id = require_context_id(context, "accounts.client_account.id", "creating buyer")
+    seller_id = require_context_id(context, "accounts.seller.id", "creating buyer")
+
     return {
         "name": "E2E Seeded Buyer",
-        "account": {"id": buyer_account_id},
+        "account": {"id": client_account_id},
         "sellers": [{"id": seller_id}],
         "contact": {
             "firstName": "first",
@@ -62,31 +38,19 @@ def build_buyer_data(context: Context = Provide[Container.context]) -> dict[str,
 
 
 @inject
-async def init_buyer(
+async def create_buyer(
     context: Context = Provide[Container.context],
     mpt_operations: AsyncMPTClient = Provide[Container.mpt_operations],
 ) -> Buyer:
-    """Get or create buyer."""
-    buyer = await get_buyer(context=context, mpt_operations=mpt_operations)
-    if buyer is None:
-        buyer_data = build_buyer_data(context=context)
-        logger.debug("Creating buyer ...")
-        with ICON.open("rb") as icon_fd:
-            created = await mpt_operations.accounts.buyers.create(buyer_data, file=icon_fd)
-        if isinstance(created, Buyer):
-            context.set_resource("accounts.buyer", created)
-            context["accounts.buyer.id"] = created.id
-            logger.info("Buyer created: %s", created.id)
-            return created
-        logger.warning("Buyer creation failed")
-        raise ValueError("Buyer creation failed")
-    logger.info("Buyer found: %s", buyer.id)
-    return buyer
+    """Creates a buyer."""
+    buyer_data = build_buyer_data(context=context)
+    logger.debug("Creating buyer ...")
+    with ICON.open("rb") as icon_fd:
+        return await mpt_operations.accounts.buyers.create(buyer_data, file=icon_fd)
 
 
-@inject
 async def seed_buyer() -> None:
     """Seed buyer."""
     logger.debug("Seeding buyer ...")
-    await init_buyer()
+    await init_resource("accounts.buyer.id", create_buyer)
     logger.debug("Seeding buyer completed.")