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

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

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

channel_app-0.0.155/bitbucket-pipelines.yml

@@ -0,0 +1,24 @@
+image: python:3.8.10
+
+pipelines:
+  pull-requests:
+    '**':
+      - step:
+          name: Test
+          caches:
+            - pip
+          script:
+            - python -m pip install --upgrade setuptools
+            - make install && make install-dev
+            - make test
+            - make coverage
+  tags:
+    '*':
+      - step:
+          name: Publish to PyPI
+          image: python:3.7-alpine
+          script:
+            - apk add gcc git libffi-dev musl-dev openssl-dev python3-dev
+            - pip install setuptools setuptools_scm twine
+            - python setup.py sdist bdist_wheel
+            - twine upload -u __token__ -p $PYPI_TOKEN --skip-existing dist/*

{channel_app-0.0.153 → channel_app-0.0.155}/channel_app/core/data.py

@@ -199,6 +199,7 @@ class CancellationRequestDto:
     order_item: str  # remote item number
     reason: str      # reason code
     remote_id: str
+    description: str
     cancellation_type: Optional[str] = "cancel"
 
 

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

@@ -60,8 +60,8 @@ class GetOrCreateAddress(OmnitronCommandInterface):
         data = {
             "email": address.email[:254],
             "phone_number": address.phone_number[:128],
-            "first_name": customer.first_name[:255],
-            "last_name": customer.last_name[:255],
+            "first_name": (address.first_name or customer.first_name)[:255],
+            "last_name": (address.last_name or customer.last_name)[:255],
             "customer": customer.pk,
             "country": country_pk,
             "city": city_pk,

{channel_app-0.0.153 → channel_app-0.0.155}/channel_app/omnitron/commands/tests/test_orders.py

@@ -8,10 +8,19 @@ from omnisdk.omnitron.endpoints import (
     ChannelOrderItemEndpoint,
     ChannelCancellationRequestEndpoint,
     ChannelBatchRequestEndpoint)
-from omnisdk.omnitron.models import CancellationRequest
-
-from channel_app.core.data import CancellationRequestDto, CustomerDto, OrderBatchRequestResponseDto
+from omnisdk.omnitron.models import (
+    CancellationRequest,
+    Customer
+)
+
+from channel_app.core.data import (
+    AddressDto,
+    CancellationRequestDto,
+    CustomerDto,
+    OrderBatchRequestResponseDto,
+)
 from channel_app.core.tests import BaseTestCaseMixin
+from channel_app.omnitron.commands.orders.addresses import GetOrCreateAddress
 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 (
@@ -20,11 +29,12 @@ from channel_app.omnitron.commands.orders.orders import (
     GetOrderItems, 
     GetOrderItemsWithOrder, 
     ProcessOrderBatchRequests,
-    ChannelIntegrationActionEndpoint)
+)
 from channel_app.omnitron.constants import (
     BatchRequestStatus,
     CancellationType, 
-    CustomerIdentifierField)
+    CustomerIdentifierField
+)
 
 
 class TestProcessOrderBatchRequests(BaseTestCaseMixin):
@@ -338,6 +348,49 @@ class TestGetOrCreateCustomer(BaseTestCaseMixin):
                 self.assertEqual(getattr(customer, key), value)
 
 
+class TestGetOrCreateAddress(BaseTestCaseMixin):
+    """
+    Test case for GetOrCreateAddress
+
+    run: python -m unittest channel_app.omnitron.commands.tests.test_orders.TestGetOrCreateAddress
+    """
+
+    def setUp(self) -> None:
+        self.instance = GetOrCreateAddress(
+            integration=self.mock_integration,
+        )
+        self.instance.objects = {}
+        self.instance.objects["address"]: AddressDto = AddressDto(
+            email="john.doe@akinon.com",
+            phone_number="05556667788",
+            first_name="John",
+            last_name="Doe",
+            country="1",
+            city="80",
+            line="Hemen sahil kenarı"
+        )
+        self.instance.objects["customer"]: Customer = Customer(
+            pk="1",
+            first_name="Customer John",
+            last_name="Customer Doe",
+        )
+
+
+    @patch.object(GetOrCreateAddress, 'get_location_objects')
+    def test_get_data(self, mock_get_location_objects):
+        mock_get_location_objects.return_value = (1, 80, None, None)
+        data = self.instance.get_data()
+
+        self.assertEqual(
+            data["first_name"],
+            self.instance.objects["address"].first_name
+        )
+        self.assertEqual(
+            data["last_name"],
+            self.instance.objects["address"].last_name
+        )
+
+
 class TestGetCargoCompany(BaseTestCaseMixin):
     """
     Test case for GetCargoCompany
@@ -570,7 +623,9 @@ class TestCreateCancellationRequest(BaseTestCaseMixin):
             order_item='1',
             reason='reason_code',
             remote_id='2',
-            cancellation_type=CancellationType.refund.value)
+            cancellation_type=CancellationType.refund.value,
+            description='description',
+        )
         return super().setUp()
 
     @patch.object(BaseClient, 'get_instance')

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

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

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

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

channel_app-0.0.153/bitbucket-pipelines.yml

@@ -1,14 +0,0 @@
-image: python:3.8.10
-
-pipelines:
-  pull-requests:
-    '**':
-      - step:
-          name: Test
-          caches:
-            - pip
-          script:
-            - python -m pip install --upgrade setuptools
-            - make install && make install-dev
-            - make test
-            - make coverage