From 046eeecb49e6a55dad29c2713dd22264d8f37b82 Mon Sep 17 00:00:00 2001 From: Nik Sauer Date: Fri, 6 Dec 2024 13:57:16 +0100 Subject: [PATCH 1/2] removed not None check --- code/routers/station.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/routers/station.py b/code/routers/station.py index 8cc6670..9a88bae 100644 --- a/code/routers/station.py +++ b/code/routers/station.py @@ -48,9 +48,9 @@ async def get_current_station_data_all(db: Session = Depends(get_db)): Location.lat, Location.lon ) - .having(func.avg(case((Values.dimension == 2, Values.value))).isnot(None)) - .having(func.avg(case((Values.dimension == 3, Values.value))).isnot(None)) - .having(func.avg(case((Values.dimension == 5, Values.value))).isnot(None)) + #.having(func.avg(case((Values.dimension == 2, Values.value))).isnot(None)) + #.having(func.avg(case((Values.dimension == 3, Values.value))).isnot(None)) + #.having(func.avg(case((Values.dimension == 5, Values.value))).isnot(None)) .order_by(Measurement.time_measured) ) From e24af81cb65297e3afa76119f1449503eb3e70d3 Mon Sep 17 00:00:00 2001 From: Nik Sauer Date: Fri, 6 Dec 2024 14:14:54 +0100 Subject: [PATCH 2/2] #52 filter out 0 and >= 999 --- code/routers/station.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/routers/station.py b/code/routers/station.py index 9a88bae..4820729 100644 --- a/code/routers/station.py +++ b/code/routers/station.py @@ -290,7 +290,8 @@ async def get_topn_stations_by_dim( output_format: OutputFormat = Query(OutputFormat.CSV, description="Ouput format"), db: Session = Depends(get_db) ): - + LOWER_BOUND = 0 + UPPER_BOUND = 999 compare = Values.value if order == Order.MAX: compare = Values.value.desc() @@ -305,6 +306,8 @@ async def get_topn_stations_by_dim( .join(Values, Values.measurement_id == Measurement.id) .filter(Station.last_active == Measurement.time_measured) .filter(Values.dimension == dimension) + .filter(Values.value > LOWER_BOUND) + .filter(Values.value < UPPER_BOUND) .order_by(compare) .limit(n) )