Do check for min service factor column in check_utilization_and_minimum_service_factors

Author: alexdewar

src/muse/readers/csv.py

@@ -931,7 +931,9 @@ def check_utilization_and_minimum_service_factors(data, filename):
 
     _check_utilization_not_all_zero(data, filename)
     _check_utilization_in_range(data, filename)
-    _check_minimum_service_factors_in_range(data, filename)
+
+    if "minimum_service_factor" in data.columns:
+        _check_minimum_service_factors_in_range(data, filename)
 
 
 def _check_utilization_not_all_zero(data, filename):
@@ -954,11 +956,7 @@ def _check_utilization_in_range(data, filename):
 
 
 def _check_minimum_service_factors_in_range(data, filename):
-    try:
-        min_service_factor = data["minimum_service_factor"]
-    except KeyError:
-        # Minimum service factor not specified, so we don't need to check it
-        return
+    min_service_factor = data["minimum_service_factor"]
 
     if not np.all((0 <= min_service_factor) & (min_service_factor <= 1)):
         raise ValueError(

tests/test_readers.py

@@ -474,16 +474,6 @@ def test_check_minimum_service_factors_in_range_success():
     _check_minimum_service_factors_in_range(df, "file.csv")
 
 
-def test_check_minimum_service_factors_in_range_column_missing():
-    import pandas as pd
-    from muse.readers.csv import _check_minimum_service_factors_in_range
-
-    # If the minimum_service_factor column is missing, the function should just return
-    # without raising an error
-    df = pd.DataFrame()
-    _check_minimum_service_factors_in_range(df, "file.csv")
-
-
 @mark.parametrize(
     "values", chain.from_iterable(permutations((0, bad)) for bad in (-1, 2))
 )
@@ -497,23 +487,41 @@ def test_check_minimum_service_factors_in_range_fail(values):
         _check_minimum_service_factors_in_range(df, "file.csv")
 
 
-@patch("muse.readers.csv._check_minimum_service_factors_in_range")
 @patch("muse.readers.csv._check_utilization_in_range")
 @patch("muse.readers.csv._check_utilization_not_all_zero")
+@patch("muse.readers.csv._check_minimum_service_factors_in_range")
 def test_check_utilization_and_minimum_service_factors(*mocks):
     import pandas as pd
     from muse.readers.csv import check_utilization_and_minimum_service_factors
 
-    df = pd.DataFrame({"utilization_factor": (0, 0, 1)})
+    df = pd.DataFrame(
+        {"utilization_factor": (0, 0, 1), "minimum_service_factor": (0, 0, 0)}
+    )
     check_utilization_and_minimum_service_factors(df, "file.csv")
     for mock in mocks:
         mock.assert_called_once_with(df, "file.csv")
 
 
+@patch("muse.readers.csv._check_utilization_in_range")
+@patch("muse.readers.csv._check_utilization_not_all_zero")
 @patch("muse.readers.csv._check_minimum_service_factors_in_range")
+def test_check_utilization_and_minimum_service_factors_no_min(
+    min_service_factor_mock, *mocks
+):
+    import pandas as pd
+    from muse.readers.csv import check_utilization_and_minimum_service_factors
+
+    df = pd.DataFrame({"utilization_factor": (0, 0, 1)})
+    check_utilization_and_minimum_service_factors(df, "file.csv")
+    for mock in mocks:
+        mock.assert_called_once_with(df, "file.csv")
+    min_service_factor_mock.assert_not_called()
+
+
 @patch("muse.readers.csv._check_utilization_in_range")
 @patch("muse.readers.csv._check_utilization_not_all_zero")
-def test_check_utilization_and_minimum_service_factors_missing_column(*mocks):
+@patch("muse.readers.csv._check_minimum_service_factors_in_range")
+def test_check_utilization_and_minimum_service_factors_fail_missing_utilization(*mocks):
     import pandas as pd
     from muse.readers.csv import check_utilization_and_minimum_service_factors