karrio-server-manager 2025.5.7__py3-none-any.whl → 2026.1.1__py3-none-any.whl

karrio/server/manager/serializers/shipment.py

@@ -1,5 +1,6 @@
 import uuid
 import typing
+import datetime
 import rest_framework.status as status
 import django.db.transaction as transaction
 from rest_framework.reverse import reverse
@@ -846,6 +847,28 @@ def create_shipment_tracker(shipment: typing.Optional[models.Shipment], context)
         # Create shipment tracker
         try:
             pkg_weight = sum([p.weight or 0.0 for p in shipment.parcels.all()], 0.0)
+            selected_rate = shipment.selected_rate or {}
+            shipping_date_str = (
+                shipment.options.get("shipping_date")
+                or shipment.options.get("shipment_date")
+            )
+
+            # Get estimated_delivery from selected_rate or compute from transit_days
+            estimated_delivery = selected_rate.get("estimated_delivery")
+            transit_days = selected_rate.get("transit_days")
+
+            if not estimated_delivery and transit_days and shipping_date_str:
+                shipping_date = lib.to_date(
+                    shipping_date_str,
+                    current_format="%Y-%m-%dT%H:%M",
+                    try_formats=["%Y-%m-%d", "%Y-%m-%dT%H:%M", "%Y-%m-%dT%H:%M:%S"],
+                )
+                if shipping_date:
+                    estimated_date = shipping_date + datetime.timedelta(
+                        days=int(transit_days)
+                    )
+                    estimated_delivery = lib.fdate(estimated_date)
+
             tracker = models.Tracking.objects.create(
                 tracking_number=shipment.tracking_number,
                 delivered=False,
@@ -854,6 +877,7 @@ def create_shipment_tracker(shipment: typing.Optional[models.Shipment], context)
                 test_mode=carrier.test_mode,
                 created_by=shipment.created_by,
                 status=TrackerStatus.pending.value,
+                estimated_delivery=estimated_delivery,
                 events=utils.default_tracking_event(event_at=shipment.updated_at),
                 options={shipment.tracking_number: dict(carrier=rate_provider)},
                 meta=dict(carrier=rate_provider),
@@ -867,7 +891,8 @@ def create_shipment_tracker(shipment: typing.Optional[models.Shipment], context)
                     shipment_destination_country=shipment.recipient.country_code,
                     shipment_destination_postal_code=shipment.recipient.postal_code,
                     shipment_service=shipment.meta.get("service_name"),
-                    shipping_date=shipment.options.get("shipment_date"),
+                    shipping_date=shipping_date_str,
+                    expected_delivery=estimated_delivery,
                     carrier_tracking_link=utils.get_carrier_tracking_link(
                         carrier, shipment.tracking_number
                     ),

karrio/server/manager/serializers/tracking.py

@@ -295,6 +295,14 @@ def update_tracker(tracker: models.Tracking, tracking_details: dict) -> models.T
             )["info"]
             changes.append("info")
 
+        # Sync estimated_delivery to info.expected_delivery if updated
+        if estimated_delivery is not None:
+            current_expected = (tracker.info or {}).get("expected_delivery")
+            if current_expected != estimated_delivery:
+                tracker.info = {**(tracker.info or {}), "expected_delivery": estimated_delivery}
+                if "info" not in changes:
+                    changes.append("info")
+
         # Update images
         images = tracking_details.get("images") or {}
         delivery_image = images.get("delivery_image") if isinstance(images, dict) else getattr(images, "delivery_image", None)

karrio/server/manager/tests/test_trackers.py

@@ -5,6 +5,7 @@ from rest_framework import status
 from unittest.mock import patch, ANY
 from karrio.core.models import TrackingDetails, TrackingEvent
 from karrio.server.core.tests import APITestCase
+from karrio.server.manager import serializers
 import karrio.server.manager.models as models
 
 
@@ -219,3 +220,65 @@ UPDATE_TRACKING_RESPONSE = {
         "source": None,
     },
 }
+
+
+class TestTrackerEstimatedDelivery(APITestCase):
+    """Test estimated_delivery computation and sync."""
+
+    def setUp(self) -> None:
+        super().setUp()
+        self.tracker = models.Tracking.objects.create(
+            **{
+                "tracking_number": "TEST123456789",
+                "test_mode": True,
+                "delivered": False,
+                "events": [
+                    {
+                        "date": "2024-01-15",
+                        "description": "Label created",
+                        "code": "pending",
+                        "time": "10:00",
+                    }
+                ],
+                "status": "pending",
+                "estimated_delivery": "2024-01-20",
+                "created_by": self.user,
+                "tracking_carrier": self.dhl_carrier,
+                "info": {
+                    "shipping_date": "2024-01-15",
+                    "expected_delivery": "2024-01-20",
+                },
+            }
+        )
+
+    def test_update_tracker_syncs_estimated_delivery_to_info(self):
+        """Test that when estimated_delivery is updated, info.expected_delivery is also updated."""
+        tracking_details = {
+            "estimated_delivery": "2024-01-22",
+        }
+
+        serializers.tracking.update_tracker(self.tracker, tracking_details)
+        self.tracker.refresh_from_db()
+
+        self.assertEqual(self.tracker.estimated_delivery.isoformat(), "2024-01-22")
+        self.assertEqual(self.tracker.info.get("expected_delivery"), "2024-01-22")
+
+    def test_update_tracker_carrier_estimated_delivery_supersedes_info(self):
+        """Test that carrier's estimated_delivery supersedes existing info.expected_delivery."""
+        # First set a different expected_delivery in info
+        self.tracker.info = {**self.tracker.info, "expected_delivery": "2024-01-18"}
+        self.tracker.save()
+
+        # Update with carrier's estimated_delivery
+        tracking_details = {
+            "estimated_delivery": "2024-01-25",
+            "info": {"customer_name": "John Doe"},
+        }
+
+        serializers.tracking.update_tracker(self.tracker, tracking_details)
+        self.tracker.refresh_from_db()
+
+        # Carrier's estimated_delivery should supersede
+        self.assertEqual(self.tracker.estimated_delivery.isoformat(), "2024-01-25")
+        self.assertEqual(self.tracker.info.get("expected_delivery"), "2024-01-25")
+        self.assertEqual(self.tracker.info.get("customer_name"), "John Doe")

{karrio_server_manager-2025.5.7.dist-info → karrio_server_manager-2026.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server_manager
-Version: 2025.5.7
+Version: 2026.1.1
 Summary: Multi-carrier shipping API Shipments manager module
 Author-email: karrio <hello@karrio.io>
 License-Expression: LGPL-3.0

{karrio_server_manager-2025.5.7.dist-info → karrio_server_manager-2026.1.1.dist-info}/RECORD

@@ -85,8 +85,8 @@ karrio/server/manager/serializers/manifest.py,sha256=mSneCk_7HMXpi64_7hggWvkR7Ma
 karrio/server/manager/serializers/parcel.py,sha256=733Bg26lVbEkoWtAVM5Qt2IRBS2QDuVxhG40Hiqh3bw,2621
 karrio/server/manager/serializers/pickup.py,sha256=sX0VmcQxGkXn3IEosMuFwdXh4HhdkPcuBOp79O8PoDQ,9233
 karrio/server/manager/serializers/rate.py,sha256=7vYK_v8iWEDnswqYHG2Lir16_UhHTOxW5rdC6lw3lzA,652
-karrio/server/manager/serializers/shipment.py,sha256=XuqCsB8TBYtn270JNKyvmYglDZttEfLED69NYN-uVyA,37500
-karrio/server/manager/serializers/tracking.py,sha256=BViFnLlojwbRuy3U1rP2Vp_UqWRjwTd_4OVrhNAfkEA,12712
+karrio/server/manager/serializers/shipment.py,sha256=sZuYnv0LexG1JzrfBCGfaQncGlFHqbvQQKVVueX-2GY,38608
+karrio/server/manager/serializers/tracking.py,sha256=Qg4fXzdU7wwTyZq4ybR1-X3ipQ35b1gZTPQ2rTNWfVg,13141
 karrio/server/manager/tests/__init__.py,sha256=Y1UNteEE60vWdUAkjbldu_r_-h4u0He8-UoiBgTjKcU,391
 karrio/server/manager/tests/test_addresses.py,sha256=pNkZC_yJyb29ZlEOtOAs4blcEYiOarw0zhZIZC5uj1w,3111
 karrio/server/manager/tests/test_custom_infos.py,sha256=iv2cLdZVoVWFZK_mDUEnrZssncAnQcn87Rn2sAk8UQI,2731
@@ -95,7 +95,7 @@ karrio/server/manager/tests/test_manifests.py,sha256=X35ZTXTFEM4Gxdjz598yiNNkOOK
 karrio/server/manager/tests/test_parcels.py,sha256=lVLBOsHzXgXQvYjHIUy5oiPvrMfxYpueVvvhtuhstWk,2559
 karrio/server/manager/tests/test_pickups.py,sha256=8jxddwTnBvBM9FOyWxW9TtZ-GOVYUje7HQ2EZjsbtD8,10681
 karrio/server/manager/tests/test_shipments.py,sha256=S_mDZtCFd1R5S40AA83LfmQsGJGrJ52gwDzh2SY4YIM,39751
-karrio/server/manager/tests/test_trackers.py,sha256=DNeGR-MQ6E_HIARuDUod7bIfhRgem3by-_rMLJR5JfM,7325
+karrio/server/manager/tests/test_trackers.py,sha256=my4UR3GBRt1MrPzrpSrwE3gE_okvsU3hFovuSHhFzF0,9856
 karrio/server/manager/views/__init__.py,sha256=kDFUaORRQ3Xh0ZPm-Jk88Ss8dgGYM57iUFXb9TPMzh0,401
 karrio/server/manager/views/addresses.py,sha256=7YCAs2ZYgd1icYwMcGGWfX7A7vZEL4BEAbU4eIxhiMY,4620
 karrio/server/manager/views/customs.py,sha256=-ZreiKyJ1xeLeNVG53nMfRQFeURduWr1QkDItdLPnE8,4875
@@ -105,7 +105,7 @@ karrio/server/manager/views/parcels.py,sha256=hZY45rg6SrTWfQqyJ38MGKSor1yqgPUEVH
 karrio/server/manager/views/pickups.py,sha256=gmpxz9ot1OR-BP1qh-0MXU3kUJi1ht_74hfaLJzJ42w,5503
 karrio/server/manager/views/shipments.py,sha256=vdJFgIKnSHEb2FVGtqJbiMoHuMqzWtDpINMH4UaEtQQ,13154
 karrio/server/manager/views/trackers.py,sha256=3oGn2qDpHgk8GZvuz-Cb93Fc0j_h_HbXQR692Zhfiok,12363
-karrio_server_manager-2025.5.7.dist-info/METADATA,sha256=XazOdL7uDHjIEM2eIv1ZOJcLQjqXo92DMzGTsivtK2k,730
-karrio_server_manager-2025.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_manager-2025.5.7.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_manager-2025.5.7.dist-info/RECORD,,
+karrio_server_manager-2026.1.1.dist-info/METADATA,sha256=xxPVvF-JAwDbxVc5NyNE880ZnVuD8AUssmxF_tUQXhI,730
+karrio_server_manager-2026.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_manager-2026.1.1.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_manager-2026.1.1.dist-info/RECORD,,