fix: allied express local with proper schema sample

karrioapi · Feb 23, 2024 · 535de06 · 535de06
1 parent 9c4803c
commit 535de06
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/.../connectors/allied_express_local/karrio/providers/allied_express_local/shipment/create.py b/.../connectors/allied_express_local/karrio/providers/allied_express_local/shipment/create.py
@@ -19,7 +19,7 @@ def parse_shipment_response(
     messages = error.parse_error_response(response, settings)
     shipment = (
         _extract_details(response, settings, ctx=_response.ctx)
-        if not response.is_error and "result" in (response.data or {})
+        if not response.is_error and "result" in (response.response or {})
         else None
     )
 
@@ -34,7 +34,7 @@ def _extract_details(
     shipment: shipping.LabelResponseType = lib.to_object(
         shipping.LabelResponseType, data.response
     )
-    label = shipment.soapenvBody.ns1getLabelResponse.result
+    label = shipment.result or shipment.soapenvBody.ns1getLabelResponse.result
 
     return models.ShipmentDetails(
         carrier_id=settings.carrier_id,

diff --git a/...les/connectors/allied_express_local/karrio/schemas/allied_express_local/label_response.py b/...les/connectors/allied_express_local/karrio/schemas/allied_express_local/label_response.py
@@ -1,5 +1,5 @@
 from attr import s
-from typing import Optional
+from typing import Optional, Any
 from jstruct import JStruct
 
 
@@ -18,7 +18,7 @@ class PriceType:
     jobCode: Optional[DiscountClassType] = JStruct[DiscountClassType]
     netPrice: Optional[str] = None
     rateCode: Optional[DiscountClassType] = JStruct[DiscountClassType]
-    reason: Optional[str] = None
+    reason: Any = None
 
 
 @s(auto_attribs=True)
@@ -29,7 +29,7 @@ class PriceDetailType:
 @s(auto_attribs=True)
 class Ns1GetLabelResponseType:
     xmlnsns1: Optional[str] = None
-    result: Optional[str] = None
+    result: Any = None
 
 
 @s(auto_attribs=True)
@@ -41,4 +41,5 @@ class SoapenvBodyType:
 class LabelResponseType:
     Tracking: Optional[str] = None
     pricedetail: Optional[PriceDetailType] = JStruct[PriceDetailType]
+    result: Optional[str] = None
     soapenvBody: Optional[SoapenvBodyType] = JStruct[SoapenvBodyType]
diff --git a/modules/connectors/allied_express_local/schemas/label_response.json b/modules/connectors/allied_express_local/schemas/label_response.json
@@ -1,5 +1,5 @@
 {
-    "Tracking": "AET1021116",
+    "Tracking": "AET1520983",
     "price_detail": {
         "price": {
             "chargeQuantity": "0",
@@ -8,21 +8,22 @@
                 "@xsi:nil": "1"
             },
             "discountRate": "0.0",
-            "grossPrice": "0.0",
+            "grossPrice": "14.21",
             "jobCode": {
                 "@xsi:nil": "1"
             },
-            "netPrice": "0.0",
+            "netPrice": "14.21",
             "rateCode": {
                 "@xsi:nil": "1"
             },
-            "reason": "No Hire time found"
+            "reason": null
         }
     },
+    "result": "CnN0YXJ0eHJlZgoxNDUwMQolJUVPRgo=",
     "soapenv:Body": {
         "ns1:getLabelResponse": {
             "@xmlns:ns1": "http://neptune.alliedexpress.com.au/ttws-ejb",
-            "result": "CnN0YXJ0eHJlZgoxNDUwMQolJUVPRgo="
+            "result": null
         }
     }
 }
diff --git a/modules/connectors/allied_express_local/tests/allied_express_local/test_shipment.py b/modules/connectors/allied_express_local/tests/allied_express_local/test_shipment.py
@@ -147,8 +147,8 @@ def test_parse_error_response(self):
         "docs": {"label": ANY},
         "label_type": "PDF",
         "meta": {"postal_code": "6155"},
-        "shipment_identifier": "AET1021116",
-        "tracking_number": "AET1021116",
+        "shipment_identifier": "AET1520983",
+        "tracking_number": "AET1520983",
     },
     [],
 ]
@@ -241,7 +241,7 @@ def test_parse_error_response(self):
 ShipmentCancelRequest = {"shipmentno": "123456789", "postalcode": "12345"}
 
 ShipmentResponse = """{
-    "Tracking": "AET1021116",
+    "Tracking": "AET1520983",
     "price_detail": {
         "price": {
             "chargeQuantity": "0",
@@ -250,21 +250,22 @@ def test_parse_error_response(self):
                 "@xsi:nil": "1"
             },
             "discountRate": "0.0",
-            "grossPrice": "0.0",
+            "grossPrice": "14.21",
             "jobCode": {
                 "@xsi:nil": "1"
             },
-            "netPrice": "0.0",
+            "netPrice": "14.21",
             "rateCode": {
                 "@xsi:nil": "1"
             },
-            "reason": "No Hire time found"
+            "reason": null
         }
     },
+    "result": "JVBERi0xLjMKJeLjz9MKMSAwIG9iago8PAovVHlwZSAvUGFnZXMKL0NvdW50IDIKL0tpZHMgWyA0IDAgUiA5IDAgUiBdCj4+CmVuZG9iagoyIDAgb2JqCjw8Ci9Qcm9kdWNlciAocHlwZGYpCj4+CmVuZG9iagozIDAgb2JqCjw8Ci9UeXBlIC9DYXRhbG9nCi9QYWdlcyAxIDAgUgo+PgplbmRvYmoKNCAwIG9iago8PAovQ29udGVudHMgNSAwIFIKL01lZGlhQm94IFsgMCAwIDQxOS41Mjc2IDI5Ny42Mzc4IF0KL1Jlc291cmNlcyA8PAovRm9udCA2IDAgUgovUHJvY1NldCBbIC9QREYgL1RleHQgL0ltYWdlQiAvSW1hZ2VDIC9JbWFnZUkgXQo+PgovUm90YXRlIDAKL1RyYW5zIDw8Cj4+Ci9UeXBlIC9QYWdlCi9QYXJlbnQgMSAwIFIKPj4KZW5kb2JqCjUgMCBvYmoKPDwKL0ZpbHRlciBbIC9BU0NJSTg1RGVjb2RlIC9GbGF0ZURlY29kZSBdCi9MZW5ndGggODM5Cj4+CnN0cmVhbQpHYXRVMWI+LWVnJkRjTSJBbFNrYGlRZzUmRzoiL184PF9PWFYkZjF1RUM7OV8yK0Q/XF49Uj8rSCFLQCcuVDBkdGNUMVM8JzhaLlFnJkkqcEo+NChvOkMpYiJUKV48Pk9TOXBDNCM8RENjWDs9bCdySk1DWXNrY1ghPzcqZDhPQGsyNCVbM0U5OTE3cDNtLG5AKSNELWZkWURoMklIYm4nPy0lTF5eOjE4P09LO3QhWDk8akdyKFE5ISloLlhuOHVVZSooPS5tSylta29JJ0A2KDVbKChrX3BMQD5nNGdkXkRON3BBZElPOT5xTURbPzptbVZNLzwmXTpMXSpAR3NOVSU5Mlc2Zi1sIlVhUmFnZUpwNSY2XnJaKDpWb21RY1pyUmc5cElZN1BELGRpay9BSG5DRT44aSJBJVIvYiZQOjJoTCc4SiJzV1pVdWc8OlZTMUhiXVMzVWdkbF46N2tJbl1HKWIxTGMnITQwaCxqVj8rbkc2UHByMnMxYzctSjs5O1xsR0UiPFQ+PEs2U09rQj9EWDI+SF5kc1JaaEBCU19XUipZY1pyTmFLYUVqVmJRLWBGUDhUMCliKWFMVDRFPyVCT1w9I0s/Ki9lYSFeV15RZiJnO0tXQ1sjLipWbSNtQ2tHb0V0dFRNODInQFtiKFBuJGBfXVVbTXUuMmxxRzpvZElCSUoxQmBbN28vO2dHcjZRN2pHKjMmPHUyRStbMUopaj1GTGthcmJpQyxYcStcXkAxWlhtWk8iUEJESTdbWjNFQ2pRZzJdPU42Yzw8ZTYjUDBDLFRiTigwTissK1tXNDg3XXNlLy9ObzVFdUNHcDFoc0xpSUlcKGI6alU4TVNNIiZpITo8KykmJzdsb3VTOEdnR0c3KiljWGFcOGkubChZMGg3NWduSk9vNj1OVDRwalNUZGY9RUlFRl1FP1A5Wj5OTDJTQ1N1MlBUM1hgYDA8WWxHdU0uIlY3VFA4ZTtJTFMhXTQnXiQvT0RlP0tpYjgyXGdZJzJqZmheaEQ1W1ZPRl8+T2lZRkFoRjRlJ1RvKk1mWSg9aCdYZFc3MDRcWmwhKVI0R2UuOlZcUy5Gc3FgKFhoKTxxOnBQSD9mIktGQGZ+PgplbmRzdHJlYW0KZW5kb2JqCjYgMCBvYmoKPDwKL0YxIDcgMCBSCi9GMiA4IDAgUgo+PgplbmRvYmoKNyAwIG9iago8PAovQmFzZUZvbnQgL0hlbHZldGljYQovRW5jb2RpbmcgL1dpbkFuc2lFbmNvZGluZwovTmFtZSAvRjEKL1N1YnR5cGUgL1R5cGUxCi9UeXBlIC9Gb250Cj4+CmVuZG9iago4IDAgb2JqCjw8Ci9CYXNlRm9udCAvSGVsdmV0aWNhLUJvbGQKL0VuY29kaW5nIC9XaW5BbnNpRW5jb2RpbmcKL05hbWUgL0YyCi9TdWJ0eXBlIC9UeXBlMQovVHlwZSAvRm9udAo+PgplbmRvYmoKOSAwIG9iago8PAovQ29udGVudHMgMTAgMCBSCi9NZWRpYUJveCBbIDAgMCA0MTkuNTI3NiAyOTcuNjM3OCBdCi9SZXNvdXJjZXMgPDwKL0ZvbnQgMTEgMCBSCi9Qcm9jU2V0IFsgL1BERiAvVGV4dCAvSW1hZ2VCIC9JbWFnZUMgL0ltYWdlSSBdCj4+Ci9Sb3RhdGUgMAovVHJhbnMgPDwKPj4KL1R5cGUgL1BhZ2UKL1BhcmVudCAxIDAgUgo+PgplbmRvYmoKMTAgMCBvYmoKPDwKL0ZpbHRlciBbIC9BU0NJSTg1RGVjb2RlIC9GbGF0ZURlY29kZSBdCi9MZW5ndGggODM5Cj4+CnN0cmVhbQpHYXRVMWI+LWVnJkRjTSJBbFNrYGlRZzUmRzoiL184PF9PWFYkZjF1RUM7OV8yK0Q/XF49Uj8rSCFLQCcuVDBkdGNUMVM8JzhaLlFnJkkqcEo+NChvOkMpYiJUKV48Pk9TOXBDNCM8RENjWDs9bCdySk1DWXNrY1ghPzcqZDhPQGsyNCVbM0U5OTE3cDNtLG5AKSNELWZkWURoMklIYm4nPy0lTF5eOjE4P09LO3QhWDk8akdyKFE5ISloLlhuOHVVZSooPS5tSylta29JJ0A2KDVbKChrX3BMQD5nNGdkXkRON3BBZElPOT5xTURbPzptbVZNLzwmXTpMXSpAR3NOVSU5Mlc2Zi1sIlVhUmFnZUpwNSY2XnJaKDpWb21RY1pyUmc5cElZN1BELGRpay9BSG5DRT44aSJBJVIvYiZQOjJoTCc4SiJzV1pVdWc8OlZTMUhiXVMzVWdkbF46N2tJbl1HKWIxTGMnITQwaCxqVj1VQCFKJT1eTUIsXCZOWCs9UFFlKWlfJEEzUytDN1VeUjFiREVldVAhdWsrbC4pLVQ9KyNEIVE8bEVidEk0QmlCNzBTVFtgUEw2MnJBLVErIWFSYjAxYmk6NlgybkhoQ3BqZ1Y2PGlHLDhMOGkmYjddNUovNT5mQ0NrZFMnSjAxMUI3NzEiPV9FaWRQJ141KlFzXFQ8IkglPi83V3RNa1h0NmNqI0k/N3IlcGFjJkdgZSsqbDxUVT5ibFxHYGBHNSNoKm5QQ2AxbkEhSG9sVjs8SCtUZ1lSViZYdENjMVEsLW43LGtKKS4xQU9QbDdqNltZY0AqMkoyMjh1dTpMc1FqXWMtTlYzOGdhYzE8YkVRLC1WSjczIStrOWBeREBJSUJsQisyVSpQQzpfQGF0ZD9vYSM3YFI2KU1sTW1HTShSXUZxZENbVGxgTlkqPFA5aDknaVZhIW9Wc0lyTGwrUD07cGg+PSw5clRrNEpXbEc1cmA3Z0BRRyJsVkg8Ll5hJ3BrS2VPXUYuODJYOUdVSlhPTUM7UixBK3FKJSsoWF1bRS5cXmRqInVbXjVDMCY9SDFpNm8/YDdiTm5McGM5Pz1ETCorODk3X2tFc0ZhVSFUKHJlQGZ+PgplbmRzdHJlYW0KZW5kb2JqCjExIDAgb2JqCjw8Ci9GMSAxMiAwIFIKL0YyIDEzIDAgUgo+PgplbmRvYmoKMTIgMCBvYmoKPDwKL0Jhc2VGb250IC9IZWx2ZXRpY2EKL0VuY29kaW5nIC9XaW5BbnNpRW5jb2RpbmcKL05hbWUgL0YxCi9TdWJ0eXBlIC9UeXBlMQovVHlwZSAvRm9udAo+PgplbmRvYmoKMTMgMCBvYmoKPDwKL0Jhc2VGb250IC9IZWx2ZXRpY2EtQm9sZAovRW5jb2RpbmcgL1dpbkFuc2lFbmNvZGluZwovTmFtZSAvRjIKL1N1YnR5cGUgL1R5cGUxCi9UeXBlIC9Gb250Cj4+CmVuZG9iagp4cmVmCjAgMTQKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDE1IDAwMDAwIG4gCjAwMDAwMDAwODAgMDAwMDAgbiAKMDAwMDAwMDExOSAwMDAwMCBuIAowMDAwMDAwMTY4IDAwMDAwIG4gCjAwMDAwMDAzNjcgMDAwMDAgbiAKMDAwMDAwMTI5NyAwMDAwMCBuIAowMDAwMDAxMzM4IDAwMDAwIG4gCjAwMDAwMDE0NDUgMDAwMDAgbiAKMDAwMDAwMTU1NyAwMDAwMCBuIAowMDAwMDAxNzU4IDAwMDAwIG4gCjAwMDAwMDI2ODkgMDAwMDAgbiAKMDAwMDAwMjczMyAwMDAwMCBuIAowMDAwMDAyODQxIDAwMDAwIG4gCnRyYWlsZXIKPDwKL1NpemUgMTQKL1Jvb3QgMyAwIFIKL0luZm8gMiAwIFIKPj4Kc3RhcnR4cmVmCjI5NTQKJSVFT0YK",
     "soapenv:Body": {
         "ns1:getLabelResponse": {
             "@xmlns:ns1": "http://neptune.alliedexpress.com.au/ttws-ejb",
-            "result": "CnN0YXJ0eHJlZgoxNDUwMQolJUVPRgo="
+            "result": null
         }
     }
 }