task-17-lct/backend
1
0
Fork 0
mirror of https://github.com/task-17-lct/backend.git synced 2024-11-23 21:23:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed date check

Browse Source
This commit is contained in:
Alexander Karpov 2023-05-28 18:05:38 +03:00
parent 097c39b494
commit 35a9078d22
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
passfinder/events/tasks.py
View File

@ -11,7 +11,6 @@
from passfinder.events.services import get_position_weather from passfinder.events.services import get_position_weather
weathers_labels = { weathers_labels = {
"drizzle": "морось",
"light-rain": "небольшой дождь", "light-rain": "небольшой дождь",
"rain": "дождь", "rain": "дождь",
"moderate-rain": "дождь", "moderate-rain": "дождь",
@ -34,9 +33,11 @@ def check_temperature():
for route in UserRoute.objects.filter( for route in UserRoute.objects.filter(
dates__date__gte=now().date(), dates__date__lte=now().date() + timedelta(days=3) dates__date__gte=now().date(), dates__date__lte=now().date() + timedelta(days=3)
): ):
points = route.dates.objects.get(date=now().date()).points.all()
cities = points.values_list("city_id").distinct()
alerts = [] alerts = []
for i in range(3):
date = now().date() + timedelta(days=i)
points = route.dates.objects.get(date=date).points.all()
cities = points.values_list("city_id").distinct()
for city in cities: for city in cities:
if city: if city:
city = City.objects.get(oid=city) city = City.objects.get(oid=city)
@ -44,12 +45,13 @@ def check_temperature():
weather_conditions = cities_temp[city] weather_conditions = cities_temp[city]
else: else:
weather_conditions = get_position_weather(city.lat, city.lon) weather_conditions = get_position_weather(city.lat, city.lon)
weather_conditions = [ weather_conditions = dict(
(parse_date(x[0]), x[1]) for x in weather_conditions [(parse_date(x[0]), x[1]) for x in weather_conditions]
] )
cities_temp[city] = weather_conditions cities_temp[city] = weather_conditions
for date, weather in weather_conditions: if date in weather_conditions:
weather = weather_conditions[date]
if weather in weathers_labels: if weather in weathers_labels:
alerts.append( alerts.append(
f"В городе {city.title} {date.strftime('%d.%m.%Y')} предстоит {weathers_labels[weather]}" f"В городе {city.title} {date.strftime('%d.%m.%Y')} предстоит {weathers_labels[weather]}"