From 4ab0ab70fffc4bd477ed0681be1a72fd6d507dcf Mon Sep 17 00:00:00 2001
From: Ben Thorner <ben.thorner@digital.cabinet-office.gov.uk>
Date: Mon, 21 Jun 2021 10:59:05 +0100
Subject: [PATCH] Try inlining indexes with table args

---
 app/models.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/models.py b/app/models.py
index 1584c38d5..3f12e1722 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1472,7 +1472,7 @@ class Notification(db.Model):
             ['templates_history.id', 'templates_history.version'],
         ),
         UniqueConstraint('job_id', 'job_row_number', name='uq_notifications_job_row_number'),
-        {}
+        Index('ix_notifications_service_created_at', 'service_id', 'created_at')
     )
 
     @property
@@ -1727,7 +1727,10 @@ class NotificationHistory(db.Model, HistoryModel):
             ['template_id', 'template_version'],
             ['templates_history.id', 'templates_history.version'],
         ),
-        {}
+        Index(
+            'ix_notification_history_service_id_composite',
+            'service_id', 'key_type', 'notification_type', 'created_at',
+        )
     )
 
     @classmethod
@@ -1742,20 +1745,12 @@ class NotificationHistory(db.Model, HistoryModel):
 
 
 # Indexes for notification_history and notifications to improve performance of fetch queries.
-Index(
-    'ix_notification_history_service_id_composite',
-    NotificationHistory.service_id,
-    NotificationHistory.key_type,
-    NotificationHistory.notification_type,
-    NotificationHistory.created_at
-)
 Index(
     'ix_notifications_notification_type_composite',
     Notification.notification_type,
     Notification.status,
     Notification.created_at
 )
-Index('ix_notifications_service_created_at', Notification.service_id, Notification.created_at)
 Index(
     "ix_notifications_service_id_composite",
     Notification.service_id,