Merge branch 'develop'

Author: mhieta

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     environment: test
     strategy:
       matrix:
@@ -21,7 +21,7 @@ jobs:
       DJANGO_SETTINGS_MODULE: project.settings_test
     services:
         postgres:
-            image: postgis/postgis:13-3.3
+            image: postgis/postgis:14-3.5
             env:
                 POSTGRES_HOST_AUTH_METHOD: trust
             options: >-
@@ -53,6 +53,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements.txt
           pip install -r requirements-test.txt
+          pip install -r requirements-dev.txt
 
       - name: Run Python side code neatness tests
         run: |

.pre-commit-config.yaml

@@ -1,18 +1,18 @@
-minimum_pre_commit_version: 2.12.1 # You MUST keep this version in sync with the version in requirements-dev.in
+minimum_pre_commit_version: 4.2.0 # You MUST keep this version in sync with the version in requirements-dev.in
 default_language_version:
-  python: python3.9
+  python: python3.11
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.3.0 # You MUST keep this version in sync with the version in requirements-dev.in
+    rev: 25.1.0 # You MUST keep this version in sync with the version in requirements-dev.in
     hooks:
       - id: black
 
   - repo: https://github.com/pycqa/flake8
-    rev: 3.9.1 # You MUST keep this version in sync with the version in requirements-dev.in
+    rev: 7.2.0 # You MUST keep this version in sync with the version in requirements-dev.in
     hooks:
       - id: flake8
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.8.0 # You MUST keep this version in sync with the version in requirements-dev.in
+    rev: 6.0.1 # You MUST keep this version in sync with the version in requirements-dev.in
     hooks:
       - id: isort

CHANGELOG.md

@@ -7,12 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.0] - 2025-04-28
+
+### Added
+
+- Delete outdated preliminary permits via cronjob ([cce6be3](https://github.com/City-of-Helsinki/parking-permits/commit/cce6be33db15d99ea449a90b5ea43da41adf32f3))
+
+### Fixed
+
+- Improve special character handling ([60aa672](https://github.com/City-of-Helsinki/parking-permits/commit/60aa6726ba12e00e103c9b373ab268110d6376dd))
+- Update open-ended end time calculation ([6eae382](https://github.com/City-of-Helsinki/parking-permits/commit/6eae38257e64476762f0379a790006eed27410b3))
+- Refund only confirmed extension requests ([6e704f1](https://github.com/City-of-Helsinki/parking-permits/commit/6e704f1cb400b1f3c047c29df9a180fa9b8c82fd))
+
+### Dependencies
+
+- Update requirements ([27b16bf](https://github.com/City-of-Helsinki/parking-permits/commit/27b16bf881bd887bc1443dd103a3d911378df694))
+
 ## [1.6.2] - 2025-03-06
 
 ### Fixed
 
 - Fix permit getting wrong price ([859dd36](https://github.com/City-of-Helsinki/parking-permits/commit/859dd36b171d41eca38cc46d091f283a46ae2551))
-- Add hard limit for amount of returted products ([518cf4d](https://github.com/City-of-Helsinki/parking-permits/commit/518cf4db675329f9b148c79bef0c0e56bc134f5f))
+- Add hard limit for amount of returned products ([518cf4d](https://github.com/City-of-Helsinki/parking-permits/commit/518cf4db675329f9b148c79bef0c0e56bc134f5f))
+- Don't disable temporary vehicle immediately when ending permit ([01f84ad](https://github.com/City-of-Helsinki/parking-permits/commit/01f84ada0e7bab600f880e21d33c8fe57f7e0a4c))
 
 ## [1.6.1] - 2024-12-20
 

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   db:
     platform: linux/amd64
-    image: postgis/postgis:13-3.1
+    image: postgis/postgis:14-3.5
     volumes:
       - database-volume:/var/lib/postgresql/data
     environment:

parking_permits/management/commands/delete_draft_permits.py

@@ -18,12 +18,19 @@ class Command(BaseCommand):
     def add_arguments(self, parser):
         parser.add_argument("--hours", type=int, default=0)
         parser.add_argument("--minutes", type=int, default=30)
+        parser.add_argument("--preliminary_hours", type=int, default=72)
+        parser.add_argument("--preliminary_minutes", type=int, default=0)
 
     def handle(self, *args, **options):
         minutes = options["minutes"] + (60 * options["hours"])
         now = timezone.localtime()
         time_limit = now - timedelta(minutes=minutes)
 
+        preliminary_minutes = options["preliminary_minutes"] + (
+            60 * options["preliminary_hours"]
+        )
+        preliminary_time_limit = now - timedelta(minutes=preliminary_minutes)
+
         # Delete draft permits
         # NOTE: there should not be draft permits with orders, but exclude
         # these just in case.
@@ -42,6 +49,26 @@ def handle(self, *args, **options):
         else:
             self.stdout.write("No draft permits deleted")
 
+        # Delete preliminary permits
+        # NOTE: there should not be preliminary permits with orders, but exclude
+        # these just in case.
+
+        preliminary_permits = ParkingPermit.objects.annotate(
+            has_orders=Exists(OrderItem.objects.filter(permit=OuterRef("pk")))
+        ).filter(
+            has_orders=False,
+            created_at__lt=preliminary_time_limit,
+            status=ParkingPermitStatus.PRELIMINARY,
+        )
+
+        if num_preliminary_permits := preliminary_permits.count():
+            preliminary_permits.delete()
+            self.stdout.write(
+                f"{num_preliminary_permits} preliminary permit(s) deleted"
+            )
+        else:
+            self.stdout.write("No preliminary permits deleted")
+
         # Delete permit extension requests
         # These will all have FK to Order, so we don't want to delete them completely,
         # just mark as CANCELLED.

parking_permits/models/parking_permit.py

@@ -380,6 +380,10 @@ def permit_prices(self):
     def is_valid(self):
         return self.status == ParkingPermitStatus.VALID
 
+    @property
+    def is_closed(self):
+        return self.status == ParkingPermitStatus.CLOSED
+
     @property
     def is_open_ended(self):
         return self.contract_type == ContractType.OPEN_ENDED
@@ -432,6 +436,11 @@ def current_period_start_time(self):
     @property
     def current_period_end_time(self):
         if self.is_open_ended:
+            # If open-ended permit is already renewed for the new period,
+            # then use previous period end time
+            now = timezone.now()
+            if self.end_time and self.end_time - relativedelta(months=1) > now:
+                return self.end_time - relativedelta(months=1)
             return self.end_time
         return self.current_period_end_time_with_fixed_months(self.months_used)
 
@@ -987,11 +996,14 @@ def get_unused_order_items_for_all_orders(self):
         return unused_order_items
 
     def get_unused_order_items_for_order(self, order):
+        from .order import OrderStatus
+
         unused_start_date = timezone.localdate(self.next_period_start_time)
 
         order_items = order.order_items.filter(
             end_time__date__gte=unused_start_date,
             is_refunded=False,
+            order__status=OrderStatus.CONFIRMED,
             permit=self,
         ).order_by("start_time")
 

parking_permits/services/traficom.py

@@ -170,9 +170,12 @@ def fetch_vehicle_details(self, registration_number, permit=None):
         vehicle_identity = et.find(".//tunnus")
         registration_number_et = et.find(".//rekisteritunnus")
         if registration_number_et is not None and registration_number_et.text:
-            registration_number = registration_number_et.text.encode("latin-1").decode(
-                "utf-8"
-            )
+            try:
+                registration_number = registration_number_et.text.encode(
+                    "latin-1"
+                ).decode("utf-8")
+            except UnicodeDecodeError:
+                registration_number = registration_number_et.text
 
         owners_et = et.findall(".//omistajatHaltijat/omistajaHaltija")
         emissions = motor.findall("kayttovoimat/kayttovoima/kulutukset/kulutus")

parking_permits/tests/commands/test_delete_draft_permits.py

@@ -89,7 +89,7 @@ def test_recent_draft_permits_not_deleted():
 
 
 @pytest.mark.django_db()
-def test_recent_draft_permits_not_deleted_with_hour_argument():
+def test_recent_draft_permits_not_deleted_with_hours_argument():
     ParkingPermitFactory(
         status=ParkingPermitStatus.DRAFT,
     )
@@ -98,3 +98,33 @@ def test_recent_draft_permits_not_deleted_with_hour_argument():
     )
     call_command("delete_draft_permits", hours=3)
     assert ParkingPermit.objects.exists()
+
+
+@pytest.mark.django_db()
+def test_preliminary_permits_deleted():
+    ParkingPermitFactory(
+        status=ParkingPermitStatus.PRELIMINARY,
+    )
+    ParkingPermit.objects.update(created_at=timezone.localtime() - timedelta(hours=73))
+    call_command("delete_draft_permits")
+    assert not ParkingPermit.objects.exists()
+
+
+@pytest.mark.django_db()
+def test_recent_preliminary_permits_not_deleted():
+    ParkingPermitFactory(
+        status=ParkingPermitStatus.PRELIMINARY,
+    )
+    ParkingPermit.objects.update(created_at=timezone.localtime() - timedelta(hours=10))
+    call_command("delete_draft_permits")
+    assert ParkingPermit.objects.exists()
+
+
+@pytest.mark.django_db()
+def test_preliminary_permits_not_deleted_with_preliminary_hours_argument():
+    ParkingPermitFactory(
+        status=ParkingPermitStatus.PRELIMINARY,
+    )
+    ParkingPermit.objects.update(created_at=timezone.localtime() - timedelta(hours=3))
+    call_command("delete_draft_permits", preliminary_hours=30)
+    assert ParkingPermit.objects.exists()

parking_permits/tests/models/test_parking_permit.py

@@ -273,9 +273,9 @@ def test_should_cancel_all_extensions_on_end_permit(self):
         pending.refresh_from_db()
         assert pending.is_cancelled()
 
-    @freeze_time(timezone.make_aware(datetime(2021, 11, 20, 12, 10, 50)))
-    def test_should_set_end_time_to_now_if_end_permit_immediately(self):
-        start_time = timezone.make_aware(datetime(2021, 11, 15))
+    @freeze_time(timezone.make_aware(datetime(2025, 4, 18, 12, 10, 50)))
+    def test_fixed_period_permit_end_time_when_ended_immediately(self):
+        start_time = timezone.make_aware(datetime(2025, 4, 15))
         end_time = get_end_time(start_time, 6)
         permit = ParkingPermitFactory(
             contract_type=ContractType.FIXED_PERIOD,
@@ -285,12 +285,27 @@ def test_should_set_end_time_to_now_if_end_permit_immediately(self):
         )
         permit.end_permit(ParkingPermitEndType.IMMEDIATELY)
         self.assertEqual(
-            permit.end_time, timezone.make_aware(datetime(2021, 11, 20, 12, 10, 50))
+            permit.end_time, timezone.make_aware(datetime(2025, 4, 18, 12, 10, 50))
         )
 
-    @freeze_time(timezone.make_aware(datetime(2021, 11, 20, 12, 10, 50)))
-    def test_should_set_end_time_to_period_end_if_end_permit_after_current_period(self):
-        start_time = timezone.make_aware(datetime(2021, 11, 15))
+    @freeze_time(timezone.make_aware(datetime(2025, 4, 18, 12, 10, 50)))
+    def test_open_ended_permit_end_time_when_ended_immediately(self):
+        start_time = timezone.make_aware(datetime(2025, 4, 15))
+        end_time = get_end_time(start_time, 1)
+        permit = ParkingPermitFactory(
+            contract_type=ContractType.OPEN_ENDED,
+            start_time=start_time,
+            end_time=end_time,
+            month_count=1,
+        )
+        permit.end_permit(ParkingPermitEndType.IMMEDIATELY)
+        self.assertEqual(
+            permit.end_time, timezone.make_aware(datetime(2025, 4, 18, 12, 10, 50))
+        )
+
+    @freeze_time(timezone.make_aware(datetime(2025, 4, 18, 12, 10, 50)))
+    def test_fixed_period_permit_end_time_when_ended_after_current_period(self):
+        start_time = timezone.make_aware(datetime(2025, 4, 15))
         end_time = get_end_time(start_time, 6)
         permit = ParkingPermitFactory(
             contract_type=ContractType.FIXED_PERIOD,
@@ -301,7 +316,39 @@ def test_should_set_end_time_to_period_end_if_end_permit_after_current_period(se
         permit.end_permit(ParkingPermitEndType.AFTER_CURRENT_PERIOD)
         self.assertEqual(
             permit.end_time,
-            timezone.make_aware(datetime(2021, 12, 14, 23, 59, 59, 999999)),
+            timezone.make_aware(datetime(2025, 5, 14, 23, 59, 59, 999999)),
+        )
+
+    @freeze_time(timezone.make_aware(datetime(2025, 4, 18, 12, 10, 50)))
+    def test_open_ended_permit_end_time_when_ended_after_current_period(self):
+        start_time = timezone.make_aware(datetime(2025, 4, 15))
+        end_time = get_end_time(start_time, 2)
+        permit = ParkingPermitFactory(
+            contract_type=ContractType.OPEN_ENDED,
+            start_time=start_time,
+            end_time=end_time,
+        )
+        permit.end_permit(ParkingPermitEndType.AFTER_CURRENT_PERIOD)
+        self.assertEqual(
+            permit.end_time,
+            timezone.make_aware(datetime(2025, 5, 14, 23, 59, 59, 999999)),
+        )
+
+    @freeze_time(timezone.make_aware(datetime(2025, 4, 18, 12, 10, 50)))
+    def test_open_ended_permit_end_time_when_ended_after_current_period_and_already_renewed(
+        self,
+    ):
+        start_time = timezone.make_aware(datetime(2025, 3, 20))
+        end_time = get_end_time(start_time, 2)
+        permit = ParkingPermitFactory(
+            contract_type=ContractType.OPEN_ENDED,
+            start_time=start_time,
+            end_time=end_time,
+        )
+        permit.end_permit(ParkingPermitEndType.AFTER_CURRENT_PERIOD)
+        self.assertEqual(
+            permit.end_time,
+            timezone.make_aware(datetime(2025, 4, 19, 23, 59, 59, 999999)),
         )
 
     @freeze_time(timezone.make_aware(datetime(2021, 11, 20, 12, 10, 50)))
@@ -721,7 +768,7 @@ def test_get_unused_order_items_return_unused_items(self):
             end_time=end_time,
             month_count=12,
         )
-        Order.objects.create_for_permits([permit])
+        Order.objects.create_for_permits([permit], status=OrderStatus.CONFIRMED)
         permit.refresh_from_db()
         permit.status = ParkingPermitStatus.VALID
         permit.save()

parking_permits/tests/services/test_traficom.py

@@ -21,10 +21,10 @@ def __init__(self, text="", status_code=200):
         self.status_code = status_code
 
 
-def get_mock_xml(filename):
+def get_mock_xml(filename, encoding="latin-1"):
     return (
         (pathlib.Path(__file__).parent / "mocks" / "traficom" / filename)
-        .open("r", encoding="latin-1")
+        .open("r", encoding=encoding)
         .read()
     )
 
@@ -676,7 +676,7 @@ def test_fetch_vehicle_aoa_2(self):
         # Special chars in registration number
         with mock.patch(
             "requests.post",
-            return_value=MockResponse(get_mock_xml("special_cases/AOA-2.xml")),
+            return_value=MockResponse(get_mock_xml("special_cases/AOA-2.xml", "utf-8")),
         ):
             registration_number = "ÄÖÅ-2"
             vehicle = self.traficom.fetch_vehicle_details(registration_number)
@@ -688,7 +688,7 @@ def test_fetch_vehicle_aoa_3(self):
         # Special chars in registration number
         with mock.patch(
             "requests.post",
-            return_value=MockResponse(get_mock_xml("special_cases/AOA-3.xml")),
+            return_value=MockResponse(get_mock_xml("special_cases/AOA-3.xml", "utf-8")),
         ):
             registration_number = "ÄÖÅ-3"
             vehicle = self.traficom.fetch_vehicle_details(registration_number)