fixed broken tests

Author: qcdyx

api/src/feeds/impl/search_api_impl.py

@@ -127,15 +127,6 @@ def search_feeds(
         db_session: "Session",
     ) -> SearchFeeds200Response:
         """Search feeds using full-text search on feed, location and provider's information."""
-        # logging params
-        print("limit: ", limit)
-        print("offset: ", offset)
-        print("status: ", status)
-        print("feed_id: ", feed_id)
-        print("data_type: ", data_type)
-        print("is_official: ", is_official)
-        print("search_query: ", search_query)
-        print("features: ", features)
         query = self.create_search_query(status, feed_id, data_type, is_official, search_query, features)
         feed_rows = Database().select(
             session=db_session,

api/tests/integration/test_search_api.py

@@ -23,13 +23,7 @@ def test_search_feeds_all_feeds(client: TestClient, search_query: str):
     """
     Retrieve all feeds with a search query using provider or feed name.
     """
-    params = [
-        ("limit", 100),
-        ("offset", 0),
-        ("feed_id", ""),
-        ("data_type", ""),
-        ("search_query", search_query),
-    ]
+    params = [("limit", 100), ("offset", 0), ("feed_id", ""), ("data_type", ""), ("search_query", search_query)]
     headers = {
         "Authentication": "special-key",
     }
@@ -67,13 +61,7 @@ def test_search_feeds_all_feeds_with_limit(client: TestClient, search_query: str
     """
     Retrieve 2 feeds using limit with a search query using provider or feed name.
     """
-    params = [
-        ("limit", 100),
-        ("offset", 0),
-        ("feed_id", ""),
-        ("data_type", ""),
-        ("search_query", search_query),
-    ]
+    params = [("limit", 2), ("offset", 0), ("feed_id", ""), ("data_type", ""), ("search_query", search_query)]
     headers = {
         "Authentication": "special-key",
     }
@@ -441,14 +429,14 @@ def test_search_filter_by_official_status(client: TestClient, values: dict):
 @pytest.mark.parametrize(
     "values",
     [
-        {"features": "Text-To-Speech", "expected_count": 3},
-        {"features": "Fare Products", "expected_count": 2},
-        {"features": "Levels", "expected_count": 1},
+        {"features": "", "expected_count": 16},
+        {"features": "Bike Allowed", "expected_count": 2},
+        {"features": "Stops Wheelchair Accessibility", "expected_count": 0},
     ],
     ids=[
-        "Accessibility",
-        "Fares",
-        "Pathways",
+        "All",
+        "Bike Allowed",
+        "Stops Wheelchair Accessibility",
     ],
 )
 def test_search_filter_by_features(client: TestClient, values: dict):
@@ -474,17 +462,18 @@ def test_search_filter_by_features(client: TestClient, values: dict):
     assert response.status_code == 200
 
     # Parse the response body into a Python object
-    response_body = SearchFeeds200Response.parse_obj(response.json())
+    response_body = SearchFeeds200Response.model_validate(response.json())
     expected_count = values["expected_count"]
     assert (
         response_body.total == expected_count
     ), f"There should be {expected_count} feeds with features={values['features']}"
 
     # Verify all returned feeds have at least one of the requested features
     if values["features"] and expected_count > 0:
-        requested_features = values["features"].split(",")
+        requested_features = set(values["features"].split(","))
         for result in response_body.results:
+            features = result.latest_dataset.validation_report.features
             # Check that at least one of the feed's features is in the requested features
-            assert any(
-                feature in requested_features for feature in result.features
-            ), f"Feed {result.id} does not have any of the requested features: {requested_features}"
+            assert requested_features.intersection(features), (
+                f"Feed {result.id} with features {features} does not match " f"requested features {requested_features}"
+            )

docs/DatabaseCatalogAPI.yaml

@@ -50,7 +50,6 @@ paths:
         - $ref: "#/components/parameters/provider"
         - $ref: "#/components/parameters/producer_url"
         - $ref: "#/components/parameters/is_official_query_param"
-        - $ref: "#/components/parameters/features"
 
       security:
         - Authentication: []
@@ -455,14 +454,6 @@ components:
             note:
               description: A note to clarify complex use cases for consumers.
               type: string
-            features:
-              description: >
-                A list of GTFS features associated to the feed.
-              type: array
-              items:
-                type: string
-              example:
-                ["Text-To-Speech", "Headsigns", "Wheelchair Accessibility"]
 
     GtfsFeed:
       allOf: