Compare commits

...

3 Commits

2 changed files with 5 additions and 8 deletions

View File

@ -177,14 +177,14 @@ class NextDeparturesViewSet(viewsets.ReadOnlyModelViewSet):
~Q(update__departure_time=datetime.fromtimestamp(0)))
qs_today = StopTime.objects.filter(stop_filter) \
.filter(Q(departure_time__gte=query_time)) \
.filter(Q(departure_time__gte=query_time - F('update__departure_delay'))) \
.filter(Q(pickup_type=0) | canceled_filter(query_date)) \
.filter(calendar_filter(query_date)) \
.annotate(departure_date=Value(query_date)) \
.annotate(departure_time_24h=F('departure_time'))
qs_yesterday = StopTime.objects.filter(stop_filter) \
.filter(Q(departure_time__gte=time_yesterday)) \
.filter(Q(departure_time__gte=time_yesterday - F('update__departure_delay'))) \
.filter(Q(pickup_type=0) | canceled_filter(yesterday)) \
.filter(calendar_filter(yesterday)) \
.annotate(departure_date=Value(yesterday)) \
@ -249,14 +249,14 @@ class NextArrivalsViewSet(viewsets.ReadOnlyModelViewSet):
~Q(update__arrival_time=datetime.fromtimestamp(0)))
qs_today = StopTime.objects.filter(stop_filter) \
.filter(Q(departure_time__gte=query_time)) \
.filter(Q(departure_time__gte=query_time - F('update__arrival_delay'))) \
.filter(Q(drop_off_type=0) | canceled_filter(query_date)) \
.filter(calendar_filter(query_date)) \
.annotate(arrival_date=Value(query_date)) \
.annotate(arrival_time_24h=F('arrival_time'))
qs_yesterday = StopTime.objects.filter(stop_filter) \
.filter(Q(departure_time__gte=time_yesterday)) \
.filter(Q(departure_time__gte=time_yesterday - F('update__arrival_delay'))) \
.filter(Q(drop_off_type=0) | canceled_filter(yesterday)) \
.filter(calendar_filter(yesterday)) \
.annotate(arrival_date=Value(yesterday)) \

View File

@ -27,9 +27,6 @@ class Command(BaseCommand):
feed_message = FeedMessage()
feed_message.ParseFromString(requests.get(feed_url).content)
with open("toto.txt", "w") as f:
f.write(str(feed_message))
stop_times_updates = []
for entity in feed_message.entity:
@ -75,7 +72,7 @@ class Command(BaseCommand):
continue
elif len(route_ids) > 1:
self.stdout.write(f"Multiple routes found for trip {trip_id}.")
self.stderr.write(", ".join(route_ids))
self.stdout.write(", ".join(route_ids))
route_id = route_ids.pop()
Calendar.objects.update_or_create(