Merge pull request #744 from karrioapi/karrio-2024.12rc10

[rc] Karrio 2024.12rc10

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Karrio 2024.12.rc10
+
+## Changes
+
+### Fix
+
+- fix: seko tracking event parsing
+
 # Karrio 2024.12.rc9
 
 ## Changes

apps/api/karrio/server/VERSION

@@ -1 +1 @@
-2024.12rc9
+2024.12rc10

apps/www/openapi.yml

@@ -14,7 +14,7 @@ info:
     ## Versioning
 
     When backwards-incompatible changes are made to the API, a new, dated version is released.
-    The current version is `2024.12rc9`.
+    The current version is `2024.12rc10`.
 
     Read our API changelog to learn more about backwards compatibility.
 
@@ -84,7 +84,7 @@ info:
     All API requests must be made over [HTTPS](http://en.wikipedia.org/wiki/HTTP_Secure).
     API requests without authentication will also fail.
   title: Karrio API
-  version: 2024.12rc9
+  version: 2024.12rc10
 paths:
   /:
     get:

bin/deploy-hobby

@@ -2,7 +2,7 @@
 
 set -e
 
-export KARRIO_TAG="${KARRIO_TAG:-2024.12rc9}"
+export KARRIO_TAG="${KARRIO_TAG:-2024.12rc10}"
 export SENTRY_DSN="${SENTRY_DSN:-'https://[email protected]/1'}"
 
 SECRET_KEY=$(head -c 28 /dev/urandom | sha224sum -b | head -c 56)
@@ -23,7 +23,7 @@ if ! [ -z "$1" ]
 then
 export KARRIO_TAG=$1
 else
-echo "What version of Karrio would you like to install? (We default to '2024.12rc9')"
+echo "What version of Karrio would you like to install? (We default to '2024.12rc10')"
 echo "You can check out available versions here: https://hub.docker.com/r/karrio/server/tags"
 read -r KARRIO_TAG_READ
 if [ -z "$KARRIO_TAG_READ" ]

bin/upgrade-hobby

@@ -44,7 +44,7 @@ else
 fi
 
 [[ -f ".env" ]] && export $(cat .env | xargs) || ( echo "No .env file found. Please create it with SECRET_KEY and DOMAIN set." && exit 1)
-export KARRIO_TAG="${KARRIO_TAG:-2024.12rc9}"
+export KARRIO_TAG="${KARRIO_TAG:-2024.12rc10}"
 
 # get karrio scripts
 mkdir -p ./karrio

docker/.env

@@ -30,7 +30,7 @@ REDIS_PORT=6379
 # API - Configuration for the Nginx Reverse proxy.
 ############
 
-KARRIO_TAG=2024.12rc9
+KARRIO_TAG=2024.12rc10
 KARRIO_HTTP_PORT=5002
 
 ############

modules/connectors/seko/karrio/providers/seko/tracking.py

@@ -34,11 +34,15 @@ def _extract_details(
     settings: provider_utils.Settings,
 ) -> models.TrackingDetails:
     details = lib.to_object(tracking.TrackingResponseElementType, data)
+    events = list(reversed(details.Events))
+    latest_status = lib.identity(
+        events[0].OmniCode if any(events) else getattr(details, "Status", None)
+    )
     status = next(
         (
             status.name
             for status in list(provider_units.TrackingStatus)
-            if getattr(details, "Status", None) in status.value
+            if latest_status in status.value
         ),
         provider_units.TrackingStatus.in_transit.name,
     )
@@ -61,10 +65,22 @@ def _extract_details(
                 ),
                 location=event.Location,
             )
-            for event in reversed(details.Events)
+            for event in events
         ],
         delivered=status == "delivered",
         status=status,
+        info=models.TrackingInfo(
+            carrier_tracking_link=details.Tracking,
+            expected_delivery=lib.fdate(
+                details.Delivered,
+                try_formats=["%Y-%m-%dT%H:%M:%S.%f", "%Y-%m-%dT%H:%M:%S"],
+            ),
+            shipping_date=lib.fdate(
+                details.Picked,
+                try_formats=["%Y-%m-%dT%H:%M:%S.%f", "%Y-%m-%dT%H:%M:%S"],
+            ),
+        ),
+        meta=dict(reference=details.Reference1),
     )
 
 

modules/connectors/seko/karrio/providers/seko/units.py

@@ -114,10 +114,63 @@ class CustomsOption(lib.Enum):
 
 
 class TrackingStatus(lib.Enum):
-    on_hold = ["on_hold"]
-    delivered = ["delivered"]
-    in_transit = ["in_transit"]
-    delivery_failed = ["delivery_failed"]
-    delivery_delayed = ["delivery_delayed"]
-    out_for_delivery = ["out_for_delivery"]
-    ready_for_pickup = ["ready_for_pickup"]
+    on_hold = [
+        "OP-26",  # Held by carrier
+        "OP-2",  # Held at Export Hub
+        "OP-6",  # Customs held for inspection and clearance
+        "OP-49",  # Held by Delivery Courier
+        "OP-70",  # Parcel Blocked
+        "OP-87",  # Aged Parcel - High Value Unpaid
+        "OP-88",  # Held at Export Hub - Additional Payment Required
+    ]
+    delivered = [
+        "OP-71",  # Delivered in part
+        "OP-72",  # Delivered
+        "OP-73",  # Delivered to neighbour
+        "OP-74",  # Delivered - Authority to Leave / Safe Drop
+        "OP-75",  # Delivered - Parcel Collected
+        "OP-76",  # Delivered to locker/collection point
+        "OP-77",  # Delivered to alternate delivery point
+    ]
+    in_transit = [
+        "OP-18",  # In transit
+        "OP-20",  # Sub-contractor update
+        "OP-22",  # Received by Sub-contractor
+        "OP-3",  # Processed through Export Hub
+        "OP-4",  # International transit to destination country
+        "OP-47",  # Processed through Sorting Facility
+        "OP-50",  # Parcel arrived to courier processing facility
+        "OP-51",  # Parcel departed courier processing facility
+        "OP-78",  # Flight Arrived
+        "OP-79",  # InTransit
+        "OP-80",  # Reshipped
+        "OP-81",  # Flight Departed
+    ]
+    delivery_failed = [
+        "OP-24",  # Attempted Delivery - Receiver carded
+        "OP-27",  # Attempted Delivery - Customer not known at address
+        "OP-28",  # Attempted Delivery - Refused by customer
+        "OP-29",  # Return to sender
+        "OP-30",  # Non delivery
+        "OP-37",  # Attempted Delivery - No access to receivers address
+        "OP-38",  # Attempted Delivery - Customer Identification failed
+        "OP-45",  # Attempted delivery
+        "OP-55",  # Attempted Delivery - Returned to Sender
+        "OP-15",  # Parcel lost
+        "OP-17",  # Parcel Damaged
+        "OP-23",  # Invalid / Insufficient Address
+        "OP-86",  # Attempted delivery
+    ]
+    delivery_delayed = [
+        "OP-16",  # Parcel Delayed
+        "OP-13",  # Misdirected
+        "OP-35",  # Mis sorted by carrier
+    ]
+    out_for_delivery = [
+        "OP-21",  # Out for delivery
+    ]
+    ready_for_pickup = [
+        "OP-19",  # Awaiting Collection
+        "OP-25",  # Customer to collect from carrier
+        "OP-42",  # Awaiting collection
+    ]

modules/connectors/seko/setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name="karrio.seko",
-    version="2024.12rc9",
+    version="2024.12rc10",
     description="Karrio - SEKO Logistics Shipping Extension",
     long_description=long_description,
     long_description_content_type="text/markdown",