diff --git a/functions-python/helpers/query_helper.py b/functions-python/helpers/query_helper.py index 625bb6191..c085c867f 100644 --- a/functions-python/helpers/query_helper.py +++ b/functions-python/helpers/query_helper.py @@ -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, @@ -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} @@ -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)