channel-app 0.0.146__tar.gz → 0.0.148__tar.gz

{channel_app-0.0.146/channel_app.egg-info → channel_app-0.0.148}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: channel_app
-Version: 0.0.146
+Version: 0.0.148
 Summary: Channel app for Sales Channels
 Home-page: https://github.com/akinon/channel_app
 Author: akinonteam

{channel_app-0.0.146 → channel_app-0.0.148}/channel_app/omnitron/commands/orders/addresses.py

@@ -162,16 +162,19 @@ class GetOrCreateAddress(OmnitronCommandInterface):
             district_pk = district.pk
         return country_pk, city_pk, township_pk, district_pk
 
-    def get_mapping_object(self, code, endpoint):
+    def get_mapping_object(self, code, endpoint, extra_filters=None):
         """
         :param code: Identifier code for the City and Country on the Sales Channel. This is
             prefix with channel_id as integration_code
         :param endpoint: omnitron sdk endpoint
+        :param extra_filters: extra filters for the endpoint, dict or None
         :return: mapped objects E.g (City, Country)
         """
         integration_code = f"{self.integration.channel_id}_{code}"
         params = {"mapping__code__exact": integration_code,
                   "mapping__integration_type": INTEGRATION_TYPE}
+        if extra_filters:
+            params.update(extra_filters)
         objects = endpoint.list(params=params)
         if len(objects) != 1:
             raise IntegrationMappingException(params={"code": integration_code})
@@ -235,7 +238,8 @@ class GetOrCreateAddress(OmnitronCommandInterface):
         if len(townships) == 1:
             return townships[0]
         try:
-            townships = self.get_mapping_object(township_name, endpoint)
+            extra_filters = {"city": city.pk, "is_active": True}
+            townships = self.get_mapping_object(township_name, endpoint, extra_filters)
         except IntegrationMappingException as exc:
             raise TownshipException(
                 params={"type": ErrorType.township.value,
@@ -264,7 +268,8 @@ class GetOrCreateAddress(OmnitronCommandInterface):
         if len(districts) == 1:
             return districts[0]
         try:
-            districts = self.get_mapping_object(district_name, endpoint)
+            extra_filters = {"city": city.pk, "township": township.pk, "is_active": True}
+            districts = self.get_mapping_object(district_name, endpoint, extra_filters)
         except IntegrationMappingException as exc:
             raise DistrictException(
                 params={"type": ErrorType.district.value,

{channel_app-0.0.146 → channel_app-0.0.148}/channel_app/omnitron/commands/tests/test_orders.py

@@ -2,15 +2,16 @@ from dataclasses import asdict
 from unittest.mock import MagicMock, patch
 from omnisdk.base_client import BaseClient
 from omnisdk.omnitron.endpoints import (
-    ChannelOrderEndpoint, 
     ChannelCargoEndpoint, 
     ChannelCustomerEndpoint,
+    ChannelOrderEndpoint,
+    ChannelOrderItemEndpoint,
 )
 from channel_app.core.data import CustomerDto, OrderBatchRequestResponseDto
 from channel_app.core.tests import BaseTestCaseMixin
 from channel_app.omnitron.commands.orders.cargo_companies import GetCargoCompany
 from channel_app.omnitron.commands.orders.customers import GetOrCreateCustomer
-from channel_app.omnitron.commands.orders.orders import ProcessOrderBatchRequests
+from channel_app.omnitron.commands.orders.orders import GetOrderItems, GetOrderItemsWithOrder, ProcessOrderBatchRequests
 from channel_app.omnitron.constants import BatchRequestStatus, CustomerIdentifierField
 
 
@@ -389,4 +390,95 @@ class TestGetCargoCompany(BaseTestCaseMixin):
                 cargo_company.erp_code, 
                 self.channel_cargo_endpoint_response_data['erp_code']
             )
-            
+        
+
+class TestGetOrderItems(BaseTestCaseMixin):
+    """
+    Test case for GetOrderItems
+    run: python -m unittest channel_app.omnitron.commands.tests.test_orders.TestGetOrderItems
+    """
+    def setUp(self) -> None:
+        self.instance = GetOrderItems(
+            integration=self.mock_integration,
+        )
+        self.order = MagicMock(
+            pk=1,
+        )
+        self.order_items = [
+            MagicMock(
+                pk=7,
+                order=1,
+                content_type='orderitem'
+            ),
+            MagicMock(
+                pk=8,
+                order=1,
+                content_type='orderitem'
+            )
+        ]
+        self.instance.objects = self.order
+
+    @patch.object(GetOrderItems, 'get_order_items')
+    def test_get_data(self, mock_get_order_items):
+        mock_get_order_items.return_value = self.order_items
+        order_items = self.instance.get_data()
+        
+        self.assertEqual(len(order_items), 2)
+
+        for order_item in order_items:
+            self.assertEqual(order_item.order, self.order.pk)
+            self.assertEqual(order_item.content_type, 'orderitem')
+
+    def test_get_order_items(self):
+        response = MagicMock()
+        response.list.return_value = self.order_items
+
+        with patch.object(
+            ChannelOrderItemEndpoint,
+            '__new__',
+            return_value=response
+        ):
+            order_items = self.instance.get_order_items(self.order)
+            self.assertEqual(len(order_items), 2)
+
+            for order_item in order_items:
+                self.assertEqual(order_item.order, self.order.pk)
+                self.assertEqual(order_item.content_type, 'orderitem')
+
+
+class TestGetOrderItemsWithOrder(BaseTestCaseMixin):
+    """
+    Test case for GetOrderItems
+    run: python -m unittest channel_app.omnitron.commands.tests.test_orders.TestGetOrderItemsWithOrder
+    """
+    def setUp(self) -> None:
+        self.instance = GetOrderItemsWithOrder(
+            integration=self.mock_integration,
+        )
+        self.orders = [
+            MagicMock(
+                pk=1,
+                orderitem_set=[],
+            ),
+        ]
+        self.order_items = [
+            MagicMock(
+                pk=7,
+                order=1,
+                content_type='orderitem'
+            ),
+            MagicMock(
+                pk=8,
+                order=1,
+                content_type='orderitem'
+            ),
+        ]
+        self.instance.objects = self.orders
+
+    @patch.object(GetOrderItemsWithOrder, 'get_order_items')
+    def test_get_data(self, mock_get_order_items):
+        mock_get_order_items.return_value = self.order_items
+        orders = self.instance.get_data()
+
+        self.assertEqual(len(orders), 1)
+        self.assertEqual(len(orders[0].orderitem_set), 2)

{channel_app-0.0.146 → channel_app-0.0.148/channel_app.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: channel_app
-Version: 0.0.146
+Version: 0.0.148
 Summary: Channel app for Sales Channels
 Home-page: https://github.com/akinon/channel_app
 Author: akinonteam

{channel_app-0.0.146 → channel_app-0.0.148}/setup.py

@@ -5,7 +5,7 @@ with open("README.md") as f:
 
 setup(
     name="channel_app",
-    version="0.0.146",
+    version="0.0.148",
     packages=find_packages(),
     url="https://github.com/akinon/channel_app",
     description="Channel app for Sales Channels",