Added more tests and fixed duty.py file for multiple py version testing

Author: mmzeynalli

.pre-commit-config.yaml

@@ -28,7 +28,8 @@ repos:
         pass_filenames: false
       - id: test
         name: test
-        entry: duty test
+        files: \.py
+        entry: duty test-all-versions
         language: system
         pass_filenames: false
 

Makefile

@@ -14,6 +14,7 @@ actions = \
 	format \
 	lint \
 	type-check \
+	test-all-versions \
 	test \
 	coverage \
 	docs \

duties.py

@@ -6,7 +6,8 @@
 from pathlib import Path
 from typing import Iterator
 
-from duty import context, duty
+from duty import duty
+from duty._internal import context
 
 PYTHON_VERSIONS = os.getenv('PYTHON_VERSIONS', '3.9 3.10 3.11 3.12 3.13').split()
 
@@ -98,18 +99,36 @@ def type_check(ctx: context.Context, *files):
 
 @duty
 def test(ctx: context.Context, live: bool = False):
+    """Run tests on a single file."""
+    ctx.run(
+        (
+            'uv run --active --no-sync coverage run  -m pytest -sv --durations=10'
+            f'{" --live" if live else ""}'
+        ),
+        title='Running test',
+    )
+
+
+@duty
+def test_all_versions(ctx: context.Context, live: bool = False):
     """Run tests with local environment"""
     for ver in PYTHON_VERSIONS:
         venv_path = Path(f'.venvs{SEP}{ver}')
 
-        with environ(VIRTUAL_ENV=str(venv_path)):
-            ctx.run(
-                'uv run --active --no-sync coverage run --data-file=coverage/.coverage.py'
-                + ver
-                + ' -m pytest -sv --durations=10 '
-                + ('--live' if live else ''),
-                title=f'Running tests (python {ver})',
-            )
+        if sys.platform == 'win32':
+            activate_cmd = f'{venv_path}\\Scripts\\activate.bat && '
+        else:
+            activate_cmd = f'source {venv_path}/bin/activate && '
+
+        # PPrint python environment with uv
+        ctx.run(
+            (
+                f'{activate_cmd}uv run --active --no-sync '
+                f'coverage run --data-file=coverage/.coverage.py{ver}'
+                f' -m pytest -sv --durations=10 {" --live" if live else ""}'
+            ),
+            title=f'Running tests (python {ver})',
+        )
 
 
 @duty

src/integrify/clopos/client.py

@@ -34,6 +34,7 @@
     ObjectResponse,
 )
 from integrify.clopos.schemas.customers.object import Customer, Group
+from integrify.clopos.schemas.customers.request import CustomerFilter
 from integrify.clopos.schemas.enums import (
     CategoryType,
     DiscountType,
@@ -42,7 +43,7 @@
 )
 from integrify.clopos.schemas.orders.object import Order, OrderPayloadIn
 from integrify.clopos.schemas.products.object import Product, StopList
-from integrify.clopos.schemas.products.request import GetProducstRequestFilter
+from integrify.clopos.schemas.products.request import GetProducstRequestFilter, StopListFilter
 from integrify.clopos.schemas.receipts.object import Receipt, ReceiptProductIn
 from integrify.clopos.schemas.receipts.request import PaymentMethodIn, UpdateReceiptMetaData
 from integrify.clopos.schemas.sales.object import PaymentMethod, SaleType
@@ -279,8 +280,7 @@ def get_customers(
             page: Unset[int] = 1,
             limit: Unset[int] = 20,
             with_: Unset[list[str]] = UNSET,
-            filter_bys: Unset[list[str]] = UNSET,
-            filter_values: Unset[list[str]] = UNSET,
+            filters: Unset[list[CustomerFilter]] = UNSET,
             *,
             headers: Unset[dict[str, str]] = UNSET,
         ) -> APIResponse[ObjectListResponse[Customer]]:
@@ -303,9 +303,8 @@ def get_customers(
             Args:
                 page: Page number for pagination (starts at 1)
                 limit: Maximum number of objects to return (1-100)
-                with_: Include related data in the response. Supported values: `group`, `balance`, `cashback_balance`. You can include multiple with parameters.
-                filter_bys: Filter by specific fields. Supported values: `name` (partial match), `phones`, `group_id`.
-                filter_values: Filter values matching the filter_bys
+                with_: Include related data in the response. Supported values: `group`, `balance`, cashback_balance. You can include multiple with parameters.
+                filters: List of filters to apply in format {'by': 'name'|'phones'|'group_id', 'value': str}
                 headers: Headers for request
             ```
             """  # noqa: E501
@@ -619,9 +618,7 @@ def get_product_by_id(
 
         def get_stop_list(
             self,
-            filter_bys: list[Literal['id', 'limit', 'timestamp']] = [],
-            filter_froms: list[int] = [],
-            filter_tos: list[int] = [],
+            filters: Unset[list[StopListFilter]] = UNSET,
             *,
             headers: Unset[dict[str, str]] = UNSET,
         ) -> APIResponse[ObjectListResponse[StopList]]:
@@ -639,19 +636,18 @@ def get_stop_list(
 
             # Or if you have set the environment variables
             CloposClient.get_stop_list(
-                filter_bys=['id', 'limit'],
-                filter_froms=[1, 0],
-                filter_tos=[100, 10],
+                filters=[
+                    {'by': 'id', 'from_': '0', 'to': '100'},
+                    {'by': 'limit', 'from_': '1', 'to': '10'},
+                ]
                 headers={'x-token': token},
-            ))  # Filter by id from 0 to 100 AND limit from 1 to 10
+            )  # Filter by id from 0 to 100 AND limit from 1 to 10
             ```
 
             **Response format: [`ObjectListResponse[StopList]`][integrify.clopos.schemas.common.response.ObjectListResponse]**
 
             Args:
-                filter_bys: Filter by: id, limit, timestamp
-                filter_froms: Filter from values
-                filter_tos: Filter to values
+                filters: List of filter options. Each filter is a dict with keys 'by', 'from_', and 'to'.
                 headers: Headers for request
             ```
             """  # noqa: E501

src/integrify/clopos/schemas/common/object.py

@@ -199,9 +199,12 @@ class Price(BaseModel):
     price: Decimal
     """Price"""
 
-    from_: int = Field(alias='from')
+    from_: UnsetOrNoneField[int] = Field(alias='from')
     """From which period"""
 
+    venue_id: UnsetOrNoneField[int]
+    """The venue ID"""
+
 
 class TimerSetting(BaseModel):
     interval: int

src/integrify/clopos/schemas/common/response.py

@@ -41,7 +41,15 @@ class ObjectListResponse(PaginatedResponse, Generic[_ObjectTypeT]):
     data: list[_ObjectTypeT]
 
 
+class Errors(BaseModel):
+    message: Optional[str] = None
+    type: Optional[str] = None
+    exception: Optional[str] = None
+    code: Optional[int] = None
+    http_code: Optional[int] = None
+
+
 class ErrorResponse(BaseModel):
     success: Literal[False]
-    error: str
+    error: Optional[list[Errors]] = None
     message: Optional[str] = None

src/integrify/clopos/schemas/customers/request.py

@@ -1,6 +1,7 @@
 from typing import Literal
 
 from pydantic import Field, model_serializer
+from typing_extensions import TypedDict
 
 from integrify.clopos.helpers import IsoDate
 from integrify.clopos.schemas.common.request import PaginatedDataRequest
@@ -9,22 +10,26 @@
 from integrify.utils import UnsetField, UnsetOrNoneField
 
 
+class CustomerFilter(TypedDict):
+    by: Literal['name', 'phones', 'group_id']
+    value: str
+
+
 class GetCustomersRequest(PaginatedDataRequest):
-    with_: UnsetField[list[Literal['group', 'balance', 'cashback_balance']]] = Field(alias='with[]')
-    filter_bys: UnsetField[list[str]] = Field(exclude=True)
-    filter_values: UnsetField[list[str]] = Field(exclude=True)
+    with_: UnsetField[list[Literal['group', 'balance', 'cashback_balance']]] = Field(exclude=True)
+    filters: UnsetField[list[CustomerFilter]] = Field(exclude=True)
 
-    @model_serializer(mode='wrap')
-    def serialize_model(self, serializer) -> dict:
+    @model_serializer()
+    def serialize_model(self) -> dict:
         """Model serializer"""
-        data = serializer(self)
+        data = {}
 
-        filter_bys = data.pop('filter_bys', [])
-        filter_values = data.pop('filter_values', [])
+        for i, with_item in enumerate(self.with_ or []):
+            data[f'with[{i}]'] = with_item
 
-        for i, (filter_by, filter_value) in enumerate(zip(filter_bys, filter_values)):
-            data[f'filters[{i}][0]'] = filter_by
-            data[f'filter[{i}][1]'] = filter_value
+        for i, filter_ in enumerate(self.filters or []):
+            data[f'filters[{i}][0]'] = filter_['by']
+            data[f'filter[{i}][1]'] = filter_['value']
 
         return data
 

src/integrify/clopos/schemas/products/request.py

@@ -1,4 +1,3 @@
-from itertools import zip_longest
 from typing import Literal, Union
 
 from pydantic import Field, field_serializer, model_serializer
@@ -53,7 +52,7 @@ class GetProducstRequestFilter(TypedDict):
 
 
 class GetProductsRequest(PaginatedDataRequest):
-    selects: UnsetField[Union[list[str], str]] = Field(alias='selects[]')
+    selects: UnsetField[Union[list[str], str]] = Field(serialization_alias='selects[]')
     filters: UnsetField[GetProducstRequestFilter]
 
     @field_serializer('selects')
@@ -71,7 +70,7 @@ def serialize_filters(self, filters):
             if value is not None:  # Only include non-None values
                 result[key] = [key, value]
 
-        return {'filters': result}
+        return result
 
 
 class GetProductByIDRequest(ByIDRequest):
@@ -89,26 +88,28 @@ class GetProductByIDRequest(ByIDRequest):
                 'setting',
             ]
         ]
-    ] = Field(alias='with[]')
+    ] = Field(serialization_alias='with[]')
+
+
+class StopListFilter(TypedDict):
+    by: Literal['id', 'limit', 'timestamp']
+    from_: int
+    to: NotRequired[int]
 
 
 class GetStopListRequest(PayloadBaseModel):
-    filter_bys: list[Literal['id', 'limit', 'timestamp']] = []
-    filter_froms: list[int] = []
-    filter_tos: list[int] = []
+    filters: UnsetField[list[StopListFilter]]
 
     @model_serializer
     def serialize_model(self) -> dict:
         """Model serializer"""
         data = {}
 
-        for i, (filter_name, fr, to) in enumerate(
-            zip_longest(self.filter_bys, self.filter_froms, self.filter_tos)
-        ):
-            data[f'filters[{i}][0]'] = filter_name
-            data[f'filters[{i}][1][0]'] = fr
+        for i, filter_ in enumerate(self.filters or []):
+            data[f'filters[{i}][0]'] = filter_['by']
+            data[f'filters[{i}][1][0]'] = filter_['from_']
 
-            if to:
-                data[f'filters[{i}][1][1]'] = to
+            if 'to' in filter_:
+                data[f'filters[{i}][1][1]'] = filter_['to']
 
         return data

tests/conftest.py

@@ -4,6 +4,7 @@
 import pytest
 
 from integrify.clopos.schemas.common.response import ObjectResponse
+from integrify.clopos.schemas.orders.object import Order
 from integrify.clopos.schemas.receipts.object import Receipt
 from integrify.schemas import APIResponse
 from integrify.test import pytest_addoption  # noqa: F401
@@ -36,6 +37,80 @@ def authed_client(client):
     yield client
 
 
+@pytest.fixture(scope='package')
+def authed_dry_client(client):
+    from tests.client import CloposTestClientClass
+
+    client = CloposTestClientClass(dry=True)
+    client._token = 'randomtoken'
+    yield client
+
+
+@pytest.fixture(scope='package')
+def new_order_resp(authed_client: 'CloposTestClientClass'):
+    resp = authed_client.create_order(
+        customer_id=1,
+        payload={  # type: ignore[arg-type]
+            'service': {
+                'sale_type_id': 2,
+                'sale_type_name': 'Delivery',
+                'venue_id': 1,
+                'venue_name': 'Main',
+            },
+            'customer': {
+                'id': 9,
+                'name': 'Rahid Akhundzada',
+                'customer_discount_type': 1,
+                'phone': '+994705401040',
+            },
+            'products': [
+                {
+                    'product_id': 1,
+                    'count': 1,
+                    'product_modificators': [
+                        {'modificator_id': 187, 'count': 1},
+                        {'modificator_id': 201, 'count': 1},
+                    ],
+                    'meta': {
+                        'price': 0,
+                        'order_product': {
+                            'product': {
+                                'id': 1,
+                                'name': 'Mega Dürüm Menü Alana Çiğ Köfte Dürüm',
+                                'category_id': 1,
+                                'station_id': 1,
+                                'price': 0,
+                            },
+                            'count': 1,
+                            'status': 'completed',
+                            'product_modificators': [
+                                {'modificator_id': 187, 'count': 1},
+                                {'modificator_id': 201, 'count': 1},
+                            ],
+                            'product_hash': 'MTExODcsMTEyMDE=',
+                        },
+                    },
+                }
+            ],
+        },
+        meta={
+            'comment': '',
+            'discount': {'discount_type': 1, 'discount_value': 10},
+            'orderTotal': '16.2000',
+            'apply_service_charge': True,
+            'customer_discount_type': 1,
+            'service_charge_value': 0,
+        },
+    )
+
+    yield resp
+
+
+@pytest.fixture(scope='package')
+def new_order_object(new_order_resp: APIResponse[ObjectResponse[Order]]):
+    yield new_order_resp.body.data
+
+
 @pytest.fixture(scope='package')
 def new_receipt_resp(authed_client: 'CloposTestClientClass'):
     cid = uuid.uuid4().hex