Merge pull request #196 from alphagov/template-stats-order

Additional sort order by template name for template statistics.

app/dao/notifications_dao.py

@@ -1,4 +1,8 @@
-from sqlalchemy import desc
+from sqlalchemy import (
+    desc,
+    func
+)
+
 from datetime import (
     datetime,
     timedelta,
@@ -66,7 +70,8 @@ def dao_get_template_statistics_for_service(service_id, limit_days=None):
         else:
             last_date_to_fetch = date.today() - timedelta(days=limit_days)
         filter.append(TemplateStatistics.day > last_date_to_fetch)
-    return TemplateStatistics.query.filter(*filter).order_by(desc(TemplateStatistics.day)).all()
+    return TemplateStatistics.query.filter(*filter).order_by(
+        desc(TemplateStatistics.day)).join(Template).order_by(func.lower(Template.name)).all()
 
 
 @transactional

tests/app/dao/test_notification_dao.py

@@ -1016,3 +1016,39 @@ def test_get_template_stats_for_service_returns_results_from_first_day_with_data
 def test_get_template_stats_for_service_with_limit_if_no_records_returns_empty_list(sample_template):
     template_stats = dao_get_template_statistics_for_service(sample_template.service.id, limit_days=7)
     assert len(template_stats) == 0
+
+
+def test_get_template_stats_for_service_for_day_returns_stats_in_template_name_order(sample_service, sample_job):
+
+    from app.dao.templates_dao import dao_create_template
+    from app.models import Template
+
+    template_stats = dao_get_template_statistics_for_service(sample_service.id)
+    assert len(template_stats) == 0
+
+    template_names = ['Aardvark', 'ant', 'zebra', 'walrus', 'Donkey', 'Komodo dragon']
+    for name in template_names:
+        data = {
+            'name': name,
+            'template_type': 'sms',
+            'content': 'blah',
+            'service': sample_service
+        }
+        template = Template(**data)
+        dao_create_template(template)
+
+        notification_data = {
+            'to': '+44709123456',
+            'job_id': sample_job.id,
+            'service': template.service,
+            'service_id': template.service.id,
+            'template': template,
+            'template_id': template.id,
+            'created_at': datetime.utcnow()
+        }
+        notification = Notification(**notification_data)
+        dao_create_notification(notification, template.template_type)
+        template_stats = dao_get_template_statistics_for_service(template.service.id)
+
+    for i, name in enumerate(sorted(template_names, key=str.lower)):
+        assert template_stats[i].template.name == name