Fix calls to pass in overridden filter criteria (#17)

exxamalte · May 10, 2021 · 95b97d5 · 95b97d5
1 parent 676b3e9
commit 95b97d5
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/geojson_client/nsw_rural_fire_service_feed.py b/geojson_client/nsw_rural_fire_service_feed.py
@@ -89,7 +89,7 @@ def _new_entry(self, home_coordinates, feature, global_data):
 
     def _filter_entries_override(self, entries, filter_overrides: Dict = None):
         """Filter the provided entries."""
-        entries = super()._filter_entries_override(entries)
+        entries = super()._filter_entries_override(entries, filter_overrides)
         filter_categories = (
             filter_overrides[FILTER_CATEGORIES]
             if filter_overrides and FILTER_CATEGORIES in filter_overrides

diff --git a/geojson_client/usgs_earthquake_hazards_program_feed.py b/geojson_client/usgs_earthquake_hazards_program_feed.py
@@ -117,7 +117,7 @@ def _new_entry(self, home_coordinates, feature, global_data):
 
     def _filter_entries_override(self, entries, filter_overrides: Dict = None):
         """Filter the provided entries."""
-        entries = super()._filter_entries_override(entries)
+        entries = super()._filter_entries_override(entries, filter_overrides)
         filter_minimum_magnitude = (
             filter_overrides[FILTER_MINIMUM_MAGNITUDE]
             if filter_overrides and FILTER_MINIMUM_MAGNITUDE in filter_overrides

diff --git a/tests/test_nsw_rural_fire_service_feed.py b/tests/test_nsw_rural_fire_service_feed.py
@@ -154,6 +154,19 @@ def _remove_entity(external_id):
         assert len(updated_entity_external_ids) == 1
         assert len(removed_entity_external_ids) == 2
 
+        # Simulate an update with overridden filters.
+        generated_entity_external_ids.clear()
+        updated_entity_external_ids.clear()
+        removed_entity_external_ids.clear()
+
+        feed_manager.update_override({"categories": ["Category 1"], "radius": 1000.0})
+        entries = feed_manager.feed_entries
+        self.assertIsNotNone(entries)
+        assert len(entries) == 1
+        assert len(generated_entity_external_ids) == 1
+        assert len(updated_entity_external_ids) == 0
+        assert len(removed_entity_external_ids) == 1
+
     def test_last_timestamp_empty(self):
         """Test last timestamp."""
         feed = NswRuralFireServiceFeed(None)

diff --git a/tests/test_usgs_earthquake_hazards_program_feed.py b/tests/test_usgs_earthquake_hazards_program_feed.py
@@ -152,3 +152,16 @@ def _remove_entity(external_id):
         assert len(generated_entity_external_ids) == 0
         assert len(updated_entity_external_ids) == 1
         assert len(removed_entity_external_ids) == 2
+
+        # Simulate an update with two overridden filters.
+        generated_entity_external_ids.clear()
+        updated_entity_external_ids.clear()
+        removed_entity_external_ids.clear()
+
+        feed_manager.update_override({"minimum_magnitude": 1.0, "radius": 1000.0})
+        entries = feed_manager.feed_entries
+        self.assertIsNotNone(entries)
+        assert len(entries) == 2
+        assert len(generated_entity_external_ids) == 1
+        assert len(updated_entity_external_ids) == 1
+        assert len(removed_entity_external_ids) == 0