Merge pull request #2303 from alphagov/ft-status-template-statistics

Change template statistics endpoint to use fact_notification_status_dao

app/dao/fact_notification_status_dao.py

@@ -107,12 +107,13 @@ def fetch_notification_status_for_service_for_day(bst_day, service_id):
     ).all()
 
 
-def fetch_notification_status_for_service_for_today_and_7_previous_days(service_id, limit_days=7):
+def fetch_notification_status_for_service_for_today_and_7_previous_days(service_id, by_template=False, limit_days=7):
     start_date = midnight_n_days_ago(limit_days)
     now = datetime.utcnow()
     stats_for_7_days = db.session.query(
         FactNotificationStatus.notification_type.label('notification_type'),
         FactNotificationStatus.notification_status.label('status'),
+        *([FactNotificationStatus.template_id.label('template_id')] if by_template else []),
         FactNotificationStatus.notification_count.label('count')
     ).filter(
         FactNotificationStatus.service_id == service_id,
@@ -123,6 +124,7 @@ def fetch_notification_status_for_service_for_today_and_7_previous_days(service_
     stats_for_today = db.session.query(
         Notification.notification_type.cast(db.Text),
         Notification.status,
+        *([Notification.template_id] if by_template else []),
         func.count().label('count')
     ).filter(
         Notification.created_at >= get_london_midnight_in_utc(now),
@@ -130,14 +132,28 @@ def fetch_notification_status_for_service_for_today_and_7_previous_days(service_
         Notification.key_type != KEY_TYPE_TEST
     ).group_by(
         Notification.notification_type,
+        *([Notification.template_id] if by_template else []),
         Notification.status
     )
+
     all_stats_table = stats_for_7_days.union_all(stats_for_today).subquery()
-    return db.session.query(
+
+    query = db.session.query(
+        *([
+            Template.name.label("template_name"),
+            Template.is_precompiled_letter,
+            all_stats_table.c.template_id
+        ] if by_template else []),
         all_stats_table.c.notification_type,
         all_stats_table.c.status,
         func.cast(func.sum(all_stats_table.c.count), Integer).label('count'),
-    ).group_by(
+    )
+
+    if by_template:
+        query = query.filter(all_stats_table.c.template_id == Template.id)
+
+    return query.group_by(
+        *([Template.name, Template.is_precompiled_letter, all_stats_table.c.template_id] if by_template else []),
         all_stats_table.c.notification_type,
         all_stats_table.c.status,
     ).all()

app/dao/notifications_dao.py

@@ -30,7 +30,6 @@ from app.models import (
     Notification,
     NotificationHistory,
     ScheduledNotification,
-    Template,
     KEY_TYPE_TEST,
     LETTER_TYPE,
     NOTIFICATION_CREATED,
@@ -51,39 +50,6 @@ from app.utils import get_london_midnight_in_utc
 from app.utils import midnight_n_days_ago, escape_special_characters
 
 
-@statsd(namespace="dao")
-def dao_get_template_usage(service_id, day):
-    start = get_london_midnight_in_utc(day)
-    end = get_london_midnight_in_utc(day + timedelta(days=1))
-
-    notifications_aggregate_query = db.session.query(
-        func.count().label('count'),
-        Notification.template_id
-    ).filter(
-        Notification.created_at >= start,
-        Notification.created_at < end,
-        Notification.service_id == service_id,
-        Notification.key_type != KEY_TYPE_TEST,
-    ).group_by(
-        Notification.template_id
-    ).subquery()
-
-    query = db.session.query(
-        Template.id,
-        Template.name,
-        Template.template_type,
-        Template.is_precompiled_letter,
-        func.coalesce(notifications_aggregate_query.c.count, 0).label('count')
-    ).outerjoin(
-        notifications_aggregate_query,
-        notifications_aggregate_query.c.template_id == Template.id
-    ).filter(
-        Template.service_id == service_id
-    ).order_by(Template.name)
-
-    return query.all()
-
-
 @statsd(namespace="dao")
 def dao_get_last_template_usage(template_id, template_type, service_id):
     # By adding the service_id to the filter the performance of the query is greatly improved.

app/dao/templates_dao.py

@@ -129,18 +129,3 @@ def dao_get_template_versions(service_id, template_id):
     ).order_by(
         desc(TemplateHistory.version)
     ).all()
-
-
-def dao_get_multiple_template_details(template_ids):
-    query = db.session.query(
-        Template.id,
-        Template.template_type,
-        Template.name,
-        Template.is_precompiled_letter
-    ).filter(
-        Template.id.in_(template_ids)
-    ).order_by(
-        Template.name
-    )
-
-    return query.all()