(disable) dev dpdhl extension

sdk/extensions/dpdhl/generate

@@ -5,11 +5,12 @@ touch "${LIB_MODULES}/__init__.py"
 
 quicktype () {
     echo "Generating $1..."
-    docker run -it -v $PWD:/app -e SCHEMAS=/app/schemas -e LIB_MODULES=/app/karrio/schemas/dpdhl \
+    docker run -it -v $PWD:/app -e SCHEMAS=/app/schemas -e USER=$USER -e USERID=$UID -e LIB_MODULES=/app/karrio/schemas/dpdhl \
     karrio/tools /quicktype/script/quicktype --no-uuids --no-date-times --no-enums --src-lang json --lang jstruct \
     --no-nice-property-names --all-properties-optional --type-as-suffix $@
 }
 
+quicktype --src="${SCHEMAS}/cancel_response.json" --out="${LIB_MODULES}/cancel_response.py"
 quicktype --src="${SCHEMAS}/error_response.json" --out="${LIB_MODULES}/error_response.py"
 quicktype --src="${SCHEMAS}/shipping_request.json" --out="${LIB_MODULES}/shipping_request.py"
 quicktype --src="${SCHEMAS}/shipping_response.json" --out="${LIB_MODULES}/shipping_response.py"

sdk/extensions/dpdhl/karrio/mappers/dpdhl/mapper.py

@@ -40,7 +40,7 @@ def parse_cancel_shipment_response(
     def parse_rate_response(
         self, response: lib.Deserializable[str]
     ) -> typing.Tuple[typing.List[models.RateDetails], typing.List[models.Message]]:
-        return provider.parse_rate_response(response, self.settings)
+        return universal_provider.parse_rate_response(response, self.settings)
 
     def parse_shipment_response(
         self, response: lib.Deserializable[str]

sdk/extensions/dpdhl/karrio/mappers/dpdhl/proxy.py

@@ -16,7 +16,7 @@ def get_rates(self, request: lib.Serializable) -> lib.Deserializable[str]:
 
     def create_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
         response = lib.request(
-            url=f"{self.settings.server_url}/orders",
+            url=f"{self.settings.server_url}/v2/orders",
             data=request.serialize(),
             trace=self.trace_as("json"),
             method="POST",
@@ -30,7 +30,7 @@ def create_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
 
     def cancel_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
         response = lib.request(
-            url=f"{self.settings.server_url}/orders?profile=STANDARD_GRUPPENPROFIL&shipment={request.serialize()}",
+            url=f"{self.settings.server_url}/v2/orders?profile=STANDARD_GRUPPENPROFIL&shipment={request.serialize()}",
             data=request.serialize(),
             trace=self.trace_as("json"),
             method="POST",

sdk/extensions/dpdhl/karrio/providers/dpdhl/__init__.py

@@ -1,6 +1,4 @@
-
 from karrio.providers.dpdhl.utils import Settings
-from karrio.providers.dpdhl.rate import parse_rate_response, rate_request
 from karrio.providers.dpdhl.shipment import (
     parse_shipment_cancel_response,
     parse_shipment_response,

sdk/extensions/dpdhl/karrio/providers/dpdhl/shipment/create.py

@@ -1,4 +1,5 @@
-
+import karrio.schemas.dpdhl.shipping_request as dpdhl
+import karrio.schemas.dpdhl.shipping_response as shipping
 import typing
 import karrio.lib as lib
 import karrio.core.units as units
@@ -49,14 +50,28 @@ def shipment_request(
     payload: models.ShipmentRequest,
     settings: provider_utils.Settings,
 ) -> lib.Serializable:
-    packages = lib.to_packages(payload.parcels)  # preprocess the request parcels
-    service = provider_units.ShippingService.map(payload.service).value_or_key  # preprocess the request services
+    packages = lib.to_packages(payload.parcels)
+    service = provider_units.ShippingService.map(payload.service).value_or_key
     options = lib.to_shipping_options(
         payload.options,
         package_options=packages.options,
         option_type=provider_units.ShippingOption,
-    )   # preprocess the request options
+    )
 
-    request = None  # map data to convert karrio model to dpdhl specific type
+    request = dpdhl.ShippingRequestType(
+        profile=None,
+        shipments=[
+            dpdhl.ShipmentType(
+                product=None,
+                billingNumber=None,
+                refNo=None,
+                shipper=dpdhl.ConsigneeType(),
+                consignee=None,
+                details=None,
+                customs=None,
+                services=None,
+            )
+        ],
+    )
 
     return lib.Serializable(request)

sdk/extensions/dpdhl/karrio/providers/dpdhl/utils.py

@@ -19,9 +19,9 @@ def carrier_name(self):
     @property
     def server_url(self):
         return (
-            "https://api-sandbox.dhl.com/parcel/de/shipping/v2"
+            "https://api-sandbox.dhl.com/parcel/de/shipping"
             if self.test_mode
-            else "https://api-eu.dhl.com/parcel/de/shipping/v2"
+            else "https://api-eu.dhl.com/parcel/de/shipping"
         )
 
     @property

sdk/extensions/dpdhl/karrio/schemas/dpdhl/cancel_response.py

@@ -0,0 +1,36 @@
+from attr import s
+from typing import Optional, List
+from jstruct import JStruct, JList
+
+
+@s(auto_attribs=True)
+class LabelType:
+    url: Optional[str] = None
+    format: Optional[str] = None
+
+
+@s(auto_attribs=True)
+class SstatusType:
+    title: Optional[str] = None
+    status: Optional[int] = None
+
+
+@s(auto_attribs=True)
+class ItemType:
+    shipmentNo: Optional[int] = None
+    sstatus: Optional[SstatusType] = JStruct[SstatusType]
+    label: Optional[LabelType] = JStruct[LabelType]
+
+
+@s(auto_attribs=True)
+class StatusType:
+    title: Optional[str] = None
+    statusCode: Optional[int] = None
+    instance: Optional[str] = None
+    detail: Optional[str] = None
+
+
+@s(auto_attribs=True)
+class CancelResponseType:
+    status: Optional[StatusType] = JStruct[StatusType]
+    items: List[ItemType] = JList[ItemType]

sdk/extensions/dpdhl/schemas/cancel_response.json

@@ -0,0 +1,21 @@
+{
+  "status": {
+    "title": "ok",
+    "statusCode": 200,
+    "instance": "string",
+    "detail": "The Webservice call ran successfully."
+  },
+  "items": [
+    {
+      "shipmentNo": 340434310428091700,
+      "sstatus": {
+        "title": "OK",
+        "status": 200
+      },
+      "label": {
+        "url": "https://api-dev.dhl.com/parcel/de/shipping/v1-feature-order-endpoint/labels?token=x5xzrHE7ctmqPqk33k%2BKkBwbvIfYP4elMQsBFM%2BJOdiT2bmoaXXzris%2Ftz9jBtdVFLY5cCENit0Jnd9aXuxoNEXhP9PQ8tAVdPeXD26RZ6JZqF5NCJlrihrAv1%2FAOzuDPqWJLRVaRq461BpT4bcbzChAAHVg%2FHUaQAkeIkaZ8NqfcxWEQzK1AYJWczpy6sv6",
+        "format": "PDF"
+      }
+    }
+  ]
+}