Merge branch 'develop'

Author: mhieta

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.2] - 2025-05-08
+
+### Fixed
+
+- Increase decimal rounding accuracy ([dc4b8a4](https://github.com/City-of-Helsinki/parking-permits/commit/dc4b8a4e0b0c5bad86ee35af55b53854544b2e91))
+
 ## [1.7.1] - 2025-05-01
 
 ### Fixed

parking_permits/tests/models/test_product.py

@@ -109,7 +109,7 @@ def test_get_talpa_pricing(self):
             "vat_percentage": "25.50",
         }
 
-    def test_get_talpa_pricing_prev_vat(self):
+    def test_get_talpa_pricing_other_vat(self):
         product = ProductFactory(
             unit_price=Decimal(20),
             vat=0.24,
@@ -125,18 +125,74 @@ def test_get_talpa_pricing_prev_vat(self):
     def test_get_talpa_pricing_with_discount(self):
         product = ProductFactory(
             unit_price=Decimal(60),
-            low_emission_discount=Decimal(0.5),
+            low_emission_discount=Decimal(0.25),
+            vat=0.255,
+        )
+        pricing = product.get_talpa_pricing(True, False)
+        assert pricing == {
+            "price_gross": "45.00",
+            "price_net": "35.86",
+            "price_vat": "9.14",
+            "vat_percentage": "25.50",
+        }
+
+    def test_get_talpa_pricing_with_secondary_vehicle(self):
+        product = ProductFactory(
+            unit_price=Decimal(60),
+            low_emission_discount=Decimal(0.25),
+            vat=0.255,
+        )
+        pricing = product.get_talpa_pricing(False, True)
+        assert pricing == {
+            "price_gross": "90.00",
+            "price_net": "71.71",
+            "price_vat": "18.29",
+            "vat_percentage": "25.50",
+        }
+
+    def test_get_talpa_pricing_with_discount_secondary_vehicle(self):
+        product = ProductFactory(
+            unit_price=Decimal(60),
+            low_emission_discount=Decimal(0.25),
+            vat=0.255,
+        )
+        pricing = product.get_talpa_pricing(True, True)
+        assert pricing == {
+            "price_gross": "67.50",
+            "price_net": "53.78",
+            "price_vat": "13.72",
+            "vat_percentage": "25.50",
+        }
+
+    def test_get_talpa_pricing_with_precise_discount(self):
+        product = ProductFactory(
+            unit_price=Decimal(64.50),
+            low_emission_discount=Decimal(0.2496124031),
             vat=0.255,
         )
         pricing = product.get_talpa_pricing(True, False)
         assert pricing == {
-            "price_gross": "30.00",
-            "price_net": "23.90",
-            "price_vat": "6.10",
+            "price_gross": "48.40",
+            "price_net": "38.57",
+            "price_vat": "9.83",
+            "vat_percentage": "25.50",
+        }
+
+    def test_get_talpa_pricing_with_precise_discount_secondary_vehicle(self):
+        product = ProductFactory(
+            unit_price=Decimal(64.50),
+            low_emission_discount=Decimal(0.2496124031),
+            vat=0.255,
+        )
+        pricing = product.get_talpa_pricing(True, True)
+        assert pricing == {
+            "price_gross": "72.60",
+            "price_net": "57.85",
+            "price_vat": "14.75",
             "vat_percentage": "25.50",
         }
 
-    def test_get_talpa_pricing_with_discount_prev_vat(self):
+    def test_get_talpa_pricing_with_discount_other_vat(self):
         product = ProductFactory(
             unit_price=Decimal(20),
             low_emission_discount=Decimal(0.5),

parking_permits/tests/services/test_talpa.py

@@ -15,6 +15,7 @@
         pytest.param(0, "0.00", "0.00", "0.00", id="gross: 0"),
         pytest.param(30, "30.00", "23.90", "6.10", id="gross: 30"),
         pytest.param(30.50, "30.50", "24.30", "6.20", id="gross: 30.50"),
+        pytest.param(48.40, "48.40", "38.57", "9.83", id="gross: 48.50"),
         pytest.param(60, "60.00", "47.81", "12.19", id="gross: 60"),
         pytest.param(100, "100.00", "79.68", "20.32", id="gross: 100"),
         pytest.param(120, "120.00", "95.62", "24.38", id="gross: 120"),
@@ -38,8 +39,8 @@ def test_add_pricing():
     total_pricing += Pricing.calculate(120, 0.255)
 
     assert total_pricing.format_gross() == "180.00"
-    assert total_pricing.format_net() == "143.42"
-    assert total_pricing.format_vat() == "36.58"
+    assert total_pricing.format_net() == "143.43"
+    assert total_pricing.format_vat() == "36.57"
 
 
 class TestTalpaOrderManager(TestCase):

parking_permits/utils.py

@@ -423,7 +423,7 @@ def calc_vat_price(gross_price: Currency, vat: Currency) -> Decimal:
 
 
 def quantize(value) -> Decimal:
-    return Decimal(value or 0).quantize(Decimal(".001"), rounding=ROUND_UP)
+    return Decimal(value or 0).quantize(Decimal(".0001"), rounding=ROUND_UP)
 
 
 def format_currency(value) -> str: