Merge branch 'sdh-approved-filter-fix' into 'main'

Update filtering of approved data to search for any match

Closes #91

See merge request water/computational-tools/surface-water-work/hyswap!74

hyswap/utils.py

@@ -41,9 +41,7 @@ def filter_approved_data(data, filter_column=None):
     """
     if filter_column is None:
         raise ValueError("filter_column must be specified.")
-    return data.loc[((data[filter_column] == "A") |
-                     (data[filter_column] == "A, e") |
-                     (data[filter_column] == "A, R"))]
+    return data[data[filter_column].str.contains("A")]
 
 
 def rolling_average(df, data_column_name, data_type,

tests/test_utils.py

@@ -8,10 +8,11 @@
 class TestDataFilters:
     def test_filter_approved_data(self):
         """Test the filter_approved_data function."""
-        data = {"a": ["A", "A", "P", "P"], "b": [1, 2, 3, 4]}
+        data = {"a": ["A", "A, e", "A, R", "A, [4]", "P", "P"],
+                "b": [1, 2, 3, 4, 5, 6]}
         data_df = pd.DataFrame(data)
         df = utils.filter_approved_data(data_df, filter_column="a")
-        assert df["b"].tolist() == [1, 2]
+        assert df["b"].tolist() == [1, 2, 3, 4]
 
     def test_filter_approved_data_error(self):
         """Test the filter_approved_data function."""