fix test

Author: chinandrew

integrations/acquisition/covid_hosp/state_timeseries/test_scenarios.py

@@ -40,7 +40,7 @@ def setUp(self):
         cur.execute('truncate table covid_hosp_state_timeseries')
         cur.execute('truncate table covid_hosp_meta')
 
-  @freeze_time("2021-03-16")
+  @freeze_time("2021-03-17")
   def test_acquire_dataset(self):
     """Acquire a new dataset."""
 
@@ -90,18 +90,26 @@ def test_acquire_dataset(self):
       self.assertEqual(response['result'], 1)
       self.assertEqual(len(response['epidata']), 1)
 
-    with self.subTest(name='as_of checks'):
+    # acquire new data into local database
+    with self.subTest(name='first acquisition'):
       # acquire new data with 3/16 issue date
       mock_network.fetch_metadata.return_value = \
         self.test_utils.load_sample_metadata("metadata2.csv")
       mock_network.fetch_dataset.return_value = \
         self.test_utils.load_sample_dataset("dataset2.csv")
+      acquired = Update.run(network=mock_network)
+      self.assertTrue(acquired)
+
+    with self.subTest(name='as_of checks'):
+
       response = Epidata.covid_hosp('WY', Epidata.range(20200101, 20210101))
-      row = response['epidata'][0]
+      self.assertEqual(len(response['epidata']), 2)
+      row = response['epidata'][1]
       self.assertEqual(row['date'], 20200827)
 
       # previous data should have 3/15 issue date
       response = Epidata.covid_hosp('WY', Epidata.range(20200101, 20210101), as_of=20210315)
+      self.assertEqual(len(response['epidata']), 1)
       row = response['epidata'][0]
       self.assertEqual(row['date'], 20200826)
 

src/server/endpoints/covid_hosp_state_timeseries.py

@@ -95,11 +95,11 @@ def handle():
     if issues is not None:
         q.where_integers("issue", issues)
         # final query using specific issues
-        query = f"WITH c as (SELECT {q.fields_clause}, ROW_NUMBER() OVER (PARTITION BY date, state, issue ORDER BY record_type) row FROM {q.table} WHERE {q.conditions_clause}) SELECT {q.fields_clause} FROM {q.alias} where row = 1 ORDER BY {q.order_clause}"
+        query = f"WITH c as (SELECT {q.fields_clause}, ROW_NUMBER() OVER (PARTITION BY date, state, issue ORDER BY record_type) row FROM {q.table} WHERE {q.conditions_clause}) SELECT {q.fields_clause} FROM {q.alias} WHERE row = 1 ORDER BY {q.order_clause}"
     elif as_of is not None:
         sub_condition_asof = "(issue <= :as_of)"
         q.params["as_of"] = as_of
-        query = f"WITH c as (SELECT {q.fields_clause}, ROW_NUMBER() OVER (PARTITION BY date, state, issue ORDER BY record_type) row FROM {q.table} WHERE {q.conditions_clause} and {sub_condition_asof}) SELECT {q.fields_clause} FROM {q.alias} where row = 1 ORDER BY {q.order_clause}"
+        query = f"WITH c as (SELECT {q.fields_clause}, ROW_NUMBER() OVER (PARTITION BY date, state, issue ORDER BY record_type) row FROM {q.table} WHERE {q.conditions_clause} AND {sub_condition_asof}) SELECT {q.fields_clause} FROM {q.alias} WHERE row = 1 ORDER BY {q.order_clause}"
     else:
         # final query using most recent issues
         subquery = f"(SELECT max(`issue`) `max_issue`, `date`, `state` FROM {q.table} WHERE {q.conditions_clause} GROUP BY `date`, `state`) x"