Skip to content

fix: rides_execution not retune time whit time zone #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OriHoch merged 2 commits into from
Oct 28, 2025
Merged

fix: rides_execution not retune time whit time zone #52

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86ce66f
fix: rides-execution adjust timestamp in rides query
AvivAbachi Oct 27, 2025
5258449
fix(rides-execution): correctly truncate timestamps to date for compa…
AvivAbachi Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions open_bus_stride_api/routers/rides_execution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,36 @@ def list_(limit: int = common.param_limit(default_limit=DEFAULT_LIMIT),
operator_ref: int = common.doc_param('operator_ref', filter_type='equals', description="Line operator ref."),
line_ref: int = common.doc_param('line_ref', filter_type='equals', description="Line ref.")):
sql = """
select actual_rides.start_time actual_start_time, planned_rides.start_time planned_start_time, planned_rides.gtfs_ride_id gtfs_ride_id from (
(select siri_ride.scheduled_start_time start_time from siri_ride
join siri_route sr on siri_ride.siri_route_id = sr.id
where sr.operator_ref= :operator_ref and sr.line_ref= :line_ref and date_trunc('day', siri_ride.scheduled_start_time) between :date_from and :date_to)
) actual_rides
full outer join
(select gtfs_ride.start_time start_time, gtfs_ride.id gtfs_ride_id from gtfs_ride
join gtfs_route gr on gtfs_ride.gtfs_route_id = gr.id
where gr.operator_ref= :operator_ref and gr.line_ref= :line_ref and date_trunc('day', gtfs_ride.start_time) between :date_from and :date_to ) planned_rides
on actual_rides.start_time=planned_rides.start_time
select
actual_rides.start_time::timestamptz as actual_start_time,
planned_rides.start_time::timestamptz as planned_start_time,
planned_rides.gtfs_ride_id
from
(
(select
siri_ride.scheduled_start_time as start_time
from
siri_ride
join siri_route sr on siri_ride.siri_route_id = sr.id
where
sr.operator_ref = :operator_ref
and sr.line_ref = :line_ref
and date_trunc('day', siri_ride.scheduled_start_time) between :date_from and :date_to
) actual_rides
full outer join
(select
gtfs_ride.start_time as start_time, gtfs_ride.id as gtfs_ride_id
from
gtfs_ride
join gtfs_route gr on gtfs_ride.gtfs_route_id = gr.id
where
gr.operator_ref = :operator_ref
and gr.line_ref = :line_ref
and date_trunc('day', gtfs_ride.start_time) between :date_from and :date_to
) planned_rides
on
actual_rides.start_time = planned_rides.start_time
)
"""
sql_params = {
'date_from': date_from,
Expand Down
Loading