Auto-update: Tue Aug 6 23:33:08 PDT 2024
This commit is contained in:
parent
6ec5102f4c
commit
961bdfc530
1 changed files with 40 additions and 40 deletions
|
@ -279,44 +279,44 @@ async def store_weather_to_db(date_time: dt_datetime, weather_data: dict):
|
||||||
return "FAILURE"
|
return "FAILURE"
|
||||||
|
|
||||||
|
|
||||||
async def get_weather_from_db(date_time: dt_datetime, latitude: float, longitude: float):
|
async def get_weather_from_db(date_time: dt_datetime, latitude: float, longitude: float):
|
||||||
debug(f"Using {date_time.strftime('%Y-%m-%d %H:%M:%S')} as our datetime in get_weather_from_db.")
|
debug(f"Using {date_time.strftime('%Y-%m-%d %H:%M:%S')} as our datetime in get_weather_from_db.")
|
||||||
query_date = date_time.date()
|
query_date = date_time.date()
|
||||||
try:
|
try:
|
||||||
# Query to get daily weather data
|
# Query to get daily weather data
|
||||||
daily_query = '''
|
daily_query = '''
|
||||||
SELECT * FROM dailyweather
|
SELECT * FROM dailyweather
|
||||||
WHERE DATE(datetime) = $1
|
WHERE DATE(datetime) = $1
|
||||||
AND ST_DWithin(location::geography, ST_MakePoint($2,$3)::geography, 8046.72)
|
AND ST_DWithin(location::geography, ST_MakePoint($2,$3)::geography, 8046.72)
|
||||||
ORDER BY ST_Distance(location, ST_MakePoint($4, $5)::geography) ASC
|
ORDER BY ST_Distance(location, ST_MakePoint($4, $5)::geography) ASC
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
'''
|
'''
|
||||||
|
|
||||||
daily_weather_records = await API.execute_read_query(daily_query, query_date, longitude, latitude, longitude, latitude, table_name='dailyweather')
|
daily_weather_records = await API.execute_read_query(daily_query, query_date, longitude, latitude, longitude, latitude, table_name='dailyweather')
|
||||||
|
|
||||||
if not daily_weather_records:
|
if not daily_weather_records:
|
||||||
debug(f"No daily weather data retrieved from database.")
|
debug(f"No daily weather data retrieved from database.")
|
||||||
return None
|
|
||||||
|
|
||||||
daily_weather_data = daily_weather_records[0]
|
|
||||||
|
|
||||||
# Query to get hourly weather data
|
|
||||||
hourly_query = '''
|
|
||||||
SELECT * FROM hourlyweather
|
|
||||||
WHERE daily_weather_id = $1
|
|
||||||
ORDER BY datetime ASC
|
|
||||||
'''
|
|
||||||
|
|
||||||
hourly_weather_records = await API.execute_read_query(hourly_query, daily_weather_data['id'], table_name='hourlyweather')
|
|
||||||
|
|
||||||
day = {
|
|
||||||
'DailyWeather': daily_weather_data,
|
|
||||||
'HourlyWeather': hourly_weather_records,
|
|
||||||
}
|
|
||||||
|
|
||||||
debug(f"Retrieved weather data for {date_time.date()}")
|
|
||||||
return day
|
|
||||||
except Exception as e:
|
|
||||||
err(f"Unexpected error occurred in get_weather_from_db: {e}")
|
|
||||||
err(f"Traceback: {traceback.format_exc()}")
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
daily_weather_data = daily_weather_records[0]
|
||||||
|
|
||||||
|
# Query to get hourly weather data
|
||||||
|
hourly_query = '''
|
||||||
|
SELECT * FROM hourlyweather
|
||||||
|
WHERE daily_weather_id = $1
|
||||||
|
ORDER BY datetime ASC
|
||||||
|
'''
|
||||||
|
|
||||||
|
hourly_weather_records = await API.execute_read_query(hourly_query, daily_weather_data['id'], table_name='hourlyweather')
|
||||||
|
|
||||||
|
day = {
|
||||||
|
'DailyWeather': daily_weather_data,
|
||||||
|
'HourlyWeather': hourly_weather_records,
|
||||||
|
}
|
||||||
|
|
||||||
|
debug(f"Retrieved weather data for {date_time.date()}")
|
||||||
|
return day
|
||||||
|
except Exception as e:
|
||||||
|
err(f"Unexpected error occurred in get_weather_from_db: {e}")
|
||||||
|
err(f"Traceback: {traceback.format_exc()}")
|
||||||
|
return None
|
||||||
|
|
Loading…
Reference in a new issue