initial

app/dao/fact_notification_status_dao.py

@@ -108,17 +108,17 @@ def fetch_notification_status_for_service_for_day(fetch_day, service_id):
     return db.session.query(
         # return current month as a datetime so the data has the same shape as the ft_notification_status query
         literal(fetch_day.replace(day=1), type_=DateTime).label('month'),
-        Notification.notification_type,
-        Notification.status.label('notification_status'),
+        NotificationAllTimeView.notification_type,
+        NotificationAllTimeView.status.label('notification_status'),
         func.count().label('count')
     ).filter(
-        Notification.created_at >= get_midnight_in_utc(fetch_day),
-        Notification.created_at < get_midnight_in_utc(fetch_day + timedelta(days=1)),
-        Notification.service_id == service_id,
-        Notification.key_type != KEY_TYPE_TEST
+        NotificationAllTimeView.created_at >= get_midnight_in_utc(fetch_day),
+        NotificationAllTimeView.created_at < get_midnight_in_utc(fetch_day + timedelta(days=1)),
+        NotificationAllTimeView.service_id == service_id,
+        NotificationAllTimeView.key_type != KEY_TYPE_TEST
     ).group_by(
-        Notification.notification_type,
-        Notification.status
+        NotificationAllTimeView.notification_type,
+        NotificationAllTimeView.status
     ).all()
 
 
@@ -137,18 +137,18 @@ 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 []),
+        NotificationAllTimeView.notification_type.cast(db.Text),
+        NotificationAllTimeView.status,
+        *([NotificationAllTimeView.template_id] if by_template else []),
         func.count().label('count')
     ).filter(
-        Notification.created_at >= get_midnight_in_utc(now),
-        Notification.service_id == service_id,
-        Notification.key_type != KEY_TYPE_TEST
+        NotificationAllTimeView.created_at >= get_midnight_in_utc(now),
+        NotificationAllTimeView.service_id == service_id,
+        NotificationAllTimeView.key_type != KEY_TYPE_TEST
     ).group_by(
-        Notification.notification_type,
-        *([Notification.template_id] if by_template else []),
-        Notification.status
+        NotificationAllTimeView.notification_type,
+        *([NotificationAllTimeView.template_id] if by_template else []),
+        NotificationAllTimeView.status
     )
 
     all_stats_table = stats_for_7_days.union_all(stats_for_today).subquery()
@@ -167,12 +167,14 @@ def fetch_notification_status_for_service_for_today_and_7_previous_days(service_
     if by_template:
         query = query.filter(all_stats_table.c.template_id == Template.id)
 
-    return query.group_by(
+    x = query.group_by(
         *([Template.name, all_stats_table.c.template_id] if by_template else []),
         all_stats_table.c.notification_type,
         all_stats_table.c.status,
     ).all()
 
+    return x
+
 
 def fetch_notification_status_totals_for_all_services(start_date, end_date):
     stats = db.session.query(
@@ -191,16 +193,16 @@ def fetch_notification_status_totals_for_all_services(start_date, end_date):
     today = get_midnight_in_utc(datetime.utcnow())
     if start_date <= datetime.utcnow().date() <= end_date:
         stats_for_today = db.session.query(
-            Notification.notification_type.cast(db.Text).label('notification_type'),
-            Notification.status,
-            Notification.key_type,
+            NotificationAllTimeView.notification_type.cast(db.Text).label('notification_type'),
+            NotificationAllTimeView.status,
+            NotificationAllTimeView.key_type,
             func.count().label('count')
         ).filter(
-            Notification.created_at >= today
+            NotificationAllTimeView.created_at >= today
         ).group_by(
-            Notification.notification_type.cast(db.Text),
-            Notification.status,
-            Notification.key_type,
+            NotificationAllTimeView.notification_type.cast(db.Text),
+            NotificationAllTimeView.status,
+            NotificationAllTimeView.key_type,
         )
         all_stats_table = stats.union_all(stats_for_today).subquery()
         query = db.session.query(
@@ -267,19 +269,19 @@ def fetch_stats_for_all_services_by_date_range(start_date, end_date, include_fro
     if start_date <= datetime.utcnow().date() <= end_date:
         today = get_midnight_in_utc(datetime.utcnow())
         subquery = db.session.query(
-            Notification.notification_type.cast(db.Text).label('notification_type'),
-            Notification.status.label('status'),
-            Notification.service_id.label('service_id'),
+            NotificationAllTimeView.notification_type.cast(db.Text).label('notification_type'),
+            NotificationAllTimeView.status.label('status'),
+            NotificationAllTimeView.service_id.label('service_id'),
             func.count(Notification.id).label('count')
         ).filter(
-            Notification.created_at >= today
+            NotificationAllTimeView.created_at >= today
         ).group_by(
-            Notification.notification_type,
-            Notification.status,
-            Notification.service_id
+            NotificationAllTimeView.notification_type,
+            NotificationAllTimeView.status,
+            NotificationAllTimeView.service_id
         )
         if not include_from_test_key:
-            subquery = subquery.filter(Notification.key_type != KEY_TYPE_TEST)
+            subquery = subquery.filter(NotificationAllTimeView.key_type != KEY_TYPE_TEST)
         subquery = subquery.subquery()
 
         stats_for_today = db.session.query(
@@ -358,24 +360,24 @@ def fetch_monthly_template_usage_for_service(start_date, end_date, service_id):
 
     if start_date <= datetime.utcnow() <= end_date:
         today = get_midnight_in_utc(datetime.utcnow())
-        month = get_month_from_utc_column(Notification.created_at)
+        month = get_month_from_utc_column(NotificationAllTimeView.created_at)
 
         stats_for_today = db.session.query(
-            Notification.template_id.label('template_id'),
+            NotificationAllTimeView.template_id.label('template_id'),
             Template.name.label('name'),
             Template.template_type.label('template_type'),
             extract('month', month).label('month'),
             extract('year', month).label('year'),
             func.count().label('count')
         ).join(
-            Template, Notification.template_id == Template.id,
+            Template, NotificationAllTimeView.template_id == Template.id,
         ).filter(
-            Notification.created_at >= today,
-            Notification.service_id == service_id,
-            Notification.key_type != KEY_TYPE_TEST,
-            Notification.status != NOTIFICATION_CANCELLED
+            NotificationAllTimeView.created_at >= today,
+            NotificationAllTimeView.service_id == service_id,
+            NotificationAllTimeView.key_type != KEY_TYPE_TEST,
+            NotificationAllTimeView.status != NOTIFICATION_CANCELLED
         ).group_by(
-            Notification.template_id,
+            NotificationAllTimeView.template_id,
             Template.hidden,
             Template.name,
             Template.template_type,

app/dao/jobs_dao.py

@@ -11,7 +11,7 @@ from app.models import (
     JOB_STATUS_SCHEDULED,
     FactNotificationStatus,
     Job,
-    Notification,
+    NotificationAllTimeView,
     ServiceDataRetention,
     Template,
 )
@@ -20,12 +20,12 @@ from app.utils import midnight_n_days_ago
 
 def dao_get_notification_outcomes_for_job(service_id, job_id):
     notification_statuses = db.session.query(
-        func.count(Notification.status).label('count'), Notification.status
+        func.count(NotificationAllTimeView.status).label('count'), NotificationAllTimeView.status
     ).filter(
-        Notification.service_id == service_id,
-        Notification.job_id == job_id
+        NotificationAllTimeView.service_id == service_id,
+        NotificationAllTimeView.job_id == job_id
     ).group_by(
-        Notification.status
+        NotificationAllTimeView.status
     ).all()
 
     if not notification_statuses:
@@ -185,12 +185,12 @@ def find_jobs_with_missing_rows():
         Job.job_status == JOB_STATUS_FINISHED,
         Job.processing_finished < ten_minutes_ago,
         Job.processing_finished > yesterday,
-        Job.id == Notification.job_id,
+        Job.id == NotificationAllTimeView.job_id,
 
     ).group_by(
         Job
     ).having(
-        func.count(Notification.id) != Job.notification_count
+        func.count(NotificationAllTimeView.id) != Job.notification_count
     )
 
     return jobs_with_rows_missing.all()
@@ -202,11 +202,12 @@ def find_missing_row_for_job(job_id, job_size):
     ).subquery()
 
     query = db.session.query(
-        Notification.job_row_number,
+        NotificationAllTimeView.job_row_number,
         expected_row_numbers.c.row.label('missing_row')
     ).outerjoin(
-        Notification, and_(expected_row_numbers.c.row == Notification.job_row_number, Notification.job_id == job_id)
+        NotificationAllTimeView, and_(expected_row_numbers.c.row == NotificationAllTimeView.job_row_number,
+                                      NotificationAllTimeView.job_id == job_id)
     ).filter(
-        Notification.job_row_number == None  # noqa
+        NotificationAllTimeView.job_row_number == None  # noqa
     )
     return query.all()

app/dao/notifications_dao.py

@@ -31,6 +31,7 @@ from app.models import (
     SMS_TYPE,
     FactNotificationStatus,
     Notification,
+    NotificationAllTimeView,
     NotificationHistory,
 )
 from app.utils import (
@@ -162,16 +163,16 @@ def dao_update_notification(notification):
 def get_notifications_for_job(service_id, job_id, filter_dict=None, page=1, page_size=None):
     if page_size is None:
         page_size = current_app.config['PAGE_SIZE']
-    query = Notification.query.filter_by(service_id=service_id, job_id=job_id)
+    query = NotificationAllTimeView.query.filter_by(service_id=service_id, job_id=job_id)
     query = _filter_query(query, filter_dict)
-    return query.order_by(asc(Notification.job_row_number)).paginate(
+    return query.order_by(asc(NotificationAllTimeView.job_row_number)).paginate(
         page=page,
         per_page=page_size
     )
 
 
 def dao_get_notification_count_for_job_id(*, job_id):
-    return Notification.query.filter_by(job_id=job_id).count()
+    return NotificationAllTimeView.query.filter_by(job_id=job_id).count()
 
 
 def get_notification_with_personalisation(service_id, notification_id, key_type):