Merge pull request #83 from PurplShip/purplship-2020.10.1-patch

[patch] Purplship 2020.10.1 patch

Author: danh91

extensions/ups/purplship/providers/ups/track.py

@@ -1,8 +1,8 @@
 from typing import List, Tuple
 from pyups.common import RequestType, TransactionReferenceType
-from pyups.track_web_service_schema import TrackRequest, ShipmentType, ActivityType
+from pyups.track_web_service_schema import TrackRequest, ShipmentType, ActivityType, AddressType
 from purplship.core.utils import export, Serializable, Element, format_date, format_time
-from purplship.core.utils.soap import apply_namespaceprefix, create_envelope, Envelope
+from purplship.core.utils.soap import apply_namespaceprefix, create_envelope, Envelope, build
 from purplship.core.models import (
     TrackingEvent,
     TrackingRequest,
@@ -24,16 +24,13 @@ def parse_track_response(
 
 
 def _extract_tracking(shipment_node: Element, settings: Settings) -> TrackingDetails:
-    track_detail = ShipmentType()
-    track_detail.build(shipment_node)
-    activity_nodes = shipment_node.xpath(".//*[local-name() = $name]", name="Activity")
-
-    def build_activity(node) -> ActivityType:
-        activity = ActivityType()
-        activity.build(node)
-        return activity
+    track_detail = build(ShipmentType, shipment_node)
+    activities = [
+        build(ActivityType, node)
+        for node in
+        shipment_node.xpath(".//*[local-name() = $name]", name="Activity")
+    ]
 
-    activities: List[ActivityType] = list(map(build_activity, activity_nodes))
     return TrackingDetails(
         carrier_name=settings.carrier_name,
         carrier_id=settings.carrier_id,
@@ -42,21 +39,28 @@ def build_activity(node) -> ActivityType:
             map(
                 lambda a: TrackingEvent(
                     date=format_date(a.Date, "%Y%m%d"),
-                    time=format_time(a.Time, "%H%M%S"),
-                    code=a.Status.Code if a.Status else None,
+                    description=a.Status.Description if a.Status else None,
                     location=(
-                        a.ActivityLocation.Address.City
-                        if a.ActivityLocation and a.ActivityLocation.Address
-                        else None
+                        _format_location(a.ActivityLocation.Address)
+                        if a.ActivityLocation is not None and a.ActivityLocation.Address is not None else None
                     ),
-                    description=a.Status.Description if a.Status else None,
+                    time=format_time(a.Time, "%H%M%S"),
+                    code=a.Status.Code if a.Status else None,
                 ),
                 activities,
             )
         ),
     )
 
 
+def _format_location(address: AddressType) -> str:
+    return ", ".join([
+        location for location in [
+            address.City, address.StateProvinceCode, address.CountryCode
+        ] if location is not None
+    ])
+
+
 def track_request(
     payload: TrackingRequest, settings: Settings
 ) -> Serializable[List[Envelope]]:

extensions/ups/setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name="purplship.ups",
-    version="2020.10.0",
+    version="2020.10.1",
     description="Multi-carrier shipping API integration with python",
     url="https://github.com/PurplShip/purplship",
     author="Purplship Team",

purplship/core/models.py

@@ -275,7 +275,7 @@ class TrackingEvent:
 
     date: str
     description: str
-    location: str
+    location: str = None
     code: str = None
     time: str = None
     signatory: str = None

setup.py

@@ -13,7 +13,7 @@
 ]
 
 setup(name='purplship',
-      version='2020.10.0',
+      version='2020.10.1',
       description='Multi-carrier shipping API integration with python',
       long_description=long_description,
       long_description_content_type="text/markdown",

tests/ups_package/tracking.py

@@ -79,42 +79,42 @@ def test_tracking_unknown_response_parsing(self):
                     "code": "KB",
                     "date": "2010-08-30",
                     "description": "UPS INTERNAL ACTIVITY CODE",
-                    "location": "BONN",
+                    "location": "BONN, DE",
                     "time": "10:39",
                 },
                 {
                     "code": "DJ",
                     "date": "2010-08-30",
                     "description": "ADVERSE WEATHER CONDITIONS CAUSED THIS DELAY",
-                    "location": "BONN",
+                    "location": "BONN, DE",
                     "time": "10:32",
                 },
                 {
                     "code": "X",
                     "date": "2010-09-10",
                     "description": "THE RECEIVER'S LOCATION WAS CLOSED ON THE 2ND DELIVERY ATTEMPT. A 3RD DELIVERY ATTEMPT WILL BE MADE",
-                    "location": "ANYTOWN",
+                    "location": "ANYTOWN, GA, US",
                     "time": "18:03",
                 },
                 {
                     "code": "FS",
                     "date": "2010-09-12",
                     "description": "DELIVERED",
-                    "location": "ANYTOWN",
+                    "location": "ANYTOWN, GA, US",
                     "time": "11:57",
                 },
                 {
                     "code": "PU",
                     "date": "2010-04-04",
                     "description": "PICKUP SCAN",
-                    "location": "WEST CHESTER-MALVERN",
+                    "location": "WEST CHESTER-MALVERN, GA, US",
                     "time": "14:40",
                 },
                 {
                     "code": "KB",
                     "date": "2010-08-30",
                     "description": "UPS INTERNAL ACTIVITY CODE",
-                    "location": "BONN",
+                    "location": "BONN, DE",
                     "time": "13:13",
                 },
             ],