Rearrange columns that to ensure tests still pass

Author: chinandrew

src/acquisition/covid_hosp/state_timeseries/database.py

@@ -18,16 +18,6 @@ class Database(BaseDatabase):
   ORDERED_CSV_COLUMNS = [
     ('state', 'state', str),
     ('date', 'date', Utils.int_from_date),
-    ('critical_staffing_shortage_today_yes', 'critical_staffing_shortage_today_yes', int),
-    ('critical_staffing_shortage_today_no', 'critical_staffing_shortage_today_no', int),
-    ('critical_staffing_shortage_today_not_reported',
-     'critical_staffing_shortage_today_not_reported', int),
-    ('critical_staffing_shortage_anticipated_within_week_yes',
-     'critical_staffing_shortage_anticipated_within_week_yes', int),
-    ('critical_staffing_shortage_anticipated_within_week_no',
-     'critical_staffing_shortage_anticipated_within_week_no', int),
-    ('critical_staffing_shortage_anticipated_within_week_not_reported',
-     'critical_staffing_shortage_anticipated_within_week_not_reported', int),
     ('hospital_onset_covid', 'hospital_onset_covid', int),
     ('hospital_onset_covid_coverage', 'hospital_onset_covid_coverage', int),
     ('inpatient_beds', 'inpatient_beds', int),
@@ -104,6 +94,16 @@ class Database(BaseDatabase):
     ('adult_icu_bed_utilization_coverage', 'adult_icu_bed_utilization_coverage', int),
     ('adult_icu_bed_utilization_numerator', 'adult_icu_bed_utilization_numerator', int),
     ('adult_icu_bed_utilization_denominator', 'adult_icu_bed_utilization_denominator', int),
+    ('critical_staffing_shortage_today_yes', 'critical_staffing_shortage_today_yes', int),
+    ('critical_staffing_shortage_today_no', 'critical_staffing_shortage_today_no', int),
+    ('critical_staffing_shortage_today_not_reported',
+     'critical_staffing_shortage_today_not_reported', int),
+    ('critical_staffing_shortage_anticipated_within_week_yes',
+     'critical_staffing_shortage_anticipated_within_week_yes', int),
+    ('critical_staffing_shortage_anticipated_within_week_no',
+     'critical_staffing_shortage_anticipated_within_week_no', int),
+    ('critical_staffing_shortage_anticipated_within_week_not_reported',
+     'critical_staffing_shortage_anticipated_within_week_not_reported', int),
   ]
 
   def __init__(self, *args, **kwargs):

tests/acquisition/covid_hosp/state_timeseries/test_database.py

@@ -40,11 +40,12 @@ def test_insert_dataset(self):
 
     last_query_values = mock_cursor.execute.call_args[0][-1]
     expected_query_values = (
-        0, sentinel.issue, 'WY', 20200826, 2, None, 4, 2, 19, 7, 0, 26, 1464,
+        0, sentinel.issue, 'WY', 20200826, 0, 26, 1464,
         28, 629, 28, 17, 26, 2, 28, 13, 26, 0, 21, 0, 22, 49, 28, 10, 26, 7,
         28, 17, 26, 14, 28, 0, 26, 0, 26, 114, 28, 0.4296448087431694, 28, 629,
         1464, 0.027597402597402596, 26, 17, 616, 0.011946591707659873, 26, 17,
-        1423, 0.09345794392523364, 26, 10, 107, 0.4298245614035088, 28, 49, 114, 'T')
+        1423, 0.09345794392523364, 26, 10, 107, 0.4298245614035088, 28, 49, 114,
+        2, None, 4, 2, 19, 7, 'T')
     self.assertEqual(len(last_query_values), len(expected_query_values))
 
     for actual, expected in zip(last_query_values, expected_query_values):