From b9446b660d39903a82367b87745dd58b6896e276 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Tue, 6 Feb 2018 14:31:12 +0000
Subject: [PATCH] exclude test keys from template usage page

they were not included in nightly task since that runs off
NotificationHistory, which doesn't include test keys. However, when you
load the page we top up the nightly stats with today's data from the
Notifications table, which *does* include test data.
---
 app/dao/services_dao.py            |  6 ++++--
 tests/app/dao/test_services_dao.py | 33 ++++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py
index 95f83dec2..f7d371213 100644
--- a/app/dao/services_dao.py
+++ b/app/dao/services_dao.py
@@ -542,7 +542,9 @@ def dao_fetch_monthly_historical_usage_by_template_for_service(service_id, year)
             Template, Notification.template_id == Template.id,
         ).filter(
             Notification.created_at >= start_date,
-            Notification.service_id == service_id
+            Notification.service_id == service_id,
+            # we don't want to include test keys
+            Notification.key_type != KEY_TYPE_TEST
         ).group_by(
             Notification.template_id,
             Template.name,
@@ -562,7 +564,7 @@ def dao_fetch_monthly_historical_usage_by_template_for_service(service_id, year)
                     add_to_stats = False
 
             if add_to_stats:
-                new_stat = type("", (), {})()
+                new_stat = type("StatsTemplateUsageByMonth", (), {})()
                 new_stat.template_id = today_result.template_id
                 new_stat.template_type = today_result.template_type
                 new_stat.name = today_result.name
diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py
index 64e1edd5d..c1c2264df 100644
--- a/tests/app/dao/test_services_dao.py
+++ b/tests/app/dao/test_services_dao.py
@@ -64,8 +64,13 @@ from app.models import (
 )
 
 from tests.app.db import (
-    create_inbound_number, create_user, create_service, create_service_with_inbound_number,
-    create_service_with_defined_sms_sender
+    create_inbound_number,
+    create_user,
+    create_service,
+    create_service_with_inbound_number,
+    create_service_with_defined_sms_sender,
+    create_template,
+    create_notification as create_notification_db
 )
 from tests.app.conftest import (
     sample_notification as create_notification,
@@ -1477,3 +1482,27 @@ def test_dao_fetch_monthly_historical_usage_by_template_for_service_only_returns
     )
 
     assert len(result) == 1
+
+
+@freeze_time("2018-01-01 11:09:00.000000")
+def test_dao_fetch_monthly_historical_usage_by_template_for_service_ignores_test_api_keys(sample_service):
+    template_1 = create_template(sample_service, template_name='1')
+    template_2 = create_template(sample_service, template_name='2')
+    template_3 = create_template(sample_service, template_name='3')
+
+    create_notification_db(template_1, key_type=KEY_TYPE_TEST)
+    create_notification_db(template_2, key_type=KEY_TYPE_TEAM)
+    create_notification_db(template_3, key_type=KEY_TYPE_NORMAL)
+
+    results = sorted(
+        dao_fetch_monthly_historical_usage_by_template_for_service(sample_service.id, 2017),
+        key=lambda x: x.name
+    )
+
+    assert len(results) == 2
+    # template_1 only used with test keys
+    assert results[0].template_id == template_2.id
+    assert results[0].count == 1
+
+    assert results[1].template_id == template_3.id
+    assert results[1].count == 1