diff --git a/nssp/delphi_nssp/constants.py b/nssp/delphi_nssp/constants.py index 4aa5695d8..fde27c3d0 100644 --- a/nssp/delphi_nssp/constants.py +++ b/nssp/delphi_nssp/constants.py @@ -15,11 +15,9 @@ "percent_visits_covid": "pct_ed_visits_covid", "percent_visits_influenza": "pct_ed_visits_influenza", "percent_visits_rsv": "pct_ed_visits_rsv", - "percent_visits_combined": "pct_ed_visits_combined", "percent_visits_smoothed_covid": "smoothed_pct_ed_visits_covid", "percent_visits_smoothed_1": "smoothed_pct_ed_visits_influenza", "percent_visits_smoothed_rsv": "smoothed_pct_ed_visits_rsv", - "percent_visits_smoothed": "smoothed_pct_ed_visits_combined", } SIGNALS = [val for (key, val) in SIGNALS_MAP.items()] diff --git a/nssp/tests/test_patch.py b/nssp/tests/test_patch.py index fb40e8d2b..c73385d75 100644 --- a/nssp/tests/test_patch.py +++ b/nssp/tests/test_patch.py @@ -259,14 +259,14 @@ def test_full_patch_code(self, mock_read_params, mock_get_structured_logger): # Make sure issue_20210103 has latest weekly data (data from 20210109 instead of 20210108) df_20210108 = pd.read_csv('source_dir/20210108.csv.gz') - df_20210108_nation_combined = df_20210108['percent_visits_combined'].iloc[0] + df_20210108_nation_covid = df_20210108['percent_visits_covid'].iloc[0] df_20210109 = pd.read_csv('source_dir/20210109.csv.gz') - df_20210109_nation_combined = df_20210109['percent_visits_combined'].iloc[0] - assert df_20210108_nation_combined != df_20210109_nation_combined + df_20210109_nation_covid = df_20210109['percent_visits_covid'].iloc[0] + assert df_20210108_nation_covid != df_20210109_nation_covid - df_issue_20210103 = pd.read_csv('patch_dir/issue_20210103/nssp/weekly_202040_nation_pct_ed_visits_combined.csv') - df_issue_20210103_nation_combined = df_issue_20210103['val'].iloc[0] - assert df_20210109_nation_combined == df_issue_20210103_nation_combined + df_issue_20210103 = pd.read_csv('patch_dir/issue_20210103/nssp/weekly_202040_nation_pct_ed_visits_covid.csv') + df_issue_20210103_nation_covid = df_issue_20210103['val'].iloc[0] + assert df_20210109_nation_covid == df_issue_20210103_nation_covid # Clean up the created directories after the test shutil.rmtree(mock_read_params.return_value["patch"]["patch_dir"]) \ No newline at end of file