Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions api/src/feeds/impl/feeds_api_impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ def get_gtfs_feeds(
self,
limit: int,
offset: int,
status: str,
provider: str,
producer_url: str,
country_code: str,
Expand All @@ -213,6 +214,7 @@ def get_gtfs_feeds(
feed_query = get_gtfs_feeds_query(
limit=limit,
offset=offset,
status=status,
provider=provider,
producer_url=producer_url,
country_code=country_code,
Expand Down
2 changes: 2 additions & 0 deletions api/src/shared/common/db_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def get_gtfs_feeds_query(
stable_id: str | None = None,
limit: int | None = None,
offset: int | None = None,
status: str | None = None,
provider: str | None = None,
producer_url: str | None = None,
country_code: str | None = None,
Expand All @@ -54,6 +55,7 @@ def get_gtfs_feeds_query(
"""Get the DB query to use to retrieve the GTFS feeds.."""
gtfs_feed_filter = GtfsFeedFilter(
stable_id=stable_id,
status=status,
provider__ilike=provider,
producer_url__ilike=producer_url,
location=None,
Expand Down
1 change: 1 addition & 0 deletions api/src/shared/feed_filters/gtfs_feed_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class Constants(Filter.Constants):

class GtfsFeedFilter(Filter):
stable_id: Optional[str]
status: Optional[str]
provider__ilike: Optional[str] # case insensitive
producer_url__ilike: Optional[str] # case insensitive
location: Optional[LocationFilter]
Expand Down
14 changes: 13 additions & 1 deletion api/tests/integration/test_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,19 @@ def test_merge_gtfs_feed(test_database):
results = {
feed.id: feed
for feed in FeedsApiImpl().get_gtfs_feeds(
None, None, None, None, None, None, None, None, None, None, None, db_session=session
None,
None,
None,
None,
None,
None,
None,
None,
None,
None,
None,
None,
db_session=session,
)
if feed.id in TEST_GTFS_FEED_STABLE_IDS
}
Expand Down
14 changes: 14 additions & 0 deletions api/tests/integration/test_feeds_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,20 @@ def test_feeds_gtfs_get(client: TestClient):
assert response.status_code == 200


def test_feeds_gtfs_get_with_status_filter(client: TestClient):
"""GTFS feeds can be filtered by feed status."""
response = client.request(
"GET",
"/v1/gtfs_feeds",
headers=authHeaders,
params=[("status", "active")],
)

assert response.status_code == 200
assert len(response.json()) >= 1
assert all(feed["status"] == "active" for feed in response.json())


def test_feeds_gtfs_id_get(client: TestClient):
"""Test case for feeds_gtfs_id_get"""
response = client.request(
Expand Down
1 change: 1 addition & 0 deletions docs/DatabaseCatalogAPI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ paths:
parameters:
- $ref: "#/components/parameters/limit_query_param_gtfs_feeds_endpoint"
- $ref: "#/components/parameters/offset"
- $ref: "#/components/parameters/status"
- $ref: "#/components/parameters/provider"
- $ref: "#/components/parameters/producer_url"
- $ref: "#/components/parameters/country_code"
Expand Down
Loading