Fix airport list pagination guard

Author: dex-the-ai

app/routers/airport.py

@@ -79,6 +79,15 @@ def get_airports_list(
     db=Depends(CouchbaseClient),
 ) -> list[Airport]:
     """Get a list of airports with pagination. Optionally, filter by country."""
+    completeness_filters = """
+            airport.airportname IS NOT MISSING
+            AND airport.airportname IS NOT NULL
+            AND airport.city IS NOT MISSING
+            AND airport.city IS NOT NULL
+            AND airport.country IS NOT MISSING
+            AND airport.country IS NOT NULL
+    """
+
     if country:
         query = """
             SELECT airport.airportname,
@@ -90,6 +99,7 @@ def get_airports_list(
                 airport.tz
             FROM airport AS airport
             WHERE airport.country = $country
+            AND """ + completeness_filters + """
             ORDER BY airport.airportname
             LIMIT $limit
             OFFSET $offset;
@@ -104,6 +114,7 @@ def get_airports_list(
                 airport.icao,
                 airport.tz
             FROM airport AS airport
+            WHERE """ + completeness_filters + """
             ORDER BY airport.airportname
             LIMIT $limit
             OFFSET $offset;
@@ -112,21 +123,11 @@ def get_airports_list(
     try:
         result = db.query(query, country=country, limit=limit, offset=offset)
         airports = [r for r in result]
-        return _filter_complete_airports(airports)
+        return 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,27 +3,48 @@
 from couchbase.exceptions import DocumentNotFoundException
 
 from app.main import app
-from app.routers.airport import _filter_complete_airports
+from app.routers.airport import get_airports_list
 
 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 RecordingDB:
+    def __init__(self, rows):
+        self.rows = rows
+        self.calls = []
+
+    def query(self, query, **params):
+        self.calls.append((query, params))
+        return self.rows
+
+
+def test_list_airports_bakes_required_fields_into_the_query_before_pagination():
+    db = RecordingDB([])
+
+    assert get_airports_list(limit=3, offset=6, db=db) == []
+
+    query, params = db.calls[0]
+    assert "airport.airportname IS NOT MISSING" in query
+    assert "airport.airportname IS NOT NULL" in query
+    assert "airport.city IS NOT MISSING" in query
+    assert "airport.city IS NOT NULL" in query
+    assert "airport.country IS NOT MISSING" in query
+    assert "airport.country IS NOT NULL" in query
+    assert "ORDER BY airport.airportname" in query
+    assert "LIMIT $limit" in query
+    assert "OFFSET $offset" in query
+    assert params == {"country": None, "limit": 3, "offset": 6}
+
+
+def test_list_airports_bakes_country_filter_into_the_query_when_present():
+    db = RecordingDB([])
+
+    assert get_airports_list(country="France", limit=2, offset=4, db=db) == []
+
+    query, params = db.calls[0]
+    assert "WHERE airport.country = $country" in query
+    assert "airport.airportname IS NOT MISSING" in query
+    assert params == {"country": "France", "limit": 2, "offset": 4}
 
 
 class TestAirport: