channel-app 0.0.151__tar.gz → 0.0.153__tar.gz

{channel_app-0.0.151/channel_app.egg-info → channel_app-0.0.153}/PKG-INFO

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

{channel_app-0.0.151 → channel_app-0.0.153}/channel_app/app/order/service.py

@@ -440,8 +440,8 @@ class OrderService(object):
         # configuration icinde yer alan reason_mapping anahtari bir json objesi,
         # key channel_reason value omnitron_reason olan bir dict objesinden
         # channel_reason'u döndürür
-        for channel_reason, omnitron_reason in configuration.get("reason_mapping", {}):
-            if omnitron_reason == omnitron_reason:
+        for channel_reason, omni_reason in configuration.get("reason_mapping", {}):
+            if omnitron_reason == omni_reason:
                 return channel_reason
         
         return "10"

{channel_app-0.0.151 → channel_app-0.0.153}/channel_app/omnitron/commands/orders/orders.py

@@ -409,7 +409,7 @@ class CreateOrderCancel(OmnitronCommandInterface):
             channel_id=self.integration.channel_id)
         params = {"channel": self.integration.channel_id,
                   "content_type_name": ContentType.order.value,
-                  "remote_id": order_remote_id}
+                  "remote_id__exact": order_remote_id}
         integration_actions = end_point.list(params=params)
         if not integration_actions:
             raise Exception(
@@ -438,7 +438,7 @@ class CreateOrderCancel(OmnitronCommandInterface):
         for order_item_remote_id in cancel_items:
             params = {"channel": self.integration.channel_id,
                       "content_type_name": ContentType.order_item.value,
-                      "remote_id": order_item_remote_id,
+                      "remote_id__exact": order_item_remote_id,
                       "sort": "id"}
             integration_actions = end_point.list(params=params)
             for item in end_point.iterator:
@@ -686,7 +686,7 @@ class UpdateOrderItems(OmnitronCommandInterface):
             channel_id=self.integration.channel_id)
         params = {"channel": self.integration.channel_id,
                   "content_type_name": ContentType.order_item.value,
-                  "remote_id": order_item_remote_id}
+                  "remote_id__exact": order_item_remote_id}
         integration_actions = end_point.list(params=params)
         if not integration_actions and len(integration_actions) != 1:
             return

{channel_app-0.0.151 → channel_app-0.0.153}/channel_app/omnitron/commands/product_stocks.py

@@ -246,7 +246,7 @@ class GetProductPricesFromProductStocks(OmnitronCommandInterface):
                 if isinstance(ps.product, Product):
                     product_ids.append(str(ps.product.pk))
                 else:
-                    product_ids.append(ps.product)
+                    product_ids.append(str(ps.product))
 
         prices = []
         for chunk in split_list(product_ids, self.CHUNK_SIZE):

{channel_app-0.0.151 → channel_app-0.0.153}/channel_app/omnitron/commands/products.py

@@ -338,7 +338,6 @@ class GetMappedProducts(OmnitronCommandInterface):
             headers = {"Accept-Language": language}
         else:
             headers = {}
-
         mapped_product_endpoint = self.endpoint(
             channel_id=self.integration.channel_id)
 
@@ -347,11 +346,18 @@ class GetMappedProducts(OmnitronCommandInterface):
                 attributes = mapped_product_endpoint.retrieve(headers=headers,
                                                               id=product.pk)
                 product.mapped_attributes = attributes
-            except HTTPError:
+            except HTTPError as http_err:
+                if http_err.response is not None and http_err.response.status_code == 406:
+                    try:
+                        error_content = http_err.response.json()
+                        fail_message = str(error_content.get('error', error_content))
+                    except ValueError:
+                        fail_message = http_err.response.text
+                
                 product.mapped_attributes = {}
                 product.failed_reason_type = FailedReasonType.mapping.value
                 self.failed_object_list.append(
-                    (product, ContentType.product.value, "MappingError"))
+                    (product, ContentType.product.value, fail_message))
                 continue
 
         return products

{channel_app-0.0.151 → channel_app-0.0.153}/channel_app/omnitron/commands/tests/test_products.py

@@ -1,5 +1,5 @@
-from typing import List
 from unittest.mock import MagicMock, patch
+from requests import HTTPError
 from omnisdk.base_client import BaseClient
 from omnisdk.omnitron.endpoints import (
     ChannelBatchRequestEndpoint,
@@ -11,7 +11,8 @@ from omnisdk.omnitron.endpoints import (
     ChannelProductPriceEndpoint,
     ChannelProductStockEndpoint, 
     ChannelExtraProductStockEndpoint, 
-    ChannelExtraProductPriceEndpoint
+    ChannelExtraProductPriceEndpoint,
+    ChannelMappedProductEndpoint,
 )
 from omnisdk.omnitron.models import (
     ChannelAttributeConfig, 
@@ -471,6 +472,47 @@ class TestGetMappedProducts(BaseTestCaseMixin):
         mock_get_mapping.return_value = []
         result = self.get_mapped_products.get_mapping([])
         self.assertEqual(result, [])
+    
+    @patch.object(BaseClient, 'get_instance')
+    def test_get_mapping_raise_http_error(
+        self,
+        mock_get_instance
+    ):
+        mock_response = MagicMock()
+        mock_response.status_code = 406
+        mock_response.json.return_value = {"error": "Test error"}
+
+        http_error = HTTPError(response=mock_response)
+        mock_endpoint = MagicMock()
+        mock_endpoint.retrieve.side_effect = http_error
+
+        with patch.object(
+            ChannelMappedProductEndpoint,
+            '__new__',
+            return_value=mock_endpoint
+        ):
+            test_product = Product(pk=1)
+            products = self.get_mapped_products.get_mapping([test_product])
+
+            self.assertEqual(products[0].mapped_attributes, {})
+            self.assertEqual(
+                products[0].failed_reason_type,
+                FailedReasonType.mapping.value
+            )
+            
+            self.assertEqual(len(self.get_mapped_products.failed_object_list), 1)
+            self.assertEqual(
+                self.get_mapped_products.failed_object_list[0][0],
+                test_product
+            )
+            self.assertEqual(
+                self.get_mapped_products.failed_object_list[0][1], 
+                ContentType.product.value
+            )
+            self.assertEqual(
+                self.get_mapped_products.failed_object_list[0][2],
+                "Test error"
+            )
 
 
 class TestGetMappedProductsWithOutCommit(TestGetMappedProducts):

{channel_app-0.0.151 → channel_app-0.0.153/channel_app.egg-info}/PKG-INFO

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

{channel_app-0.0.151 → channel_app-0.0.153}/setup.py

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