Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions mpt_api_client/resources/catalog/products.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
AsyncParameterGroupsService,
ParameterGroupsService,
)
from mpt_api_client.resources.catalog.products_parameters import (
AsyncParametersService,
ParametersService,
)


class Product(Model):
Expand Down Expand Up @@ -45,6 +49,12 @@ def parameter_groups(self, product_id: str) -> ParameterGroupsService:
http_client=self.http_client, endpoint_params={"product_id": product_id}
)

def product_parameters(self, product_id: str) -> ParametersService:
"""Return product_parameters service."""
return ParametersService(
http_client=self.http_client, endpoint_params={"product_id": product_id}
)


class AsyncProductsService(
AsyncCreateMixin[Product],
Expand All @@ -61,3 +71,9 @@ def parameter_groups(self, product_id: str) -> AsyncParameterGroupsService:
return AsyncParameterGroupsService(
http_client=self.http_client, endpoint_params={"product_id": product_id}
)

def product_parameters(self, product_id: str) -> AsyncParametersService:
"""Return product_parameters service."""
return AsyncParametersService(
http_client=self.http_client, endpoint_params={"product_id": product_id}
)
40 changes: 40 additions & 0 deletions mpt_api_client/resources/catalog/products_parameters.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
from mpt_api_client.http import AsyncService, CreateMixin, DeleteMixin, Service
from mpt_api_client.http.mixins import (
AsyncCreateMixin,
AsyncDeleteMixin,
AsyncUpdateMixin,
UpdateMixin,
)
from mpt_api_client.models import Model


class Parameter(Model):
"""Parameter resource."""


class ParametersServiceConfig:
"""Parameters service configuration."""

_endpoint = "/public/v1/catalog/products/{product_id}/parameters"
_model_class = Parameter
_collection_key = "data"


class ParametersService(
CreateMixin[Parameter],
DeleteMixin,
UpdateMixin[Parameter],
Service[Parameter],
ParametersServiceConfig,
):
"""Parameters service."""


class AsyncParametersService(
AsyncCreateMixin[Parameter],
AsyncDeleteMixin,
AsyncUpdateMixin[Parameter],
AsyncService[Parameter],
ParametersServiceConfig,
):
"""Parameters service."""
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ per-file-ignores =
mpt_api_client/resources/catalog/products.py: WPS215
mpt_api_client/resources/catalog/items.py: WPS215
mpt_api_client/resources/catalog/products_parameter_groups.py: WPS215
mpt_api_client/resources/catalog/products_parameters.py: WPS215
tests/http/test_async_service.py: WPS204 WPS202
tests/http/test_service.py: WPS204 WPS202

Expand Down
18 changes: 6 additions & 12 deletions tests/resources/catalog/test_catalog.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from typing import Any

import pytest

from mpt_api_client.resources.catalog.catalog import AsyncCatalog, Catalog
Expand All @@ -8,12 +6,12 @@


@pytest.fixture
def catalog(http_client: Any) -> Catalog:
def catalog(http_client):
return Catalog(http_client=http_client)


@pytest.fixture
def async_catalog(async_http_client: Any) -> AsyncCatalog:
def async_catalog(async_http_client):
return AsyncCatalog(http_client=async_http_client)


Expand All @@ -24,9 +22,7 @@ def async_catalog(async_http_client: Any) -> AsyncCatalog:
("items", ItemsService),
],
)
def test_catalog_properties(
catalog: Catalog, property_name: str, expected_service_class: type
) -> None:
def test_catalog_properties(catalog, property_name, expected_service_class):
"""Test that Catalog properties return correct instances."""
service = getattr(catalog, property_name)

Expand All @@ -41,25 +37,23 @@ def test_catalog_properties(
("items", AsyncItemsService),
],
)
def test_async_catalog_properties(
async_catalog: AsyncCatalog, property_name: str, expected_service_class: type
) -> None:
def test_async_catalog_properties(async_catalog, property_name, expected_service_class):
"""Test that AsyncCatalog properties return correct instances."""
service = getattr(async_catalog, property_name)

assert isinstance(service, expected_service_class)
assert service.http_client is async_catalog.http_client


def test_catalog_initialization(http_client: Any) -> None:
def test_catalog_initialization(http_client):
"""Test that Catalog can be properly initialized with http_client."""
catalog = Catalog(http_client=http_client)

assert catalog.http_client is http_client
assert isinstance(catalog, Catalog)


def test_async_catalog_initialization(async_http_client: Any) -> None:
def test_async_catalog_initialization(async_http_client):
"""Test that AsyncCatalog can be properly initialized with http_client."""
async_catalog = AsyncCatalog(http_client=async_http_client)

Expand Down
10 changes: 4 additions & 6 deletions tests/resources/catalog/test_items.py
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
from typing import Any

import pytest

from mpt_api_client.resources.catalog.items import AsyncItemsService, ItemsService


@pytest.fixture
def items_service(http_client: Any) -> ItemsService:
def items_service(http_client):
return ItemsService(http_client=http_client)


@pytest.fixture
def async_items_service(async_http_client: Any) -> AsyncItemsService:
def async_items_service(async_http_client):
return AsyncItemsService(http_client=async_http_client)


@pytest.mark.parametrize(
"method", ["get", "create", "update", "delete", "review", "publish", "unpublish"]
)
def test_mixins_present(items_service: ItemsService, method: str) -> None:
def test_mixins_present(items_service, method):
assert hasattr(items_service, method)


@pytest.mark.parametrize(
"method", ["get", "create", "update", "delete", "review", "publish", "unpublish"]
)
def test_async_mixins_present(async_items_service: AsyncItemsService, method: str) -> None:
def test_async_mixins_present(async_items_service, method):
assert hasattr(async_items_service, method)
34 changes: 26 additions & 8 deletions tests/resources/catalog/test_products.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
AsyncParameterGroupsService,
ParameterGroupsService,
)
from mpt_api_client.resources.catalog.products_parameters import (
AsyncParametersService,
ParametersService,
)


@pytest.fixture
Expand All @@ -31,15 +35,29 @@ def test_async_mixins_present(async_products_service, method):
assert hasattr(async_products_service, method)


def test_parameters_groups_service(products_service):
parameters_groups_service = products_service.parameter_groups("PRD-001")
@pytest.mark.parametrize(
("service_method", "expected_service_class"),
[
("parameter_groups", ParameterGroupsService),
("product_parameters", ParametersService),
],
)
def test_property_services(products_service, service_method, expected_service_class):
property_service = getattr(products_service, service_method)("PRD-001")

assert isinstance(parameters_groups_service, ParameterGroupsService)
assert parameters_groups_service.endpoint_params == {"product_id": "PRD-001"}
assert isinstance(property_service, expected_service_class)
assert property_service.endpoint_params == {"product_id": "PRD-001"}


def test_async_parameters_groups_service(async_products_service):
parameters_groups_service = async_products_service.parameter_groups("PRD-001")
@pytest.mark.parametrize(
("service_method", "expected_service_class"),
[
("parameter_groups", AsyncParameterGroupsService),
("product_parameters", AsyncParametersService),
],
)
def test_async_property_services(async_products_service, service_method, expected_service_class):
property_service = getattr(async_products_service, service_method)("PRD-001")

assert isinstance(parameters_groups_service, AsyncParameterGroupsService)
assert parameters_groups_service.endpoint_params == {"product_id": "PRD-001"}
assert isinstance(property_service, expected_service_class)
assert property_service.endpoint_params == {"product_id": "PRD-001"}
6 changes: 2 additions & 4 deletions tests/resources/catalog/test_products_parameter_groups.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from typing import Any

import pytest

from mpt_api_client.resources.catalog.products_parameter_groups import (
Expand All @@ -9,14 +7,14 @@


@pytest.fixture
def parameter_groups_service(http_client: Any) -> ParameterGroupsService:
def parameter_groups_service(http_client):
return ParameterGroupsService(
http_client=http_client, endpoint_params={"product_id": "PRD-001"}
)


@pytest.fixture
def async_parameter_groups_service(async_http_client: Any) -> AsyncParameterGroupsService:
def async_parameter_groups_service(async_http_client):
return AsyncParameterGroupsService(
http_client=async_http_client, endpoint_params={"product_id": "PRD-001"}
)
Expand Down
36 changes: 36 additions & 0 deletions tests/resources/catalog/test_products_parameters.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import pytest

from mpt_api_client.resources.catalog.products_parameters import (
AsyncParametersService,
ParametersService,
)


@pytest.fixture
def parameters_service(http_client):
return ParametersService(http_client=http_client, endpoint_params={"product_id": "PRD-001"})


@pytest.fixture
def async_parameters_service(async_http_client):
return AsyncParametersService(
http_client=async_http_client, endpoint_params={"product_id": "PRD-001"}
)


def test_endpoint(parameters_service):
assert parameters_service.endpoint == "/public/v1/catalog/products/PRD-001/parameters"


def test_async_endpoint(async_parameters_service):
assert async_parameters_service.endpoint == "/public/v1/catalog/products/PRD-001/parameters"


@pytest.mark.parametrize("method", ["get", "create", "delete", "update"])
def test_methods_present(parameters_service, method):
assert hasattr(parameters_service, method)


@pytest.mark.parametrize("method", ["get", "create", "delete", "update"])
def test_async_methods_present(async_parameters_service, method):
assert hasattr(async_parameters_service, method)