Merge pull request #983 from cmu-delphi/gs-type-update

Switch Google Symptoms to expect `datetime` format for export end date

Author: krivard

google_symptoms/delphi_google_symptoms/pull.py

@@ -120,12 +120,10 @@ def get_date_range(export_start_date, export_end_date, num_export_days):
         # Get all dates since export_start_date.
         start_date = export_start_date
     else:
-        # Don't fetch data before the user-set start date. Convert both
-        # dates/datetimes to date to avoid error from trying to compare
-        # different types.
+        # Don't fetch data before the user-set start date.
         start_date = max(
             export_end_date - timedelta(days=num_export_days),
-            export_start_date.date()
+            export_start_date
         )
 
     retrieve_dates = [

google_symptoms/tests/conftest.py

@@ -51,15 +51,6 @@
     good_input["county"], parse_dates=["date"])[keep_cols]
 
 
-# Set up fake list of dates to fetch.
-dates = [
-    "20200726",
-    "20200811"
-]
-
-date_list = [datetime.strptime(date, "%Y%m%d").date() for date in dates]
-
-
 @pytest.fixture(scope="session")
 def run_as_module():
     params = {
@@ -81,10 +72,8 @@ def run_as_module():
     else:
         makedirs("receiving")
 
-    with mock.patch("delphi_google_symptoms.pull.get_date_range",
-                    return_value=date_list) as mock_all_dates:
-        with mock.patch("delphi_google_symptoms.pull.initialize_credentials",
-                        return_value=None) as mock_credentials:
-            with mock.patch("pandas_gbq.read_gbq", side_effect=[
-                    state_data, county_data]) as mock_read_gbq:
-                delphi_google_symptoms.run.run_module(params)
+    with mock.patch("delphi_google_symptoms.pull.initialize_credentials",
+                    return_value=None) as mock_credentials:
+        with mock.patch("pandas_gbq.read_gbq", side_effect=[
+                state_data, county_data]) as mock_read_gbq:
+            delphi_google_symptoms.run.run_module(params)

google_symptoms/tests/test_pull.py

@@ -24,14 +24,6 @@
 new_keep_cols = ["geo_id", "timestamp"] + METRICS + [COMBINED_METRIC]
 
 
-# Set up fake list of dates to fetch.
-dates = [
-    "20200726",
-    "20200811"
-]
-date_list = [datetime.strptime(date, "%Y%m%d").date() for date in dates]
-
-
 class TestPullGoogleSymptoms:
     @freeze_time("2021-01-05")
     @mock.patch("pandas_gbq.read_gbq")
@@ -47,8 +39,8 @@ def test_good_file(self, mock_credentials, mock_read_gbq):
         mock_read_gbq.side_effect = [state_data, county_data]
         mock_credentials.return_value = None
 
-        dfs = pull_gs_data(
-            "", datetime.strptime("20201230", "%Y%m%d"), date.today(), 0)
+        dfs = pull_gs_data("", datetime.strptime(
+            "20201230", "%Y%m%d"), datetime.combine(date.today(), datetime.min.time()), 0)
 
         for level in ["county", "state"]:
             df = dfs[level]
@@ -85,27 +77,28 @@ class TestPullHelperFuncs:
     def test_get_date_range_recent_export_start_date(self):
         output = get_date_range(
             datetime.strptime("20201230", "%Y%m%d"),
-            date.today(),
+            datetime.combine(date.today(), datetime.min.time()),
             14
         )
 
-        expected = [date(2020, 12, 24),
-                    date(2021, 1, 5)]
+        expected = [datetime(2020, 12, 24),
+                    datetime(2021, 1, 5)]
         assert set(output) == set(expected)
 
     @freeze_time("2021-01-05")
     def test_get_date_range(self):
         output = get_date_range(
             datetime.strptime("20200201", "%Y%m%d"),
-            date.today(),
+            datetime.combine(date.today(), datetime.min.time()),
             14
         )
 
-        expected = [date(2020, 12, 16), date(2021, 1, 5)]
+        expected = [datetime(2020, 12, 16),
+                    datetime(2021, 1, 5)]
         assert set(output) == set(expected)
 
     def test_format_dates_for_query(self):
-        date_list = [date(2016, 12, 30), date(2021, 1, 5)]
+        date_list = [datetime(2016, 12, 30), datetime(2021, 1, 5)]
         output = format_dates_for_query(date_list)
         expected = ["2016-12-30", "2021-01-05"]
         assert output == expected