Skip incomplete airport rows in list responses

Author: dex-the-ai

app/routers/airport.py

@@ -112,11 +112,21 @@ def get_airports_list(
     try:
         result = db.query(query, country=country, limit=limit, offset=offset)
         airports = [r for r in result]
-        return airports
+        return _filter_complete_airports(airports)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"Unexpected error: {e}")
 
 
+def _filter_complete_airports(airports: list[dict]) -> list[dict]:
+    """Drop rows that cannot satisfy the Airport response model."""
+    required_fields = ("airportname", "city", "country")
+    return [
+        airport
+        for airport in airports
+        if all(field in airport and airport[field] is not None for field in required_fields)
+    ]
+
+
 class DestinationAirport(BaseModel):
     """Model for Destination Airport"""
 

app/tests/test_airport.py

@@ -3,10 +3,29 @@
 from couchbase.exceptions import DocumentNotFoundException
 
 from app.main import app
+from app.routers.airport import _filter_complete_airports
 
 client = TestClient(app)
 
 
+def test_filter_complete_airports_skips_incomplete_rows():
+    complete_airport = {
+        "airportname": "Test Airport",
+        "city": "Test City",
+        "country": "Test Country",
+        "faa": "TAA",
+    }
+    incomplete_airport = {
+        "city": "Initial Test City",
+        "country": "Initial Test Country",
+        "faa": "TESTFAA",
+    }
+
+    assert _filter_complete_airports([complete_airport, incomplete_airport]) == [
+        complete_airport
+    ]
+
+
 class TestAirport:
     def test_add_airport(
         self, couchbase_client, airport_api, airport_collection, helpers