Merge pull request #139 from purplship/update-dhl-universal-response-mapper

[patch] Update dhl universal response mapper

Author: danh91

extensions/dhl_universal/purplship/providers/dhl_universal/tracking.py

@@ -1,7 +1,6 @@
 from typing import List, Tuple
 from dhl_universal_lib.tracking import (
     TrackingRequest as DHLTrackingRequest,
-    Shipment,
 )
 from purplship.core.utils import (
     Serializable,
@@ -21,35 +20,35 @@
 def parse_tracking_response(response: List[dict], settings: Settings) -> Tuple[List[TrackingDetails], List[Message]]:
     errors = [e for e in response if 'shipments' not in e]
     details = [
-        _extract_detail(Shipment(**d['shipments'][0]), settings)
+        _extract_detail(d['shipments'][0], settings)
         for d in response if 'shipments' in d
     ]
 
     return details, parse_error_response(errors, settings)
 
 
-def _extract_detail(detail: Shipment, settings: Settings) -> TrackingDetails:
+def _extract_detail(detail: dict, settings: Settings) -> TrackingDetails:
     return TrackingDetails(
         carrier_name=settings.carrier_name,
         carrier_id=settings.carrier_id,
 
-        tracking_number=str(detail.id),
+        tracking_number=str(detail.get('id')),
         events=[
             TrackingEvent(
-                date=DF.fdate(event.timestamp, '%Y-%m-%dT%H:%M:%S'),
-                description=event.description,
+                date=DF.fdate(event.get('timestamp'), '%Y-%m-%dT%H:%M:%S'),
+                description=event.get('description'),
                 location=(
-                    event.location.address.addressLocality
-                    if event.location is not None and event.location.address is not None
+                    event['location']['address'].get('addressLocality')
+                    if event.get('location') is not None and event.get('location').get('address') is not None
                     else None
                 ),
-                code=event.statusCode,
-                time=DF.ftime(event.timestamp, '%Y-%m-%dT%H:%M:%S'),
-            ) for event in detail.events
+                code=event.get('statusCode'),
+                time=DF.ftime(event.get('timestamp'), '%Y-%m-%dT%H:%M:%S'),
+            ) for event in detail.get('events') or []
         ],
         delivered=(
-            detail.status.status.lower() == "delivered"
-            if all([detail.status, detail.status.status]) else
+            detail['status']['status'].lower() == "delivered"
+            if all([detail['status'], detail['status']['status']]) else
             False
         )
     )

extensions/dhl_universal/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "purplship.dhl_universal"
-version = "2021.3.1"
+version = "2021.6"
 homepage="https://sdk.purplship.com"
 repository="https://github.com/Purplship/purplship"
 description = "Purplship - DHL Universal Tracking Extension"

extensions/purolator/purplship/providers/purolator/rate.py

@@ -92,7 +92,7 @@ def _extract_rate(estimate_node: Element, settings: Settings) -> RateDetails:
         duties_and_taxes=NF.decimal(sum(c.amount for c in duties_and_taxes)),
         extra_charges=(duties_and_taxes + surcharges + option_charges),
         meta=dict(
-            service_name=(service.name or quote.service_name)
+            service_name=service.name_or_key
         )
     )