use must clause in test

Author: jonhealy1

stac_fastapi/tests/extensions/test_filter.py

@@ -677,54 +677,39 @@ async def test_queryables_enum_platform(
 
 
 @pytest.mark.asyncio
-async def test_search_filter_ext_or_condition(app_client, ctx):
-    """Test that OR conditions work correctly in filters."""
-    # This test verifies that OR conditions work by checking for items that match
-    # either of two conditions where only one should match the test item
+async def test_search_filter_ext_or_with_must_condition(app_client, ctx):
+    """Test that OR conditions work correctly when combined with MUST conditions."""
+    # This test verifies that when combining MUST and SHOULD clauses,
+    # we still require at least one SHOULD condition to match
     params = {
         "filter": {
-            "op": "or",
+            "op": "and",
             "args": [
+                # MUST condition (matches all test items)
+                {"op": ">=", "args": [{"property": "eo:cloud_cover"}, 0]},
+                # OR condition (only some items match)
                 {
-                    "op": "<",
-                    "args": [
-                        {"property": "eo:cloud_cover"},
-                        0,  # This condition should NOT match (cloud_cover is 0, not < 0)
-                    ],
-                },
-                {
-                    "op": "=",
+                    "op": "or",
                     "args": [
-                        {"property": "properties.proj:epsg"},
-                        32756,  # This condition SHOULD match
+                        {"op": "<", "args": [{"property": "eo:cloud_cover"}, 10]},
+                        {
+                            "op": "=",
+                            "args": [{"property": "properties.proj:epsg"}, 99999],
+                        },
                     ],
                 },
             ],
         }
     }
 
-    # First verify the test item matches exactly one of the conditions
-    props = ctx.item.get("properties", {})
-    matches = [
-        props.get("eo:cloud_cover", 100) < 0,  # Should be False
-        props.get("proj:epsg") == 32756,  # Should be True
-    ]
-    assert sum(matches) == 1, "Test item should match exactly one condition"
-
-    # Now test the API
+    # Test the API
     resp = await app_client.post("/search", json=params)
     assert resp.status_code == 200
     resp_json = resp.json()
 
-    # Should find at least the test item
-    assert len(resp_json["features"]) >= 1
-
-    # Verify at least one feature matches one of the conditions
-    matched = False
+    # Should only find items where cloud_cover < 10 (second condition is false for all)
     for feature in resp_json["features"]:
         props = feature.get("properties", {})
-        if props.get("eo:cloud_cover", 100) < 0 or props.get("proj:epsg") == 32756:
-            matched = True
-            break
-
-    assert matched, "No features matched the OR condition"
+        assert (
+            props.get("eo:cloud_cover", 100) < 10
+        ), "Items should only be returned if they match at least one OR condition"