Merge pull request #86 from PurplShip/purplship-2020.11-patch

danh91 · web-flow · commit 8c97e9b2aa4f · 2020-11-29T22:40:28.000-05:00
[patch] purplship SDK 2020.11
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -22,13 +22,8 @@ jobs:
     - name: Install and Run tests
       run: |
         source ./script.sh
-        create_env &&
-        mkdir "${ROOT:?}/wheels" &&
-        wheels="${ROOT:?}/wheels" PIP_FIND_LINKS=file://"${ROOT:?}/wheels" build
-        pip install -r "${ROOT:?}/requirements.txt" &&
-        install_submodules &&
-        typecheck &&
-        test &&
+        init &&
+        check &&
         coverage report -m &&
         pip install codecov &&
         codecov
diff --git a/extensions/canadapost/purplship/providers/canadapost/rate.py b/extensions/canadapost/purplship/providers/canadapost/rate.py
@@ -15,7 +15,7 @@
 from functools import reduce
 from datetime import datetime
 from typing import List, Tuple, cast
-from purplship.core.utils import Serializable, export, Element, decimal
+from purplship.core.utils import Serializable, export, Element, decimal, no_space
 from purplship.providers.canadapost.utils import Settings
 from purplship.core.units import Country, Currency, Packages, Services, Options
 from purplship.core.errors import OriginNotServicedError
@@ -101,8 +101,8 @@ def rate_request(
         options=(
             optionsType(
                 option=[
-                    optionType(option_code=code, option_amount=value)
-                    for code, value in requested_options
+                    optionType(option_code=OptionCode[code].value, option_amount=_amount(value))
+                    for code, value in requested_options if code in OptionCode
                 ]
             )
             if any(requested_options) else None
@@ -124,20 +124,20 @@ def rate_request(
             )
             if any(requested_services) else None
         ),
-        origin_postal_code=payload.shipper.postal_code,
+        origin_postal_code=no_space(payload.shipper.postal_code),
         destination=destinationType(
             domestic=(
-                domesticType(postal_code=(payload.recipient.postal_code or '').strip())
+                domesticType(postal_code=no_space(payload.recipient.postal_code))
                 if (payload.recipient.country_code == Country.CA.name)
                 else None
             ),
             united_states=(
-                united_statesType(zip_code=(payload.recipient.postal_code or '').strip())
+                united_statesType(zip_code=no_space(payload.recipient.postal_code))
                 if (payload.recipient.country_code == Country.US.name)
                 else None
             ),
             international=(
-                internationalType(country_code=payload.recipient.country_code)
+                internationalType(country_code=no_space(payload.recipient.postal_code))
                 if (
                     payload.recipient.country_code
                     not in [Country.US.name, Country.CA.name]
@@ -154,3 +154,10 @@ def _request_serializer(request: mailing_scenario) -> str:
     return export(
         request, namespacedef_='xmlns="http://www.canadapost.ca/ws/ship/rate-v4"'
     )
+
+
+def _amount(value):
+    if isinstance(value, (bool)):
+        return None
+
+    return float(value)
diff --git a/extensions/canadapost/purplship/providers/canadapost/shipment/contract.py b/extensions/canadapost/purplship/providers/canadapost/shipment/contract.py
@@ -22,7 +22,7 @@
     groupIdOrTransmitShipment,
 )
 from purplship.core.units import Currency, WeightUnit, Options, Packages
-from purplship.core.utils import export, concat_str, Serializable, Element
+from purplship.core.utils import export, concat_str, Serializable, Element, no_space
 from purplship.core.models import (
     Message,
     ShipmentDetails,
@@ -90,7 +90,7 @@ def compute_amount(code: str, _: Any):
 
     special_services = {
         OptionCode[name].value: compute_amount(OptionCode[name].value, value)
-        for name, value in options
+        for name, value in options if name in OptionCode
     }
     payment_type = (
         PaymentType[payload.payment.paid_by].value
@@ -106,7 +106,7 @@ def compute_amount(code: str, _: Any):
         groupIdOrTransmitShipment=groupIdOrTransmitShipment(),
         quickship_label_requested=None,
         cpc_pickup_indicator=None,
-        requested_shipping_point=(payload.shipper.postal_code or '').strip(),
+        requested_shipping_point=no_space(payload.shipper.postal_code),
         shipping_point_id=None,
         expected_mailing_date=None,
         provide_pricing_info=True,
@@ -121,7 +121,7 @@ def compute_amount(code: str, _: Any):
                     city=payload.shipper.city,
                     prov_state=payload.shipper.state_code,
                     country_code=payload.shipper.country_code,
-                    postal_zip_code=(payload.shipper.postal_code or '').strip(),
+                    postal_zip_code=no_space(payload.shipper.postal_code),
                     address_line_1=concat_str(payload.shipper.address_line1, join=True),
                     address_line_2=concat_str(payload.shipper.address_line2, join=True),
                 ),
@@ -135,7 +135,7 @@ def compute_amount(code: str, _: Any):
                     city=payload.recipient.city,
                     prov_state=payload.recipient.state_code,
                     country_code=payload.recipient.country_code,
-                    postal_zip_code=(payload.recipient.postal_code or '').strip(),
+                    postal_zip_code=no_space(payload.recipient.postal_code),
                     address_line_1=concat_str(
                         payload.recipient.address_line1, join=True
                     ),
diff --git a/extensions/canadapost/purplship/providers/canadapost/shipment/non_contract.py b/extensions/canadapost/purplship/providers/canadapost/shipment/non_contract.py
@@ -19,7 +19,7 @@
     PreferencesType,
 )
 from purplship.core.units import Currency, WeightUnit, Options, Packages
-from purplship.core.utils import export, concat_str, Serializable, Element
+from purplship.core.utils import export, concat_str, Serializable, Element, no_space
 from purplship.core.models import (
     Message,
     ShipmentDetails,
@@ -82,7 +82,7 @@ def compute_amount(code: str, _: Any):
 
     special_services = {
         OptionCode[name].value: compute_amount(OptionCode[name].value, value)
-        for name, value in options
+        for name, value in options if name in OptionCode
     }
 
     if is_intl and not any(key in special_services for key in INTERNATIONAL_NON_DELIVERY_OPTION):
@@ -101,7 +101,7 @@ def compute_amount(code: str, _: Any):
                     address_line_2=concat_str(payload.shipper.address_line2, join=True),
                     city=payload.shipper.city,
                     prov_state=payload.shipper.state_code,
-                    postal_zip_code=(payload.shipper.postal_code or '').strip(),
+                    postal_zip_code=no_space(payload.shipper.postal_code),
                 ),
             ),
             destination=DestinationType(
@@ -119,7 +119,7 @@ def compute_amount(code: str, _: Any):
                     city=payload.recipient.city,
                     prov_state=payload.recipient.state_code,
                     country_code=payload.recipient.country_code,
-                    postal_zip_code=(payload.recipient.postal_code or '').strip(),
+                    postal_zip_code=no_space(payload.recipient.postal_code),
                 ),
             ),
             options=(
diff --git a/extensions/canadapost/purplship/providers/canadapost/units.py b/extensions/canadapost/purplship/providers/canadapost/units.py
@@ -116,3 +116,4 @@ class OptionCode(Flag):
     """ Unified Option type mapping """
     insurance = canadapost_coverage
     cash_on_delivery = canadapost_collect_on_delivery
+    signature_confirmation = canadapost_signature
diff --git a/extensions/canadapost/setup.py b/extensions/canadapost/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="purplship.canadapost",
-    version="2020.11",
+    version="2020.11.1",
     description="Multi-carrier shipping API integration with python",
     url="https://github.com/PurplShip/purplship",
     author="Purplship Team",
diff --git a/extensions/ups/purplship/providers/ups/package/shipment/create.py b/extensions/ups/purplship/providers/ups/package/shipment/create.py
@@ -32,7 +32,7 @@
     LabelSpecificationType,
     LabelImageFormatType,
 )
-from purplship.core.utils.helpers import export, concat_str, gif_to_pdf
+from purplship.core.utils.helpers import export, concat_str, gif_to_pdf, no_space
 from purplship.core.utils.serializable import Serializable
 from purplship.core.utils.soap import apply_namespaceprefix, create_envelope
 from purplship.core.utils.xml import Element
@@ -124,7 +124,7 @@ def shipment_request(
                     ),
                     City=payload.shipper.city,
                     StateProvinceCode=payload.shipper.state_code,
-                    PostalCode=payload.shipper.postal_code,
+                    PostalCode=no_space(payload.shipper.postal_code),
                     CountryCode=payload.shipper.country_code,
                 ),
             ),
@@ -148,7 +148,7 @@ def shipment_request(
                     ),
                     City=payload.recipient.city,
                     StateProvinceCode=payload.recipient.state_code,
-                    PostalCode=payload.recipient.postal_code,
+                    PostalCode=no_space(payload.recipient.postal_code),
                     CountryCode=payload.recipient.country_code,
                 ),
             ),
@@ -172,8 +172,8 @@ def shipment_request(
                                     ),
                                     City=payload.shipper.city,
                                     StateProvinceCode=payload.shipper.state_code,
-                                    PostalCode=payload.payment.credit_card.postal_code
-                                    or payload.shipper.postal_code,
+                                    PostalCode=no_space(payload.payment.credit_card.postal_code)
+                                    or no_space(payload.shipper.postal_code),
                                     CountryCode=payload.shipper.country_code,
                                 ),
                             )
@@ -186,7 +186,7 @@ def shipment_request(
                         BillReceiver=BillReceiverType(
                             AccountNumber=payment.account_number,
                             Address=BillReceiverAddressType(
-                                PostalCode=payload.recipient.postal_code
+                                PostalCode=no_space(payload.recipient.postal_code)
                             ),
                         )
                         if payment.paid_by == PaymentType.recipient.name
diff --git a/extensions/ups/setup.py b/extensions/ups/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name="purplship.ups",
-    version="2020.11",
+    version="2020.11.1",
     description="Multi-carrier shipping API integration with python",
     url="https://github.com/PurplShip/purplship",
     author="Purplship Team",
diff --git a/purplship/core/utils/helpers.py b/purplship/core/utils/helpers.py
@@ -24,6 +24,13 @@ def concat_str(*args, join: bool = False):
     return strings if not join else " ".join(strings)
 
 
+def no_space(text: str = None):
+    if text is None:
+        return None
+
+    return ''.join(text.split())
+
+
 def export(xml_element: Element, **kwds) -> str:
     """Return a XML string.
 
diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -0,0 +1,15 @@
+-f https://git.io/purplship
+
+-e .[dev]
+-e ./extensions/boxknight
+-e ./extensions/canadapost
+-e ./extensions/canpar
+-e ./extensions/dhl_express
+-e ./extensions/dicom
+-e ./extensions/fedex
+-e ./extensions/fedex_express
+-e ./extensions/purolator
+-e ./extensions/purolator_courier
+-e ./extensions/ups
+-e ./extensions/ups_package
+-e ./extensions/usps
diff --git a/script.sh b/script.sh
@@ -41,7 +41,7 @@ install_submodules() {
 init() {
     create_env &&
     pip install -r "${ROOT:?}/requirements.txt" &&
-    install_submodules
+    pip install -r "${ROOT:?}/requirements.dev.txt"
 }
 
 
@@ -108,4 +108,4 @@ cli() {
   python "${ROOT:?}/cli.py" "$@"
 }
 
-env:on || true
+activate_env || true
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 ]
 
 setup(name='purplship',
-      version='2020.11',
+      version='2020.11.1',
       description='Multi-carrier shipping API integration with python',
       long_description=long_description,
       long_description_content_type="text/markdown",
diff --git a/tests/canadapost/rate.py b/tests/canadapost/rate.py
@@ -80,6 +80,7 @@ def test_parse_rate_missing_args_error(self):
         }
     ],
     "services": ["canadapost_expedited_parcel"],
+    "options": {"signature_confirmation": True, "insurance": 1000}
 }
 
 RateWithPresetPayload = {
@@ -232,6 +233,15 @@ def test_parse_rate_missing_args_error(self):
 RateRequestXML = f"""<mailing-scenario xmlns="http://www.canadapost.ca/ws/ship/rate-v4">
     <customer-number>2004381</customer-number>
     <expected-mailing-date>{datetime.today().strftime('%Y-%m-%d')}</expected-mailing-date>
+    <options>
+        <option>
+            <option-code>SO</option-code>
+        </option>
+        <option>
+            <option-code>COV</option-code>
+            <option-amount>1000.</option-amount>
+        </option>
+    </options>
     <parcel-characteristics>
         <weight>4.</weight>
         <dimensions>
