Skip to content

bug: fix bug making operations feeds endpoint fail when called without data_type filtering #1157

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
davidgamez merged 2 commits into from
Apr 30, 2025
Merged

bug: fix bug making operations feeds endpoint fail when called without data_type filtering #1157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40a2e2a
feat: add filter to exclude gbfs feeds in get_feeds_query helper
Apr 29, 2025
e25e346
linter fix
Apr 29, 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
11 changes: 8 additions & 3 deletions functions-python/helpers/query_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
from datetime import datetime
from typing import Type

from sqlalchemy import and_
from sqlalchemy.orm import Session, joinedload
from sqlalchemy.orm.query import Query

from shared.database_gen.sqlacodegen_models import (
Feed,
Gtfsrealtimefeed,
Expand All @@ -10,9 +14,6 @@
Gtfsdataset,
Validationreport,
)
from sqlalchemy import and_
from sqlalchemy.orm import Session, joinedload
from sqlalchemy.orm.query import Query

feed_mapping = {"gtfs_rt": Gtfsrealtimefeed, "gtfs": Gtfsfeed, "gbfs": Gbfsfeed}

Expand Down Expand Up @@ -109,6 +110,10 @@ def get_feeds_query(

conditions = []

if data_type is None:
conditions.append(model.data_type.in_(["gtfs", "gtfs_rt"]))
logging.info("Added filter to exclude gbfs feeds")

if operation_status:
conditions.append(model.operational_status == operation_status)
logging.info("Added operational_status filter: %s", operation_status)
Expand Down
Loading