From eade0ef971f16d03c55efbd1971463bb4235c5b6 Mon Sep 17 00:00:00 2001
From: Adam Shimali <adam.shimali@gmail.com>
Date: Tue, 5 Apr 2016 13:49:22 +0100
Subject: [PATCH] Added test for template stats client.

Removed date column from recently used templates table.
---
 .../views/dashboard/template-statistics.html  |  5 +---
 .../views/dashboard/template_statistics.html  | 23 -------------------
 .../notify_client/test_statistics_client.py   | 10 +++++---
 .../test_template_statistics_client.py        | 17 ++++++++++++++
 4 files changed, 25 insertions(+), 30 deletions(-)
 delete mode 100644 app/templates/views/dashboard/template_statistics.html
 create mode 100644 tests/app/main/notify_client/test_template_statistics_client.py

diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html
index 6ac89b724..7b6e0d3b7 100644
--- a/app/templates/views/dashboard/template-statistics.html
+++ b/app/templates/views/dashboard/template-statistics.html
@@ -3,7 +3,7 @@
   template_statistics,
   caption="Recent templates used",
   empty_message='You haven’t sent any batch messages yet',
-  field_headings=['Template', 'Type','Date', right_aligned_field_heading('Usage')]
+  field_headings=['Template', 'Type', right_aligned_field_heading('Usage')]
 ) %}
   {% call field() %}
     <a href="{{ url_for('.edit_service_template', service_id=service_id, template_id=item.template.id) }}">
@@ -12,9 +12,6 @@
   {% endcall %}
   {% call field() %}
     {{item.template.template_type}}
-  {% endcall %}
-  {% call field() %}
-    {{ item.day|format_date }}
   {% endcall %}
    {% call field(align='right') %}
     {{ item.usage_count }}
diff --git a/app/templates/views/dashboard/template_statistics.html b/app/templates/views/dashboard/template_statistics.html
deleted file mode 100644
index 6ac89b724..000000000
--- a/app/templates/views/dashboard/template_statistics.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% from "components/table.html" import list_table, field, right_aligned_field_heading %}
-{% call(item) list_table(
-  template_statistics,
-  caption="Recent templates used",
-  empty_message='You haven’t sent any batch messages yet',
-  field_headings=['Template', 'Type','Date', right_aligned_field_heading('Usage')]
-) %}
-  {% call field() %}
-    <a href="{{ url_for('.edit_service_template', service_id=service_id, template_id=item.template.id) }}">
-      {{ item.template.name }}
-    </a>
-  {% endcall %}
-  {% call field() %}
-    {{item.template.template_type}}
-  {% endcall %}
-  {% call field() %}
-    {{ item.day|format_date }}
-  {% endcall %}
-   {% call field(align='right') %}
-    {{ item.usage_count }}
-  {% endcall %}
-{% endcall %}
-
diff --git a/tests/app/main/notify_client/test_statistics_client.py b/tests/app/main/notify_client/test_statistics_client.py
index 3dc24c16a..a4bcba8ce 100644
--- a/tests/app/main/notify_client/test_statistics_client.py
+++ b/tests/app/main/notify_client/test_statistics_client.py
@@ -1,13 +1,17 @@
+import uuid
+
 from app.notify_client.statistics_api_client import StatisticsApiClient
 
 
-def test_client_uses_correct_find_by_email(mocker, api_user_active):
+def test_notifications_statistics_client_calls_correct_api_endpoint(mocker, api_user_active):
 
-    expected_url = '/service/a1b2c3d4/notifications-statistics'
+    some_service_id = uuid.uuid4()
+    expected_url = '/service/{}/notifications-statistics'.format(some_service_id)
 
     client = StatisticsApiClient()
+
     mock_get = mocker.patch('app.notify_client.statistics_api_client.StatisticsApiClient.get')
 
-    client.get_statistics_for_service('a1b2c3d4')
+    client.get_statistics_for_service(some_service_id)
 
     mock_get.assert_called_once_with(url=expected_url)
diff --git a/tests/app/main/notify_client/test_template_statistics_client.py b/tests/app/main/notify_client/test_template_statistics_client.py
new file mode 100644
index 000000000..03fb33e4c
--- /dev/null
+++ b/tests/app/main/notify_client/test_template_statistics_client.py
@@ -0,0 +1,17 @@
+import uuid
+
+from app.notify_client.template_statistics_api_client import TemplateStatisticsApiClient
+
+
+def test_template_statistics_client_calls_correct_api_endpoint(mocker, api_user_active):
+
+    some_service_id = uuid.uuid4()
+    expected_url = '/service/{}/template-statistics'.format(some_service_id)
+
+    client = TemplateStatisticsApiClient()
+
+    mock_get = mocker.patch('app.notify_client.template_statistics_api_client.TemplateStatisticsApiClient.get')
+
+    client.get_template_statistics_for_service(some_service_id)
+
+    mock_get.assert_called_once_with(url=expected_url)