From 67f303eaf9653fe764265531ccfeba26ec91f8c6 Mon Sep 17 00:00:00 2001 From: Nik Sauer Date: Thu, 20 Feb 2025 13:34:37 +0100 Subject: [PATCH] add time zone in import --- code/routers/city.py | 4 ---- code/services/data_service.py | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/routers/city.py b/code/routers/city.py index 10510c6..3454cc4 100644 --- a/code/routers/city.py +++ b/code/routers/city.py @@ -61,8 +61,6 @@ async def get_average_measurements_by_city( now = datetime.now(timezone.utc) start = now - timedelta(hours=1) - LOWER, UPPER = Dimension.get_filter_threshold(Dimension.PM2_5) - q = ( db.query( Values.dimension, @@ -78,8 +76,6 @@ async def get_average_measurements_by_city( .filter(City.slug == city_slug) .filter(Values.value != 'nan') .filter(Measurement.time_measured >= start) - # filter outlier - #.filter(or_(Values.dimension != Dimension.PM2_5, and_(LOWER <= Values.value, Values.value <= UPPER))) .group_by(Values.dimension) ) diff --git a/code/services/data_service.py b/code/services/data_service.py index e335c45..73270c4 100644 --- a/code/services/data_service.py +++ b/code/services/data_service.py @@ -25,6 +25,8 @@ def sensor_community_import_grouped_by_location(db: Session, data: dict, source: Station.location == loc ).first() + timestamp = datetime.strptime(row['timestamp'], "%Y-%m-%d %H:%M:%S").replace(tzinfo=timezone.utc) + # create if not exists if not station: # creaet station @@ -34,12 +36,12 @@ def sensor_community_import_grouped_by_location(db: Session, data: dict, source: firmware = None, apikey = None, location_id = loc.id, - last_active = row['timestamp'], + last_active = timestamp, source = source ) # update last_active - station.last_active = row['timestamp'] + station.last_active = timestamp db.add(station) db.commit()