P3 (all in 1)

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.9"
           cache: "pip"
       - name: Setup, build, install
         run: |
@@ -31,17 +31,23 @@ jobs:
         run: black . --check
 
   test:
-    name: Test
     runs-on: ubuntu-22.04
     timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        postgis_versions:
+          - 12-3.4
+          - 15-3.4
+    name: Test with PostGIS v. ${{ matrix.postgis_versions }}
     steps:
       - uses: actions/checkout@v4
       - name: Start docker stack
-        run: docker compose up db -d
+        run: POSTGIS_VERSION=${{ matrix.postgis_versions }} docker compose up db -d
       - name: Running tests
-        run: docker compose run qgis_tester
+        run: POSTGIS_VERSION=${{ matrix.postgis_versions }} docker compose run qgis_tester
       - name: Upload test coverage report
         uses: actions/upload-artifact@v4
         with:
-          name: coverage_report.txt
-          path: testoutputs/coverage_report.txt
+          name: coverage_report-${{ matrix.postgis_versions }}.txt
+          path: test_outputs/coverage_report.txt

.gitignore

@@ -6,6 +6,7 @@
 .vscode/
 .docker/tests/
 .docker/tests/screenshot.png
+/test_outputs
 .env
 .idea
 .coverage

comptages/__init__.py

@@ -46,7 +46,7 @@ def prepare_django(default_db=None, **additional_settings):
         USE_TZ=True,
         TIME_ZONE="Europe/Zurich",
         SECRET_KEY="09n+dhzh+02+_#$!1+8h-&(s-wbda#0*2mrv@lx*y#&fzlv&l)",
-        **additional_settings
+        **additional_settings,
     )
     django.setup()
 

comptages/comptages.py

@@ -31,6 +31,8 @@
 from comptages.ui.resources import *
 from comptages.core import definitions
 
+from django.core.management import call_command
+
 
 class Comptages(QObject):
     def __init__(self, iface):
@@ -640,6 +642,12 @@ def do_delete_data_action(self, count_id):
                     qs = qs.filter(status=definitions.IMPORT_STATUS_DEFINITIVE)
 
                 qs.delete()
+                call_command("tjmreset")
+                QgsMessageLog.logMessage(
+                    "Les TJMs ont été réinitialisés; rouvrir cette fenêtre pour afficher les données actualisées!",
+                    "Comptages",
+                    Qgis.Info,
+                )
 
     def enable_actions_if_needed(self):
         """Enable actions if the plugin is connected to the db

comptages/core/statistics.py

@@ -1,12 +1,12 @@
 import pandas as pd
-
 from datetime import timedelta, datetime
 
 from django.db.models import F, CharField, Value, Q
 from django.db.models import Sum
 from django.db.models.functions import ExtractHour, Trunc, Concat
 
 from comptages.core import definitions
+from comptages.core import utils
 from comptages.datamodel import models
 
 
@@ -23,6 +23,7 @@ def get_time_data(
         start = count.start_process_date
     if not end:
         end = count.end_process_date + timedelta(days=1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     # By lane/direction grouped per hour
 
@@ -64,6 +65,7 @@ def get_time_data_yearly(year, section, lane=None, direction=None):
     """Vehicles by hour and day of the week"""
     start = datetime(year, 1, 1)
     end = datetime(year + 1, 1, 1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     # By lane/direction grouped per hour
 
@@ -111,6 +113,7 @@ def get_day_data(
         start = count.start_process_date
     if not end:
         end = count.end_process_date + timedelta(days=1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     qs = models.CountDetail.objects.filter(
         id_count=count,
@@ -164,6 +167,7 @@ def get_category_data(
         start = count.start_process_date
     if not end:
         end = count.end_process_date + timedelta(days=1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     qs = models.CountDetail.objects.filter(
         id_count=count,
@@ -207,6 +211,7 @@ def get_speed_data(
         start = count.start_process_date
     if not end:
         end = count.end_process_date + timedelta(days=1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     qs = models.CountDetail.objects.filter(
         id_count=count,
@@ -270,6 +275,7 @@ def get_light_numbers(
         start = count.start_process_date
     if not end:
         end = count.end_process_date + timedelta(days=1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     qs = models.CountDetail.objects.filter(
         id_count=count,
@@ -336,6 +342,7 @@ def get_speed_data_by_hour(
         start = count.start_process_date
     if not end:
         end = count.end_process_date + timedelta(days=1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     qs = models.CountDetail.objects.filter(
         id_lane__id_section=section,
@@ -378,6 +385,7 @@ def get_characteristic_speed_by_hour(
         start = count.start_process_date
     if not end:
         end = count.end_process_date + timedelta(days=1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     qs = models.CountDetail.objects.filter(
         id_lane__id_section=section,
@@ -421,6 +429,7 @@ def get_average_speed_by_hour(
         start = count.start_process_date
     if not end:
         end = count.end_process_date + timedelta(days=1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     qs = models.CountDetail.objects.filter(
         id_lane__id_section=section,
@@ -465,6 +474,7 @@ def get_category_data_by_hour(
         start = count.start_process_date
     if not end:
         end = count.end_process_date + timedelta(days=1)
+    start, end = tuple([utils.to_time_aware_utc(d) for d in (start, end)])
 
     qs = models.CountDetail.objects.filter(
         id_lane__id_section=section,

comptages/core/utils.py

@@ -1,6 +1,8 @@
 import os
 
-from datetime import datetime
+from datetime import date, datetime, time
+
+import pytz
 
 from qgis.core import Qgis
 from qgis.PyQt.uic import loadUiType
@@ -9,8 +11,6 @@
 from qgis.PyQt.QtSql import QSqlDatabase
 from qgis.utils import iface
 
-from comptages.core.settings import Settings
-
 
 def get_ui_class(ui_file):
     """Get UI Python class from .ui file.
@@ -55,6 +55,8 @@ def clear_widgets():
 
 
 def connect_to_db():
+    from comptages.core.settings import Settings
+
     settings = Settings()
     db = QSqlDatabase.addDatabase("QPSQL", str(datetime.now()))
     db.setHostName(settings.value("db_host"))
@@ -65,3 +67,12 @@ def connect_to_db():
     db.open()
 
     return db
+
+
+def to_time_aware_utc(d: datetime | date) -> datetime:
+    """Time aware datetimes"""
+    if isinstance(d, datetime):
+        return d.astimezone(pytz.timezone("UTC"))
+    if isinstance(d, date):
+        return to_time_aware_utc(datetime.combine(d, time()))
+    raise ValueError(f"Expected datetime or date, got {type(d)}")