Merge pull request #415 from alphagov/handle-multiple-dashboards-for-…

…service-id Handle multiple data points for a service id.
alphagov · Jan 30, 2015 · 0058974 · 0058974
2 parents 65de900 + b57b6f3
commit 0058974
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/backdrop/transformers/tasks/latest_transaction_explorer_values.py b/backdrop/transformers/tasks/latest_transaction_explorer_values.py
@@ -80,18 +80,14 @@ def _service_ids_with_data(data):
 
 
 def _get_dashboard_config(service_id):
-    dashboard_configs = admin_api.get_dashboard_by_tx_id(service_id)
-    if dashboard_configs:
-        return dashboard_configs[0]
-    else:
-        return None
+    return admin_api.get_dashboard_by_tx_id(service_id)
 
 
 def _get_dashboard_configs_with_data(ids_with_data):
     dashboard_configs_with_data = []
     for service_id, data in ids_with_data:
-        dashboard_config = _get_dashboard_config(service_id)
-        if dashboard_config:
+        dashboard_configs = _get_dashboard_config(service_id)
+        for dashboard_config in dashboard_configs:
             dashboard_configs_with_data.append((dashboard_config, data))
     return dashboard_configs_with_data
 

diff --git a/tests/transformers/tasks/test_latest_transaction_explorer_values.py b/tests/transformers/tasks/test_latest_transaction_explorer_values.py
@@ -42,6 +42,28 @@
         "dashboard_slug": "quarterly-nonsense",
         "type": "quarterly"
     },
+    {
+        "_id": encode_id(
+            'quarterly-nonsense2',
+            'digital_cost_per_transaction'),
+        "_timestamp": "2012-12-12T00:00:00+00:00",
+        "digital_cost_per_transaction": 2.36,
+        "end_at": "2013-01-01T00:00:00+00:00",
+        "period": "year",
+        "service_id": "service-with-quarterly-data",
+        "dashboard_slug": "quarterly-nonsense2",
+        "type": "quarterly"
+    },
+    {
+        "_id": encode_id('quarterly-nonsense2', 'digital_takeup'),
+        "_timestamp": "2012-12-12T00:00:00+00:00",
+        "digital_takeup": 0.9756123825537215,
+        "end_at": "2013-01-01T00:00:00+00:00",
+        "period": "year",
+        "service_id": "service-with-quarterly-data",
+        "dashboard_slug": "quarterly-nonsense2",
+        "type": "quarterly"
+    },
     {
         "_id": encode_id('sorn', 'cost_per_transaction'),
         "_timestamp": "2013-04-01T00:00:00+00:00",
@@ -166,9 +188,14 @@
     'slug': 'bis-returns'
 }]
 
-quarterly_data_dashboard_config = [{
-    'slug': 'quarterly-nonsense'
-}]
+quarterly_data_dashboard_config = [
+    {
+        'slug': 'quarterly-nonsense'
+    },
+    {
+        'slug': 'quarterly-nonsense2'
+    }
+]
 
 
 class ComputeTestCase(unittest.TestCase):
@@ -197,7 +224,7 @@ def test_compute(self, mock_dashboard_finder, mock_dataset):
             'data-group': 'transactions-explorer',
             'data-type': 'spreadsheet'}})
 
-        assert_that(len(transformed_data), is_(13))
+        assert_that(len(transformed_data), is_(15))
         assert_that(transformed_data, contains_inanyorder(*data_to_post))
 
     @patch("performanceplatform.client.DataSet.from_group_and_type")