elemento-loyalty-processing 1.0.5__tar.gz → 1.0.7__tar.gz

{elemento_loyalty_processing-1.0.5 → elemento_loyalty_processing-1.0.7}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: elemento-loyalty-processing
-Version: 1.0.5
+Version: 1.0.7
 Summary: Elemento Loyalty Processing
 Requires-Python: >=3.11
 Requires-Dist: kaiju-tools<3,>=2.4.9
+Requires-Dist: elemento-customers>=1.0.0
 Requires-Dist: kaiju-models<2,>=1.0.4
 Provides-Extra: server
 Requires-Dist: kaiju-db<3,>=2.3.0; extra == "server"

{elemento_loyalty_processing-1.0.5 → elemento_loyalty_processing-1.0.7}/app/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = "Anton Taraskin"
 __email__ = "hel.nidhoggr@gmail.com"
-__version__ = "1.0.4"
+__version__ = "1.0.6"

{elemento_loyalty_processing-1.0.5 → elemento_loyalty_processing-1.0.7}/app/client.py

@@ -5,6 +5,7 @@ from typing import Any
 
 from kaiju_tools.http import RPCClientService
 from kaiju_tools.services import SERVICE_CLASS_REGISTRY
+from msgspec import convert
 
 from .types import *
 
@@ -18,22 +19,6 @@ class ElementoLoyaltyProcessingClient(RPCClientService):
             method="Lists.products.set", params=dict(id=id, items=items), max_timeout=_max_timeout, nowait=_nowait
         )
 
-    async def lists_get_product_list(self, id: str, _max_timeout: int = None, _nowait: bool = False):
-        """Call Lists.products.get."""
-        return await self.call(
-            method="Lists.products.get", params=dict(id=id), max_timeout=_max_timeout, nowait=_nowait
-        )
-
-    async def lists_set_store_list(self, id: str, items: list, _max_timeout: int = None, _nowait: bool = False):
-        """Call Lists.stores.set."""
-        return await self.call(
-            method="Lists.stores.set", params=dict(id=id, items=items), max_timeout=_max_timeout, nowait=_nowait
-        )
-
-    async def lists_get_store_list(self, id: str, _max_timeout: int = None, _nowait: bool = False):
-        """Call Lists.stores.get."""
-        return await self.call(method="Lists.stores.get", params=dict(id=id), max_timeout=_max_timeout, nowait=_nowait)
-
     async def balance_get_balance(
         self, customer_id: CustomerId, _max_timeout: int = None, _nowait: bool = False
     ) -> Points:
@@ -45,21 +30,40 @@ class ElementoLoyaltyProcessingClient(RPCClientService):
     async def balance_calculate(
         self,
         customer: Customer.Fields | dict[str, Any],
+        items: list[Item] | list[dict[str, Any]],
         store_id: StoreId,
-        payment_type: str,
+        payment_type: str = None,
+        points_sub: Points = 0,
+        _max_timeout: int = None,
+        _nowait: bool = False,
+    ):
+        data = await self.call(
+            method="Balance.calculate",
+            params=dict(
+                customer=customer, store_id=store_id, items=items, payment_type=payment_type, points_sub=points_sub
+            ),
+            max_timeout=_max_timeout,
+            nowait=_nowait,
+        )
+        return convert(data, Cart)
+
+    async def balance_set_transaction(
+        self,
+        customer: Customer.Fields | dict[str, Any],
         items: list[Item] | list[dict[str, Any]],
-        transaction_id: TransactionId,
+        source: str,
+        store_id: StoreId,
+        payment_type: str,
+        transaction_id: TransactionExtId,
         action: str = BalanceAction.CALC.value,
         points_sub: Points = 0,
-        order_id: str = None,
-        timestamp: datetime = None,
-        meta: dict[str, Any] = None,
+        timestamp: datetime | str = None,
         _max_timeout: int = None,
         _nowait: bool = False,
-    ) -> Cart:
+    ) -> Transaction:
         """Call Balance.calculate_cart."""
         data = await self.call(
-            method="Balance.calculate_cart",
+            method="Balance.transaction.set",
             params=dict(
                 customer=customer,
                 store_id=store_id,
@@ -67,26 +71,26 @@ class ElementoLoyaltyProcessingClient(RPCClientService):
                 payment_type=payment_type,
                 points_sub=points_sub,
                 transaction_id=transaction_id,
-                order_id=order_id,
+                source=source,
                 timestamp=timestamp,
                 action=action,
-                meta=meta,
             ),
             max_timeout=_max_timeout,
             nowait=_nowait,
         )
-        return Cart(**data)
+        return convert(data, Transaction)
 
     async def balance_confirm_transaction(
         self, transaction_id: TransactionId, _max_timeout: int = None, _nowait: bool = False
-    ) -> None:
+    ) -> Transaction:
         """Call Balance.transaction.confirm."""
-        return await self.call(
+        data = await self.call(
             method="Balance.transaction.confirm",
             params=dict(transaction_id=transaction_id),
             max_timeout=_max_timeout,
             nowait=_nowait,
         )
+        return convert(data, Transaction)
 
     async def balance_revert_transaction(
         self, transaction_id: TransactionId, _max_timeout: int = None, _nowait: bool = False
@@ -101,14 +105,33 @@ class ElementoLoyaltyProcessingClient(RPCClientService):
 
     async def balance_commit_transaction(
         self, transaction_id: TransactionId, _max_timeout: int = None, _nowait: bool = False
-    ) -> None:
+    ) -> Transaction:
         """Call Balance.transaction.commit."""
-        return await self.call(
+        data = await self.call(
             method="Balance.transaction.commit",
             params=dict(transaction_id=transaction_id),
             max_timeout=_max_timeout,
             nowait=_nowait,
         )
+        return convert(data, Transaction)
+
+    async def balance_refund(
+        self,
+        customer_id: CustomerId,
+        source: str,
+        transaction_id: TransactionExtId,
+        positions: list[int],
+        _max_timeout: int = None,
+        _nowait: bool = False,
+    ) -> Points:
+        """Call Balance.refund."""
+        data = await self.call(
+            method="Balance.refund",
+            params=dict(customer_id=customer_id, source=source, transaction_id=transaction_id, positions=positions),
+            max_timeout=_max_timeout,
+            nowait=_nowait,
+        )
+        return Points(data)
 
     async def balance_create_event(
         self,

{elemento_loyalty_processing-1.0.5 → elemento_loyalty_processing-1.0.7}/app/types.py

@@ -17,7 +17,6 @@ __all__ = [
     "BalanceStatus",
     "Balance",
     "TransactionType",
-    "OrderItem",
     "TransactionId",
     "CustomerId",
     "Transaction",
@@ -36,16 +35,19 @@ __all__ = [
     "Points",
     "StoreId",
     "AppliedOffer",
+    "PointType",
+    "TransactionExtId",
 ]
 
 DATE_MAXVALUE = date.fromisoformat("3000-01-01")
 
-TransactionId = NewType("TransactionId", str)
+TransactionExtId = NewType("TransactionExtId", str)
+TransactionId = NewType("TransactionId", int)
 EventTypeId = NewType("EventTypeId", str)
 ListId = NewType("ListId", int)
 StoreId = NewType("StoreId", int)
 OfferId = NewType("OfferId", int)
-LifetimeId = NewType("LifetimeId", int)
+LifetimeId = NewType("LifetimeId", str)
 GroupId = NewType("GroupId", int)
 ConditionId = NewType("ConditionId", int)
 ActionId = NewType("ActionId", int)
@@ -88,28 +90,23 @@ class Balance(Struct):
     transaction_id: TransactionId | None = None
 
 
-class OrderItem(Struct):
-    product_id: str
-    quantity: int
-    price: Decimal
-    balance: Points
-    active: bool
-
-
 class TransactionType(Enum):
     ORDER = "ORDER"
     SCRIPT = "SCRIPT"
 
 
-class StoredTransaction(Struct):
-    created: datetime
-    customer_id: CustomerId
-    type: TransactionType
-    ext_id: TransactionId | None = None
-    order_id: str | None = None
-    active: bool = True
-    meta: dict[str, Any] | None = None
-    items: list[OrderItem] | None = None
+class _PointTypeData(TypedDict, total=False):
+    func: str
+    value: Any
+    time_unit: str
+
+
+class PointType(Struct):
+    updated: datetime
+    id: LifetimeId
+    label: str
+    activation: _PointTypeData
+    expiration: _PointTypeData
 
 
 class BalanceAction(Enum):
@@ -156,9 +153,23 @@ class Cart(Struct):
     customer_message: str | None = None
 
 
+class StoredTransaction(Struct):
+    id: TransactionId
+    created: datetime
+    customer_id: CustomerId
+    type: TransactionType
+    balance: list[int]
+    ext_id: TransactionExtId
+    source: str
+    data: dict[str, Any] = None
+    active: bool = True
+
+
 class Transaction(Struct):
-    id: TransactionId = None
-    order_id: str = None
+    ext_id: TransactionExtId
+    id: TransactionId
+    source: str
+    order_id: str | None = None
     customer_id: CustomerId = None
     timestamp: datetime = None
     cart: Cart = None

{elemento_loyalty_processing-1.0.5 → elemento_loyalty_processing-1.0.7}/pyproject.toml

@@ -1,10 +1,11 @@
 [project]
 name = "elemento-loyalty-processing"
-version = "1.0.5"
+version = "1.0.7"
 description = "Elemento Loyalty Processing"
 requires-python = ">=3.11"
 dependencies = [
     "kaiju-tools>=2.4.9,<3",
+    "elemento-customers>=1.0.0",
     "kaiju-models>=1.0.4,<2"
 ]