afourmaux-agreg/agreg-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: query when only 1 data per day, or 1 day selected

Browse source
This commit is contained in:
Alexis Fourmaux 2026-05-10 13:17:58 +02:00
parent 5cef99d8d9
commit f127a4c34c
3 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

41
server/app/adapters/postgres_query.py
View file

@ -1,4 +1,5 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
import psycopg2
from psycopg2.extensions import connection
@ -9,6 +10,14 @@ from domain.value_objects import Granularity
from ports.reading_query_repository import ReadingQueryRepository
_GRANULARITY_DELTA = {
"hour": relativedelta(hours=1),
"day": relativedelta(days=1),
"week": relativedelta(weeks=1),
"month": relativedelta(months=1),
}
class PgReadingQueryRepository(ReadingQueryRepository):
def __init__(self, conn: connection) -> None:
self._conn = conn
@ -20,24 +29,33 @@ class PgReadingQueryRepository(ReadingQueryRepository):
end: datetime,
granularity: Granularity,
) -> list[ConsumptionPoint]:
if start == end:
end = start + _GRANULARITY_DELTA[granularity]
adjusted_start = start - _GRANULARITY_DELTA[granularity]
date_trunc = granularity
query = """
WITH periods AS (
SELECT
DATE_TRUNC(%s, r.date) AS period,
MAX(r.pulses) AS pulse_end
FROM reading r
JOIN device d ON d.device_id = r.device_id
WHERE d.device_eui = %s
AND r.date >= %s
AND r.date < %s
GROUP BY period
)
SELECT
DATE_TRUNC(%s, r.date) AS period,
MIN(r.pulses) AS pulse_start,
MAX(r.pulses) AS pulse_end,
MAX(r.pulses) - MIN(r.pulses) AS delta_pulses
FROM reading r
JOIN device d ON d.device_id = r.device_id
WHERE d.device_eui = %s
AND r.date >= %s
AND r.date < %s
GROUP BY period
period,
LAG(pulse_end) OVER (ORDER BY period) AS pulse_start,
pulse_end,
pulse_end - LAG(pulse_end) OVER (ORDER BY period) AS delta_pulses
FROM periods
ORDER BY period ASC
"""
try:
with self._conn.cursor() as cur:
cur.execute(query, (date_trunc, dev_eui, start, end))
cur.execute(query, (date_trunc, dev_eui, adjusted_start, end))
rows = cur.fetchall()
except psycopg2.DatabaseError as e:
raise DatabaseError(f"Erreur requête consumption : {e}") from e
@ -51,4 +69,5 @@ class PgReadingQueryRepository(ReadingQueryRepository):
delta_m3=round(row[3] * 0.010, 3),
)
for row in rows
if row[1] is not None
]