diff --git a/models/measurement.py b/models/measurement.py index 15ec0dc..1184642 100644 --- a/models/measurement.py +++ b/models/measurement.py @@ -11,6 +11,7 @@ def utc_now() -> datetime: return datetime.now(timezone.utc) class MeasurementResolution(str, Enum): + raw = "raw" hourly = "hourly" daily = "daily" weekly = "weekly" diff --git a/services/measurementService.py b/services/measurementService.py index 32ebb2e..b25be8b 100644 --- a/services/measurementService.py +++ b/services/measurementService.py @@ -101,10 +101,11 @@ def _query_measurements( grouped[m.station_id] = [] grouped[m.station_id].append(MeasurementResponse.model_validate(m)) - grouped = { - station_id: aggregate(measurements, resolution) - for station_id, measurements in grouped.items() - } + if resolution != MeasurementResolution.raw: + grouped = { + station_id: aggregate(measurements, resolution) + for station_id, measurements in grouped.items() + } if limit: grouped = {