Enforce and test filenaming

Author: rumackaaron

changehc/delphi_changehc/load_data.py

@@ -25,6 +25,11 @@ def load_denom_data(denom_filepath, dropdate, base_geo):
     """
     assert base_geo == "fips", "base unit must be 'fips'"
 
+    denom_suffix = denom_filepath.split("/")[-1].split(".")[0][9:]
+    assert denom_suffix == "All_Outpatients_By_County"
+    denom_filetype = denom_filepath.split("/")[-1].split(".")[1]
+    assert denom_filetype == "dat"
+
     denom_data = pd.read_csv(
         denom_filepath,
         sep="|",
@@ -71,6 +76,11 @@ def load_covid_data(covid_filepath, dropdate, base_geo):
     """
     assert base_geo == "fips", "base unit must be 'fips'"
 
+    covid_suffix = covid_filepath.split("/")[-1].split(".")[0][9:]
+    assert covid_suffix == "Covid_Outpatients_By_County"
+    covid_filetype = covid_filepath.split("/")[-1].split(".")[1]
+    assert covid_filetype == "dat"
+
     covid_data = pd.read_csv(
         covid_filepath,
         sep="|",

changehc/delphi_changehc/run.py

@@ -30,16 +30,6 @@ def run_module():
     # Denominator: "YYYYMMDD_All_Outpatients_By_County.dat.gz"
     # Numerator: "YYYYMMDD_Covid_Outpatients_By_County.dat.gz"
 
-    denom_suffix = params["input_denom_file"].split("/")[-1].split(".")[0][9:]
-    assert denom_suffix == "All_Outpatients_By_County"
-    covid_suffix = params["input_covid_file"].split("/")[-1].split(".")[0][9:]
-    assert covid_suffix == "Covid_Outpatients_By_County"
-
-    denom_filetype = params["input_denom_file"].split("/")[-1].split(".")[1]
-    assert denom_filetype == "dat"
-    covid_filetype = params["input_covid_file"].split("/")[-1].split(".")[1]
-    assert covid_filetype == "dat"
-    
     if params["drop_date"] is None:
         dropdate_denom = datetime.strptime(
             Path(params["input_denom_file"]).name.split("_")[0], "%Y%m%d"

changehc/tests/test_data/test_denom.dat …a/20200601_All_Outpatients_By_County.datchangehc/tests/test_data/test_denom.dat renamed to changehc/tests/test_data/20200601_All_Outpatients_By_County.dat changehc/tests/test_data/test_denom.dat renamed to changehc/tests/test_data/20200601_All_Outpatients_By_County.dat

@@ -27,9 +27,15 @@ def test_base_unit(self):
         with pytest.raises(AssertionError):
             load_denom_data(DENOM_FILEPATH, DROP_DATE, "foo")
 
+        with pytest.raises(AssertionError):
+            load_denom_data("test_data/20200101_foo.dat", DROP_DATE, "fips")
+
         with pytest.raises(AssertionError):
             load_covid_data(COVID_FILEPATH, DROP_DATE, "foo")
 
+        with pytest.raises(AssertionError):
+            load_covid_data("test_data/20200101_foo.dat", DROP_DATE, "fips")
+
         with pytest.raises(AssertionError):
             load_combined_data(DENOM_FILEPATH, COVID_FILEPATH, DROP_DATE, "foo")