karrio-server-pricing 2026.1.1__py3-none-any.whl → 2026.1.3__py3-none-any.whl

karrio/server/pricing/tests.py

@@ -1,29 +1,44 @@
+"""
+Tests for the Pricing module (Markup and Fee models).
+
+These tests cover:
+1. Markup application to shipping rates (amount and percentage types)
+2. Fee capture after shipment label creation
+3. Various filter combinations (carrier_codes, service_codes, connection_ids)
+"""
+
 import json
 import logging
 from unittest.mock import patch, ANY
+from django.test import TestCase
 from django.urls import reverse
 from rest_framework import status
 from karrio.core.models import RateDetails, ChargeDetails
 from karrio.server.core.tests import APITestCase
 import karrio.server.pricing.models as models
+import karrio.server.pricing.signals as signals
 
 logging.disable(logging.CRITICAL)
 
 
-class TestPricing(APITestCase):
+class TestMarkupApplication(APITestCase):
+    """Test markup application to shipping rates."""
+
     def setUp(self) -> None:
         super().setUp()
 
-        self.charge: models.Surcharge = models.Surcharge.objects.create(
+        # Create a markup targeting specific carriers and services
+        self.markup: models.Markup = models.Markup.objects.create(
             **{
                 "amount": 1.0,
                 "name": "brokerage",
-                "carriers": ["canadapost"],
-                "services": ["canadapost_priority", "canadapost_regular_parcel"],
+                "carrier_codes": ["canadapost"],
+                "service_codes": ["canadapost_priority", "canadapost_regular_parcel"],
             }
         )
 
-    def test_apply_surcharge_amount_to_shipment_rates(self):
+    def test_apply_markup_amount_to_shipment_rates(self):
+        """Test applying fixed amount markup to rates."""
         url = reverse("karrio.server.proxy:shipment-rates")
         data = RATING_DATA
 
@@ -35,10 +50,11 @@ class TestPricing(APITestCase):
             self.assertEqual(response.status_code, status.HTTP_200_OK)
             self.assertDictEqual(response_data, RATING_RESPONSE)
 
-    def test_apply_surcharge_percentage_to_shipment_rates(self):
-        self.charge.amount = 2.0
-        self.charge.surcharge_type = "PERCENTAGE"
-        self.charge.save()
+    def test_apply_markup_percentage_to_shipment_rates(self):
+        """Test applying percentage markup to rates."""
+        self.markup.amount = 2.0
+        self.markup.markup_type = "PERCENTAGE"
+        self.markup.save()
         url = reverse("karrio.server.proxy:shipment-rates")
         data = RATING_DATA
 
@@ -51,6 +67,378 @@ class TestPricing(APITestCase):
             self.assertDictEqual(response_data, RATING_WITH_PERCENTAGE_RESPONSE)
 
 
+class TestMarkupFilters(TestCase):
+    """Test markup filter logic."""
+
+    def test_carrier_codes_filter(self):
+        """Test that markup only applies to specified carrier codes."""
+        markup = models.Markup.objects.create(
+            name="fedex_markup",
+            amount=5.0,
+            markup_type="AMOUNT",
+            carrier_codes=["fedex"],
+        )
+
+        # Create mock rate for FedEx
+        from karrio.server.core.datatypes import Rate, RateResponse
+
+        fedex_rate = Rate(
+            id="rate_1",
+            carrier_id="fedex",
+            carrier_name="fedex",
+            service="fedex_ground",
+            total_charge=10.0,
+            currency="USD",
+            extra_charges=[],
+            meta={"carrier_connection_id": "car_123"},
+        )
+
+        ups_rate = Rate(
+            id="rate_2",
+            carrier_id="ups",
+            carrier_name="ups",
+            service="ups_ground",
+            total_charge=12.0,
+            currency="USD",
+            extra_charges=[],
+            meta={"carrier_connection_id": "car_456"},
+        )
+
+        response = RateResponse(
+            rates=[fedex_rate, ups_rate],
+            messages=[],
+        )
+
+        result = markup.apply_charge(response)
+
+        # FedEx rate should have markup applied
+        fedex_result = next(r for r in result.rates if r.carrier_name == "fedex")
+        self.assertEqual(fedex_result.total_charge, 15.0)  # 10 + 5
+
+        # UPS rate should NOT have markup applied
+        ups_result = next(r for r in result.rates if r.carrier_name == "ups")
+        self.assertEqual(ups_result.total_charge, 12.0)  # unchanged
+
+    def test_service_codes_filter(self):
+        """Test that markup only applies to specified service codes."""
+        markup = models.Markup.objects.create(
+            name="express_markup",
+            amount=10.0,
+            markup_type="PERCENTAGE",
+            service_codes=["fedex_overnight"],
+        )
+
+        from karrio.server.core.datatypes import Rate, RateResponse
+
+        overnight_rate = Rate(
+            id="rate_1",
+            carrier_id="fedex",
+            carrier_name="fedex",
+            service="fedex_overnight",
+            total_charge=100.0,
+            currency="USD",
+            extra_charges=[],
+            meta={"carrier_connection_id": "car_123"},
+        )
+
+        ground_rate = Rate(
+            id="rate_2",
+            carrier_id="fedex",
+            carrier_name="fedex",
+            service="fedex_ground",
+            total_charge=50.0,
+            currency="USD",
+            extra_charges=[],
+            meta={"carrier_connection_id": "car_123"},
+        )
+
+        response = RateResponse(
+            rates=[overnight_rate, ground_rate],
+            messages=[],
+        )
+
+        result = markup.apply_charge(response)
+
+        # Overnight rate should have 10% markup applied
+        overnight_result = next(r for r in result.rates if r.service == "fedex_overnight")
+        self.assertEqual(overnight_result.total_charge, 110.0)  # 100 + 10%
+
+        # Ground rate should NOT have markup applied
+        ground_result = next(r for r in result.rates if r.service == "fedex_ground")
+        self.assertEqual(ground_result.total_charge, 50.0)  # unchanged
+
+    def test_connection_ids_filter(self):
+        """Test that markup only applies to specified connection IDs."""
+        markup = models.Markup.objects.create(
+            name="specific_connection_markup",
+            amount=3.0,
+            markup_type="AMOUNT",
+            connection_ids=["car_special_123"],
+        )
+
+        from karrio.server.core.datatypes import Rate, RateResponse
+
+        special_rate = Rate(
+            id="rate_1",
+            carrier_id="fedex",
+            carrier_name="fedex",
+            service="fedex_ground",
+            total_charge=25.0,
+            currency="USD",
+            extra_charges=[],
+            meta={"carrier_connection_id": "car_special_123"},
+        )
+
+        regular_rate = Rate(
+            id="rate_2",
+            carrier_id="fedex",
+            carrier_name="fedex",
+            service="fedex_ground",
+            total_charge=25.0,
+            currency="USD",
+            extra_charges=[],
+            meta={"carrier_connection_id": "car_regular_456"},
+        )
+
+        response = RateResponse(
+            rates=[special_rate, regular_rate],
+            messages=[],
+        )
+
+        result = markup.apply_charge(response)
+
+        # Rate with special connection should have markup
+        special_result = next(
+            r for r in result.rates
+            if r.meta.get("carrier_connection_id") == "car_special_123"
+        )
+        self.assertEqual(special_result.total_charge, 28.0)  # 25 + 3
+
+        # Rate with regular connection should NOT have markup
+        regular_result = next(
+            r for r in result.rates
+            if r.meta.get("carrier_connection_id") == "car_regular_456"
+        )
+        self.assertEqual(regular_result.total_charge, 25.0)  # unchanged
+
+    def test_empty_filters_apply_to_all(self):
+        """Test that markup with no filters applies to all rates."""
+        markup = models.Markup.objects.create(
+            name="global_markup",
+            amount=1.0,
+            markup_type="AMOUNT",
+            carrier_codes=[],
+            service_codes=[],
+            connection_ids=[],
+        )
+
+        from karrio.server.core.datatypes import Rate, RateResponse
+
+        rate1 = Rate(
+            id="rate_1",
+            carrier_id="fedex",
+            carrier_name="fedex",
+            service="fedex_ground",
+            total_charge=10.0,
+            currency="USD",
+            extra_charges=[],
+            meta={},
+        )
+
+        rate2 = Rate(
+            id="rate_2",
+            carrier_id="ups",
+            carrier_name="ups",
+            service="ups_ground",
+            total_charge=12.0,
+            currency="USD",
+            extra_charges=[],
+            meta={},
+        )
+
+        response = RateResponse(
+            rates=[rate1, rate2],
+            messages=[],
+        )
+
+        result = markup.apply_charge(response)
+
+        # Both rates should have markup applied
+        for rate in result.rates:
+            if rate.carrier_name == "fedex":
+                self.assertEqual(rate.total_charge, 11.0)  # 10 + 1
+            elif rate.carrier_name == "ups":
+                self.assertEqual(rate.total_charge, 13.0)  # 12 + 1
+
+
+class TestFeeCapture(TestCase):
+    """Test fee capture after shipment creation."""
+
+    def setUp(self):
+        """Set up test data."""
+        # Create a markup
+        self.markup = models.Markup.objects.create(
+            name="test_markup",
+            amount=5.0,
+            markup_type="AMOUNT",
+        )
+
+    def test_capture_fees_from_shipment(self):
+        """Test that fees are captured from shipment's selected_rate via signal.
+
+        When a shipment is saved with status='purchased' and a selected_rate,
+        the fee capture signal should automatically capture fees.
+        """
+        from django.contrib.auth import get_user_model
+        import karrio.server.manager.models as manager
+
+        User = get_user_model()
+        user = User.objects.create_user(
+            email="test@example.com",
+            password="testpass123",
+        )
+
+        # Create a shipment with markup in extra_charges
+        # The signal should automatically capture fees on save
+        shipment = manager.Shipment.objects.create(
+            status="purchased",
+            test_mode=True,
+            shipper={"city": "Montreal"},
+            recipient={"city": "Toronto"},
+            parcels=[{"weight": 1}],
+            selected_rate={
+                "carrier_name": "fedex",
+                "carrier_id": "fedex",
+                "service": "fedex_ground",
+                "total_charge": 15.0,
+                "currency": "USD",
+                "extra_charges": [
+                    {"id": self.markup.id, "name": "test_markup", "amount": 5.0, "currency": "USD"},
+                ],
+                "meta": {
+                    "carrier_code": "fedex",
+                    "carrier_connection_id": "car_123",
+                },
+            },
+            created_by=user,
+        )
+
+        # Verify fee was captured by the signal (don't call manually)
+        fees = models.Fee.objects.filter(shipment_id=shipment.id)
+        self.assertEqual(fees.count(), 1)
+
+        fee = fees.first()
+        self.assertEqual(fee.markup_id, self.markup.id)
+        self.assertEqual(fee.name, "test_markup")
+        self.assertEqual(fee.amount, 5.0)
+        self.assertEqual(fee.currency, "USD")
+        self.assertEqual(fee.carrier_code, "fedex")
+        self.assertEqual(fee.service_code, "fedex_ground")
+        self.assertEqual(fee.connection_id, "car_123")
+        self.assertEqual(fee.test_mode, True)
+
+    def test_capture_fees_function_directly(self):
+        """Test the capture_fees_for_shipment function in isolation.
+
+        Create shipment with status='created' (so signal won't fire),
+        then manually call capture function.
+        """
+        from django.contrib.auth import get_user_model
+        import karrio.server.manager.models as manager
+
+        User = get_user_model()
+        user = User.objects.create_user(
+            email="test_direct@example.com",
+            password="testpass123",
+        )
+
+        # Create shipment with status that won't trigger signal
+        shipment = manager.Shipment.objects.create(
+            status="created",  # Signal won't fire for this status
+            test_mode=True,
+            shipper={"city": "Montreal"},
+            recipient={"city": "Toronto"},
+            parcels=[{"weight": 1}],
+            selected_rate={
+                "carrier_name": "fedex",
+                "carrier_id": "fedex",
+                "service": "fedex_ground",
+                "total_charge": 15.0,
+                "currency": "USD",
+                "extra_charges": [
+                    {"id": self.markup.id, "name": "test_markup", "amount": 5.0, "currency": "USD"},
+                ],
+                "meta": {
+                    "carrier_code": "fedex",
+                    "carrier_connection_id": "car_123",
+                },
+            },
+            created_by=user,
+        )
+
+        # No fees should exist yet
+        self.assertEqual(models.Fee.objects.filter(shipment_id=shipment.id).count(), 0)
+
+        # Manually capture fees
+        signals.capture_fees_for_shipment(shipment)
+
+        # Verify fee was captured
+        fees = models.Fee.objects.filter(shipment_id=shipment.id)
+        self.assertEqual(fees.count(), 1)
+
+        fee = fees.first()
+        self.assertEqual(fee.markup_id, self.markup.id)
+        self.assertEqual(fee.amount, 5.0)
+
+    def test_no_duplicate_fee_capture(self):
+        """Test that fees are not captured twice for the same shipment.
+
+        Signal should check if fees exist before capturing.
+        """
+        from django.contrib.auth import get_user_model
+        import karrio.server.manager.models as manager
+
+        User = get_user_model()
+        user = User.objects.create_user(
+            email="test2@example.com",
+            password="testpass123",
+        )
+
+        # Create shipment - signal will capture fee
+        shipment = manager.Shipment.objects.create(
+            status="purchased",
+            test_mode=True,
+            shipper={"city": "Montreal"},
+            recipient={"city": "Toronto"},
+            parcels=[{"weight": 1}],
+            selected_rate={
+                "carrier_name": "fedex",
+                "carrier_id": "fedex",
+                "service": "fedex_ground",
+                "total_charge": 15.0,
+                "currency": "USD",
+                "extra_charges": [
+                    {"id": self.markup.id, "name": "test_markup", "amount": 5.0, "currency": "USD"},
+                ],
+                "meta": {"carrier_connection_id": "car_123"},
+            },
+            created_by=user,
+        )
+
+        # Fee should already exist from signal
+        fees = models.Fee.objects.filter(shipment_id=shipment.id)
+        self.assertEqual(fees.count(), 1)
+
+        # Save again - signal should not create duplicate
+        shipment.save()
+
+        # Still only one fee
+        fees = models.Fee.objects.filter(shipment_id=shipment.id)
+        self.assertEqual(fees.count(), 1)
+
+
+# Test data fixtures
+
 RATING_DATA = {
     "shipper": {
         "postal_code": "V6M2V9",

{karrio_server_pricing-2026.1.1.dist-info → karrio_server_pricing-2026.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server_pricing
-Version: 2026.1.1
+Version: 2026.1.3
 Summary: Multi-carrier shipping API Pricing panel
 Author-email: karrio <hello@karrio.io>
 License-Expression: LGPL-3.0

{karrio_server_pricing-2026.1.1.dist-info → karrio_server_pricing-2026.1.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
 karrio/server/pricing/__init__.py,sha256=zXpxAFuHsCdAaESYGLRvdqCs7CXtIn8cF688jV4ufQc,64
-karrio/server/pricing/admin.py,sha256=FPLSutMYkKF-fGWGeKQmfJLO5UAB8wRABhhVS9lAckE,1683
-karrio/server/pricing/apps.py,sha256=n9qkGVkmU1gTCLc7WR3iGaPWwW9NtaVFGR2xvBSMvA4,341
-karrio/server/pricing/models.py,sha256=r4-VCAd96AbAJMdqCbIcOnU3si3oH5oJkNfY-SpPU6U,5341
-karrio/server/pricing/serializers.py,sha256=VZnqJl4a1pi9L8frVrpphBHERxY5cl0EgVhJMmdVxQM,496
-karrio/server/pricing/signals.py,sha256=mdMjsNXIeu3QKtEBkHxiYJwsOAchWTzQ_RMsMxPIooo,984
-karrio/server/pricing/tests.py,sha256=rPTKlXn93buLLCyXxt5Y1OK2566aKY8cZVY4CUz2p6Q,11808
+karrio/server/pricing/admin.py,sha256=vDYvoFk9M6bGK6NBoJCRkxL5dla4sibNfej69_RIOT8,5642
+karrio/server/pricing/apps.py,sha256=LBpxtFvuUn36DjMiPlQL51V5WfVMDf7N4QS3IUs_Pcs,431
+karrio/server/pricing/models.py,sha256=gRcCHNEQpQSP4T44RvyPInNYzXL3SHXq9Ar0f9il3YY,11697
+karrio/server/pricing/serializers.py,sha256=48panQv9ZyLzkVa94XzOqbXxFm0daMK1_jOVJwQiNbI,574
+karrio/server/pricing/signals.py,sha256=-XNTjbnn1AnRZDP45YXIaSTXdYG6tXrnBXnCX9CFDOo,6560
+karrio/server/pricing/tests.py,sha256=iaTqsY2pSPR1YRy9TqjhkfvRN8776l0Zoh4xeT0awQc,24818
 karrio/server/pricing/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
 karrio/server/pricing/migrations/0001_initial.py,sha256=KKEklxf8Q1-IQn-8ZchbCi3-zmIyjn80DaGqPgRRI5w,52327
 karrio/server/pricing/migrations/0002_auto_20201127_0721.py,sha256=zhiRIHjyUhwH8Mw2qljkWO1wkZPftqAJpwh6QH5oO2o,41778
@@ -81,8 +81,12 @@ karrio/server/pricing/migrations/0072_alter_surcharge_carriers_alter_surcharge_s
 karrio/server/pricing/migrations/0073_alter_surcharge_carriers_alter_surcharge_services.py,sha256=X0QX4UHAFI_Gu0zqPeL-AvZrz4HD2W7mW9LsvvBDpkE,239938
 karrio/server/pricing/migrations/0074_alter_surcharge_carriers_alter_surcharge_services.py,sha256=s-ic_8rAIdhUS7cmTwVdkeMQiemBMfpcfSwNnaTD410,11301
 karrio/server/pricing/migrations/0075_alter_surcharge_carriers_alter_surcharge_services.py,sha256=hfEWE4zBbvz4Iv58NIA5HdNxqgjnwQb0ACSgMMA_aMs,240966
+karrio/server/pricing/migrations/0076_create_markup_and_fee_models.py,sha256=ZsfQoLv4shhia9p3tIZ_eotpIipVhuqhjFnzQ2Hc3GQ,9152
+karrio/server/pricing/migrations/0077_migrate_surcharge_to_markup_data.py,sha256=K0R8ffn9h-xajThtfEgQR2nEj6sui0PAhT_ouxV6bqw,2192
+karrio/server/pricing/migrations/0078_cleanup.py,sha256=aEO5ceQ6-35jz3mGblQ2RD_144Uu-gVAjaEckqHM1OM,4263
+karrio/server/pricing/migrations/0079_fee_snapshot_model.py,sha256=n18S32UPAp_WMzVL4_Hf96drwGPE72pc45Ul2qPs-nk,9843
 karrio/server/pricing/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-karrio_server_pricing-2026.1.1.dist-info/METADATA,sha256=fwcE-6DGyZv5FcZMww5glhTl-LMiTW7JJcAGKrwlxIU,684
-karrio_server_pricing-2026.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_pricing-2026.1.1.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_pricing-2026.1.1.dist-info/RECORD,,
+karrio_server_pricing-2026.1.3.dist-info/METADATA,sha256=MJAX7agk7MRZSlPuQ7g0zOUHWr70ymy9D5w5oXDQ5-I,684
+karrio_server_pricing-2026.1.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+karrio_server_pricing-2026.1.3.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_pricing-2026.1.3.dist-info/RECORD,,

{karrio_server_pricing-2026.1.1.dist-info → karrio_server_pricing-2026.1.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any