From 6fb5dea1f85e58048c4ea4c7ca3531161eea5759 Mon Sep 17 00:00:00 2001 From: Daniel K Date: Sun, 17 Dec 2023 22:11:27 -0800 Subject: [PATCH 1/2] (add) meaningful defaults for rate and label generation requests --- .../karrio/providers/allied_express/rate.py | 12 ++++++------ .../providers/allied_express/shipment/create.py | 12 ++++++------ .../allied_express/tests/allied_express/test_rate.py | 1 + .../tests/allied_express/test_shipment.py | 1 + 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/connectors/allied_express/karrio/providers/allied_express/rate.py b/modules/connectors/allied_express/karrio/providers/allied_express/rate.py index 3177685912..1d1a94f8a4 100644 --- a/modules/connectors/allied_express/karrio/providers/allied_express/rate.py +++ b/modules/connectors/allied_express/karrio/providers/allied_express/rate.py @@ -93,9 +93,9 @@ def rate_request( for pkg in packages ], jobStopsP=allied.JobStopsType( - companyName=shipper.company_name, + companyName=(shipper.company_name or shipper.contact), contact=shipper.contact, - emailAddress=shipper.email, + emailAddress=shipper.email or " ", geographicAddress=allied.GeographicAddressType( address1=shipper.address_line1, address2=shipper.address_line2 or " ", @@ -104,12 +104,12 @@ def rate_request( state=shipper.state_code, suburb=shipper.city, ), - phoneNumber=shipper.phone_number, + phoneNumber=shipper.phone_number or "(00) 0000 0000", ), jobStopsD=allied.JobStopsType( - companyName=recipient.company_name, + companyName=(recipient.company_name or recipient.contact), contact=recipient.contact, - emailAddress=recipient.email, + emailAddress=recipient.email or " ", geographicAddress=allied.GeographicAddressType( address1=recipient.address_line1, address2=recipient.address_line2 or " ", @@ -118,7 +118,7 @@ def rate_request( state=recipient.state_code, suburb=recipient.city, ), - phoneNumber=recipient.phone_number, + phoneNumber=recipient.phone_number or "(00) 0000 0000", ), referenceNumbers=([payload.reference] if any(payload.reference or "") else []), serviceLevel=(service.value if service else "R"), diff --git a/modules/connectors/allied_express/karrio/providers/allied_express/shipment/create.py b/modules/connectors/allied_express/karrio/providers/allied_express/shipment/create.py index ba259a37e3..e50609ab2b 100644 --- a/modules/connectors/allied_express/karrio/providers/allied_express/shipment/create.py +++ b/modules/connectors/allied_express/karrio/providers/allied_express/shipment/create.py @@ -84,9 +84,9 @@ def shipment_request( for pkg in packages ], jobStopsP=allied.JobStopsType( - companyName=shipper.company_name, + companyName=(shipper.company_name or shipper.contact), contact=shipper.contact, - emailAddress=shipper.email, + emailAddress=shipper.email or " ", geographicAddress=allied.GeographicAddressType( address1=shipper.address_line1, address2=shipper.address_line2 or " ", @@ -95,12 +95,12 @@ def shipment_request( state=shipper.state_code, suburb=shipper.city, ), - phoneNumber=shipper.phone_number, + phoneNumber=shipper.phone_number or "(00) 0000 0000", ), jobStopsD=allied.JobStopsType( - companyName=recipient.company_name, + companyName=(recipient.company_name or recipient.contact), contact=recipient.contact, - emailAddress=recipient.email, + emailAddress=recipient.email or " ", geographicAddress=allied.GeographicAddressType( address1=recipient.address_line1, address2=recipient.address_line2 or " ", @@ -109,7 +109,7 @@ def shipment_request( state=recipient.state_code, suburb=recipient.city, ), - phoneNumber=recipient.phone_number, + phoneNumber=recipient.phone_number or "(00) 0000 0000", ), referenceNumbers=([payload.reference] if any(payload.reference or "") else []), weight=packages.weight.KG, diff --git a/modules/connectors/allied_express/tests/allied_express/test_rate.py b/modules/connectors/allied_express/tests/allied_express/test_rate.py index 0876e80454..b0e6bed07f 100644 --- a/modules/connectors/allied_express/tests/allied_express/test_rate.py +++ b/modules/connectors/allied_express/tests/allied_express/test_rate.py @@ -170,6 +170,7 @@ def test_parse_error_response(self): "state": "WA", "suburb": "CANNING VALE", }, + "phoneNumber": "(00) 0000 0000", }, "jobStops_P": { "companyName": "TESTING COMPANY", diff --git a/modules/connectors/allied_express/tests/allied_express/test_shipment.py b/modules/connectors/allied_express/tests/allied_express/test_shipment.py index af7415aea4..77ebdf5aaf 100644 --- a/modules/connectors/allied_express/tests/allied_express/test_shipment.py +++ b/modules/connectors/allied_express/tests/allied_express/test_shipment.py @@ -215,6 +215,7 @@ def test_parse_error_response(self): "state": "WA", "suburb": "CANNING VALE", }, + "phoneNumber": "(00) 0000 0000", }, "jobStops_P": { "companyName": "TESTING COMPANY", From 602cfa770564b51862b37d33b84a1e587514a4a2 Mon Sep 17 00:00:00 2001 From: Daniel K Date: Sun, 17 Dec 2023 22:12:41 -0800 Subject: [PATCH 2/2] (bump) up release version --- modules/connectors/allied_express/setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/connectors/allied_express/setup.py b/modules/connectors/allied_express/setup.py index 9c287dece9..688287ae81 100644 --- a/modules/connectors/allied_express/setup.py +++ b/modules/connectors/allied_express/setup.py @@ -1,4 +1,3 @@ - """Warning: This setup.py is only there for git install until poetry support git subdirectory""" from setuptools import setup, find_namespace_packages @@ -7,7 +6,7 @@ setup( name="karrio.allied_express", - version="2023.12", + version="2023.12.1", description="Karrio - Allied Express Shipping Extension", long_description=long_description, long_description_content_type="text/markdown",