(consolidate) Colissimo integration with unit tests

karrioapi · Nov 5, 2023 · a7f7ffc · a7f7ffc
1 parent 29df3d4
commit a7f7ffc
Show file tree

Hide file tree

Showing 25 changed files with 3,721 additions and 336 deletions.
diff --git a/modules/connections/colissimo/_tests/colissimo/fixture.py b/modules/connections/colissimo/_tests/colissimo/fixture.py
diff --git a/modules/connections/colissimo/_tests/colissimo/test_shipment.py b/modules/connections/colissimo/_tests/colissimo/test_shipment.py
diff --git a/modules/connections/colissimo/generate b/modules/connections/colissimo/generate
@@ -7,7 +7,7 @@ quicktype () {
     echo "Generating $1..."
     docker run -it -v $PWD:/app -e SCHEMAS=/app/schemas -e LIB_MODULES=/app/karrio/schemas/colissimo \
     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 $@
+    --no-nice-property-names --all-properties-optional $@
 }
 
 quicktype --src="${SCHEMAS}/error_response.json" --out="${LIB_MODULES}/error_response.py"

diff --git a/modules/connections/colissimo/karrio/mappers/colissimo/proxy.py b/modules/connections/colissimo/karrio/mappers/colissimo/proxy.py
@@ -2,6 +2,7 @@
 
 import karrio.lib as lib
 import karrio.api.proxy as proxy
+import karrio.providers.colissimo.utils as provider_utils
 import karrio.mappers.colissimo.settings as provider_settings
 import karrio.universal.mappers.rating_proxy as rating_proxy
 
@@ -18,10 +19,10 @@ def create_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
             data=request.serialize(),
             trace=self.trace_as("json"),
             method="POST",
-            headers={"Content-Type": "application/json"},
+            headers={"Content-Type": "application/json;charset=UTF-8"},
         )
 
-        return lib.Deserializable(response, lib.to_dict)
+        return lib.Deserializable(response, provider_utils.parse_response, request.ctx)
 
     def get_tracking(self, request: lib.Serializable) -> lib.Deserializable[str]:
         idships = ",".join(request.serialize())

diff --git a/modules/connections/colissimo/karrio/providers/colissimo/error.py b/modules/connections/colissimo/karrio/providers/colissimo/error.py
@@ -1,4 +1,4 @@
-
+import karrio.schemas.colissimo.error_response as laposte
 import typing
 import karrio.lib as lib
 import karrio.core.models as models
@@ -10,14 +10,42 @@ def parse_error_response(
     settings: provider_utils.Settings,
     **kwargs,
 ) -> typing.List[models.Message]:
-    errors = []  # compute the carrier error object list
+    messages = response.get("json_info", {}).get("messages", [])
+
+    return [
+        models.Message(
+            carrier_id=settings.carrier_id,
+            carrier_name=settings.carrier_name,
+            code=msg.get("type"),
+            message=msg.get("messageContent"),
+            details={**kwargs},
+        )
+        for msg in messages
+        if msg.get("type") == "ERROR"
+    ]
+
+
+def parse_laposte_error_response(
+    response: typing.Union[dict, typing.List[dict]],
+    settings: provider_utils.Settings,
+    **kwargs,
+) -> typing.List[models.Message]:
+    responses = response if isinstance(response, list) else [response]
+    errors = [
+        lib.to_object(laposte.ErrorResponse, res)
+        for res in responses
+        if (
+            not str(res.get("returnCode")).startswith("20")
+            or res.get("code") is not None
+        )
+    ]
 
     return [
         models.Message(
             carrier_id=settings.carrier_id,
             carrier_name=settings.carrier_name,
-            code="",  # set the carrier error code
-            message="",  # set the carrier error message
+            code=(error.returnCode or error.code),
+            message=(error.returnMessage or error.message),
             details={**kwargs},
         )
         for error in errors