[wip] Add support for querying multiple signals; cmu-delphi/covidcast-indicators#116

Author: krivard

integrations/client/test_delphi_epidata.py

@@ -50,6 +50,8 @@ def test_covidcast(self):
     self.cur.execute('''
       insert into covidcast values
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
+          123, 1.5, 2.5, 3.5, 456, 4),
+        (0, 'src', 'sig2', 'day', 'county', 20200414, '01234',
           123, 1.5, 2.5, 3.5, 456, 4)
     ''')
     self.cnx.commit()
@@ -72,6 +74,24 @@ def test_covidcast(self):
       'message': 'success',
     })
 
+    # fetch data
+    response = Epidata.covidcast(
+        'src', ['sig','sig2'], 'day', 'county', 20200414, '01234')
+
+    # check result
+    self.assertEqual(response, { # TODO
+      'result': 1,
+      'epidata': [{
+        'time_value': 20200414,
+        'geo_value': '01234',
+        'value': 1.5,
+        'stderr': 2.5,
+        'sample_size': 3.5,
+        'direction': 4,
+       }],
+      'message': 'success',
+    })
+
   def test_covidcast_meta(self):
     """Test that the covidcast_meta endpoint returns expected data."""
 

src/server/api.php

@@ -925,17 +925,16 @@ function get_dengue_nowcast($locations, $epiweeks) {
 
 // queries the `covidcast` table.
 //   $source (required): name of upstream data souce
-//   $signal (required): name of signal derived from upstream data
+//   $signals (required): array of names for signals derived from upstream data
 //   $time_type (required): temporal resolution (e.g. day, week)
 //   $geo_type (required): spatial resolution (e.g. county, msa, state)
 //   $time_values (required): array of time values/ranges
 //   $geo_value (required): location identifier or `*` as a wildcard for all
 //     locations (specific to `$geo_type`)
-function get_covidcast($source, $signal, $time_type, $geo_type, $time_values, $geo_value) {
+function get_covidcast($source, $signals, $time_type, $geo_type, $time_values, $geo_value) {
   // required for `mysqli_real_escape_string`
   global $dbh;
   $source = mysqli_real_escape_string($dbh, $source);
-  $signal = mysqli_real_escape_string($dbh, $signal);
   $time_type = mysqli_real_escape_string($dbh, $time_type);
   $geo_type = mysqli_real_escape_string($dbh, $geo_type);
   $geo_value = mysqli_real_escape_string($dbh, $geo_value);
@@ -949,7 +948,7 @@ function get_covidcast($source, $signal, $time_type, $geo_type, $time_values, $g
   $fields_float = array('value', 'stderr', 'sample_size');
   // build the source, signal, time, and location (type and id) filters
   $condition_source = "t.`source` = '{$source}'";
-  $condition_signal = "t.`signal` = '{$signal}'";
+  $condition_signal = filter_strings('t.`signal`', $signals);
   $condition_time_type = "t.`time_type` = '{$time_type}'";
   $condition_geo_type = "t.`geo_type` = '{$geo_type}'";
   $condition_time_value = filter_integers('t.`time_value`', $time_values);
@@ -1444,11 +1443,11 @@ function meta_delphi() {
       }
     }
   } else if($source === 'covidcast') {
-    if(require_all($data, array('data_source', 'signal', 'time_type', 'geo_type', 'time_values', 'geo_value'))) {
+    if(require_all($data, array('data_source', 'signals', 'time_type', 'geo_type', 'time_values', 'geo_value'))) {
       // parse the request
       $time_values = extract_values($_REQUEST['time_values'], 'int');
       // get the data
-      $epidata = get_covidcast($_REQUEST['data_source'], $_REQUEST['signal'], $_REQUEST['time_type'], $_REQUEST['geo_type'], $time_values, $_REQUEST['geo_value']);
+      $epidata = get_covidcast($_REQUEST['data_source'], $_REQUEST['signals'], $_REQUEST['time_type'], $_REQUEST['geo_type'], $time_values, $_REQUEST['geo_value']);
       store_result($data, $epidata);
     }
   } else if($source === 'covidcast_meta') {