From c04df94b2294a034c562cb8e172269760519a1b6 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Wed, 29 Nov 2023 16:08:02 -0500
Subject: [PATCH 01/13] Adjusting some DAO stuff to send expired invites now.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/dao/invited_user_dao.py            | 13 +++----------
 tests/app/dao/test_invited_user_dao.py | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/dao/invited_user_dao.py b/app/dao/invited_user_dao.py
index 20ec5288c..c5eb75918 100644
--- a/app/dao/invited_user_dao.py
+++ b/app/dao/invited_user_dao.py
@@ -13,26 +13,19 @@ def get_invited_user_by_service_and_id(service_id, invited_user_id):
     return InvitedUser.query.filter(
         InvitedUser.service_id == service_id,
         InvitedUser.id == invited_user_id,
-        InvitedUser.status != INVITE_EXPIRED,
     ).one()
 
 
 def get_invited_user_by_id(invited_user_id):
-    return InvitedUser.query.filter(
-        InvitedUser.id == invited_user_id, InvitedUser.status != INVITE_EXPIRED
-    ).one()
+    return InvitedUser.query.filter(InvitedUser.id == invited_user_id).one()
 
 
 def get_expired_invited_users_for_service(service_id):
-    return InvitedUser.query.filter(
-        InvitedUser.service_id == service_id, InvitedUser.status == INVITE_EXPIRED
-    ).all()
+    return InvitedUser.query.filter(InvitedUser.service_id == service_id).all()
 
 
 def get_invited_users_for_service(service_id):
-    return InvitedUser.query.filter(
-        InvitedUser.service_id == service_id, InvitedUser.status != INVITE_EXPIRED
-    ).all()
+    return InvitedUser.query.filter(InvitedUser.service_id == service_id).all()
 
 
 def expire_invitations_created_more_than_two_days_ago():
diff --git a/tests/app/dao/test_invited_user_dao.py b/tests/app/dao/test_invited_user_dao.py
index b0a7d75de..4242484c7 100644
--- a/tests/app/dao/test_invited_user_dao.py
+++ b/tests/app/dao/test_invited_user_dao.py
@@ -155,7 +155,18 @@ def test_should_not_delete_invitations_less_than_two_days_old(
     assert (
         len(InvitedUser.query.filter(InvitedUser.status != INVITE_EXPIRED).all()) == 1
     )
-    assert InvitedUser.query.first().email_address == "valid@2.com"
+    assert (
+        InvitedUser.query.filter(InvitedUser.status != INVITE_EXPIRED)
+        .first()
+        .email_address
+        == "valid@2.com"
+    )
+    assert (
+        InvitedUser.query.filter(InvitedUser.status == INVITE_EXPIRED)
+        .first()
+        .email_address
+        == "expired@1.com"
+    )
 
 
 def make_invitation(user, service, age=None, email_address="test@test.com"):

From 9bcf8113201c2fd6046dcf4c28686820d6bf2f2d Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Mon, 4 Dec 2023 16:22:32 -0500
Subject: [PATCH 02/13] Cleaned up string formatting for commands.py.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/commands.py | 48 ++++++++++++++----------------------------------
 1 file changed, 14 insertions(+), 34 deletions(-)

diff --git a/app/commands.py b/app/commands.py
index 64b933e92..a6734ad29 100644
--- a/app/commands.py
+++ b/app/commands.py
@@ -118,7 +118,7 @@ def purge_functional_test_data(user_email_prefix):
         return
 
     users = User.query.filter(
-        User.email_address.like("{}%".format(user_email_prefix))
+        User.email_address.like(f"{user_email_prefix}%")
     ).all()
     for usr in users:
         # Make sure the full email includes a uuid in it
@@ -126,11 +126,7 @@ def purge_functional_test_data(user_email_prefix):
         try:
             uuid.UUID(usr.email_address.split("@")[0].split("+")[1])
         except ValueError:
-            print(
-                "Skipping {} as the user email doesn't contain a UUID.".format(
-                    usr.email_address
-                )
-            )
+            print(f"Skipping {usr.email_address} as the user email doesn't contain a UUID.")
         else:
             services = dao_fetch_all_services_by_user(usr.id)
             if services:
@@ -164,7 +160,7 @@ def purge_functional_test_data(user_email_prefix):
 def insert_inbound_numbers_from_file(file_name):
     # TODO maintainability what is the purpose of this command?  Who would use it and why?
 
-    print("Inserting inbound numbers from {}".format(file_name))
+    print(f"Inserting inbound numbers from {file_name}")
     with open(file_name) as file:
         sql = "insert into inbound_numbers values('{}', '{}', 'sns', null, True, now(), null);"
 
@@ -199,9 +195,7 @@ def rebuild_ft_billing_for_day(service_id, day):
     def rebuild_ft_data(process_day, service):
         deleted_rows = delete_billing_data_for_service_for_day(process_day, service)
         current_app.logger.info(
-            "deleted {} existing billing rows for {} on {}".format(
-                deleted_rows, service, process_day
-            )
+            f"deleted {deleted_rows} existing billing rows for {service} on {process_day}"
         )
         transit_data = fetch_billing_data_for_day(
             process_day=process_day, service_id=service
@@ -211,9 +205,7 @@ def rebuild_ft_billing_for_day(service_id, day):
             # upsert existing rows
             update_fact_billing(data, process_day)
         current_app.logger.info(
-            "added/updated {} billing rows for {} on {}".format(
-                len(transit_data), service, process_day
-            )
+            f"added/updated {len(transit_data)} billing rows for {service} on {process_day}"
         )
 
     if service_id:
@@ -276,7 +268,7 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
         }
         current_app.logger.info(f"DATA = {data}")
         with current_app.test_request_context(
-            path="/service/{}/invite/".format(service_id),
+            path=f"/service/{service_id}/invite/",
             method="POST",
             data=json.dumps(data),
             headers={"Content-Type": "application/json"},
@@ -286,16 +278,12 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
                 current_app.logger.info(f"RESPONSE {response[1]}")
                 if response[1] != 201:
                     print(
-                        "*** ERROR occurred for email address: {}".format(
-                            email_address.strip()
-                        )
+                        f"*** ERROR occurred for email address: {email_address.strip()}"
                     )
                 print(response[0].get_data(as_text=True))
             except Exception as e:
                 print(
-                    "*** ERROR occurred for email address: {}. \n{}".format(
-                        email_address.strip(), e
-                    )
+                    f"*** ERROR occurred for email address: {email_address.strip()}. \n{e}"
                 )
 
     file.close()
@@ -318,7 +306,7 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
 )
 def update_jobs_archived_flag(start_date, end_date):
     current_app.logger.info(
-        "Archiving jobs created between {} to {}".format(start_date, end_date)
+        f"Archiving jobs created between {start_date} to {end_date}"
     )
 
     process_date = start_date
@@ -337,15 +325,13 @@ def update_jobs_archived_flag(start_date, end_date):
         )
         db.session.commit()
         current_app.logger.info(
-            "jobs: --- Completed took {}ms. Archived {} jobs for {}".format(
-                datetime.now() - start_time, result.rowcount, process_date
-            )
+            f"jobs: --- Completed took {datetime.now() - start_time}ms. Archived {result.rowcount} jobs for {process_date}"
         )
 
         process_date += timedelta(days=1)
 
         total_updated += result.rowcount
-    current_app.logger.info("Total archived jobs = {}".format(total_updated))
+    current_app.logger.info(f"Total archived jobs = {total_updated}")
 
 
 @notify_command(name="populate-organizations-from-file")
@@ -551,9 +537,7 @@ def fix_billable_units():
             show_prefix=notification.service.prefix_sms,
         )
         print(
-            "Updating notification: {} with {} billable_units".format(
-                notification.id, template.fragment_count
-            )
+            f"Updating notification: {notification.id} with {template.fragment_count} billable_units"
         )
 
         Notification.query.filter(Notification.id == notification.id).update(
@@ -586,9 +570,7 @@ def process_row_from_job(job_id, job_row_number):
         if row.index == job_row_number:
             notification_id = process_row(row, template, job, job.service)
             current_app.logger.info(
-                "Process row {} for job {} created notification_id: {}".format(
-                    job_row_number, job_id, notification_id
-                )
+                f"Process row {job_row_number} for job {job_id} created notification_id: {notification_id}"
             )
 
 
@@ -623,9 +605,7 @@ def populate_annual_billing_with_the_previous_years_allowance(year):
             latest_annual_billing, {"service_id": row.id}
         )
         free_allowance = [x[0] for x in free_allowance_rows]
-        print(
-            "create free limit of {} for service: {}".format(free_allowance[0], row.id)
-        )
+        print(f"create free limit of {free_allowance[0]} for service: {row.id}")
         dao_create_or_update_annual_billing_for_year(
             service_id=row.id,
             free_sms_fragment_limit=free_allowance[0],

From 991d9aa6212604dab362afcfa1a10b224cdcd3d0 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Mon, 4 Dec 2023 16:59:05 -0500
Subject: [PATCH 03/13] Made new /resend route in api.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/dao/invited_user_dao.py |  7 +++--
 app/service_invite/rest.py  | 56 +++++++++++++++++++++++++++++--------
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/app/dao/invited_user_dao.py b/app/dao/invited_user_dao.py
index c5eb75918..c045489e8 100644
--- a/app/dao/invited_user_dao.py
+++ b/app/dao/invited_user_dao.py
@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 
 from app import db
-from app.models import INVITE_EXPIRED, InvitedUser
+from app.models import INVITE_EXPIRED, INVITE_PENDING, InvitedUser
 
 
 def save_invited_user(invited_user):
@@ -31,7 +31,10 @@ def get_invited_users_for_service(service_id):
 def expire_invitations_created_more_than_two_days_ago():
     expired = (
         db.session.query(InvitedUser)
-        .filter(InvitedUser.created_at <= datetime.utcnow() - timedelta(days=2))
+        .filter(
+            InvitedUser.created_at <= datetime.utcnow() - timedelta(days=2),
+            InvitedUser.status.in_(INVITE_PENDING),
+        )
         .update({InvitedUser.status: INVITE_EXPIRED})
     )
     db.session.commit()
diff --git a/app/service_invite/rest.py b/app/service_invite/rest.py
index b5f9c95a7..e54fba3cd 100644
--- a/app/service_invite/rest.py
+++ b/app/service_invite/rest.py
@@ -1,3 +1,7 @@
+from re import I
+
+
+from datetime import datetime
 from flask import Blueprint, current_app, jsonify, request
 from itsdangerous import BadData, SignatureExpired
 from notifications_utils.url_safe_token import check_token, generate_token
@@ -12,7 +16,7 @@ from app.dao.invited_user_dao import (
 )
 from app.dao.templates_dao import dao_get_template_by_id
 from app.errors import InvalidRequest, register_errors
-from app.models import EMAIL_TYPE, KEY_TYPE_NORMAL, Service
+from app.models import EMAIL_TYPE, INVITE_PENDING, KEY_TYPE_NORMAL, Service
 from app.notifications.process_notifications import (
     persist_notification,
     send_notification_to_queue,
@@ -23,13 +27,7 @@ service_invite = Blueprint("service_invite", __name__)
 
 register_errors(service_invite)
 
-
-@service_invite.route("/service/<service_id>/invite", methods=["POST"])
-def create_invited_user(service_id):
-    request_json = request.get_json()
-    invited_user = invited_user_schema.load(request_json)
-    save_invited_user(invited_user)
-
+def _create_service_invite(invited_user, invite_link_host):
     template_id = current_app.config["INVITATION_EMAIL_TEMPLATE_ID"]
 
     template = dao_get_template_by_id(template_id)
@@ -43,10 +41,7 @@ def create_invited_user(service_id):
         personalisation={
             "user_name": invited_user.from_user.name,
             "service_name": invited_user.service.name,
-            "url": invited_user_url(
-                invited_user.id,
-                request_json.get("invite_link_host"),
-            ),
+            "url": invited_user_url(invited_user.id, invite_link_host),
         },
         notification_type=EMAIL_TYPE,
         api_key_id=None,
@@ -56,6 +51,15 @@ def create_invited_user(service_id):
 
     send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY)
 
+
+@service_invite.route("/service/<service_id>/invite", methods=["POST"])
+def create_invited_user(service_id):
+    request_json = request.get_json()
+    invited_user = invited_user_schema.load(request_json)
+    save_invited_user(invited_user)
+
+    _create_service_invite(invited_user, request_json.get("invite_link_host"))
+
     return jsonify(data=invited_user_schema.dump(invited_user)), 201
 
 
@@ -92,6 +96,34 @@ def update_invited_user(service_id, invited_user_id):
     return jsonify(data=invited_user_schema.dump(fetched)), 200
 
 
+@service_invite.route(
+    "/service/<service_id>/invite/<invited_user_id>/resend", methods=["POST"]
+)
+def resend_service_invite(service_id, invited_user_id):
+    """Resend an expired invite.
+
+    This resets the invited user's created date and status to make it a new invite, and
+    sends the new invite out to the user.
+
+    Note:
+        This ignores the POST data entirely.
+    """
+    fetched = get_invited_user_by_service_and_id(
+        service_id=service_id, invited_user_id=invited_user_id
+    )
+
+    fetched.created_at = datetime.utcnow()
+    fetched.status = INVITE_PENDING
+
+    current_data = {k: v for k, v in invited_user_schema.dump(fetched).items()}
+    update_dict = invited_user_schema.load(current_data)
+    save_invited_user(update_dict)
+
+    _create_service_invite(fetched, current_app.config["ADMIN_BASE_URL"])
+
+    return jsonify(data=invited_user_schema.dump(fetched)), 200
+
+
 def invited_user_url(invited_user_id, invite_link_host=None):
     token = generate_token(
         str(invited_user_id),

From 5277953761bccfcb62fcf59590d2e5f7bbfc5621 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Thu, 7 Dec 2023 16:26:25 -0500
Subject: [PATCH 04/13] Working on api test.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 tests/app/conftest.py                         | 21 ++++++++++++
 .../test_service_invite_rest.py               | 33 ++++++++++++-------
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index 13e0c0b09..249dcdcf8 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -556,6 +556,27 @@ def sample_invited_user(notify_db_session):
     return invited_user
 
 
+@pytest.fixture(scope="function")
+def sample_expired_user(notify_db_session):
+    service = create_service(check_if_service_exists=True)
+    to_email_address = "expired_user@digital.fake.gov"
+
+    from_user = service.users[0]
+
+    data = {
+        "service": service,
+        "email_address": to_email_address,
+        "from_user": from_user,
+        "permissions": "send_messages,manage_service,manage_api_keys",
+        "folder_permissions": ["folder_1_id", "folder_2_id"],
+        "created_at": datetime.utcnow() - timedelta(days=3),
+        "status": "expired",
+    }
+    expired_user = InvitedUser(**data)
+    save_invited_user(expired_user)
+    return expired_user
+
+
 @pytest.fixture(scope="function")
 def sample_invited_org_user(sample_user, sample_organization):
     return create_invited_org_user(sample_organization, sample_user)
diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py
index 595303bc8..80d32a3e4 100644
--- a/tests/app/service_invite/test_service_invite_rest.py
+++ b/tests/app/service_invite/test_service_invite_rest.py
@@ -141,7 +141,7 @@ def test_create_invited_user_invalid_email(client, sample_service, mocker, fake_
 def test_get_all_invited_users_by_service(client, notify_db_session, sample_service):
     invites = []
     for i in range(0, 5):
-        email = "invited_user_{}@service.gov.uk".format(i)
+        email = f"invited_user_{i}@service.gov.uk"
         invited_user = create_invited_user(sample_service, to_email_address=email)
         invites.append(invited_user)
 
@@ -202,11 +202,24 @@ def test_get_invited_user_by_service_when_user_does_not_belong_to_the_service(
     assert json_resp["result"] == "error"
 
 
+def test_resend_expired_invite(client, sample_expired_user):
+    url = f"/service/{sample_expired_user.service_id}/invite/{sample_expired_user.id}"
+    # TODO: Don't actually send email, need to mock it out.
+    auth_header = create_admin_authorization_header()
+    response = client.post(
+        url,
+        data=json.dumps(data),
+        headers=[("Content-Type", "application/json"), auth_header],
+    )
+
+    assert response.status_code == 200
+    json_resp = json.loads(response.get_data(as_text=True))["data"]
+    assert json_resp["status"] == "cancelled"
+
+
 def test_update_invited_user_set_status_to_cancelled(client, sample_invited_user):
     data = {"status": "cancelled"}
-    url = "/service/{0}/invite/{1}".format(
-        sample_invited_user.service_id, sample_invited_user.id
-    )
+    url = f"/service/{sample_invited_user.service_id}/invite/{sample_invited_user.id}"
     auth_header = create_admin_authorization_header()
     response = client.post(
         url,
@@ -223,7 +236,7 @@ def test_update_invited_user_for_wrong_service_returns_404(
     client, sample_invited_user, fake_uuid
 ):
     data = {"status": "cancelled"}
-    url = "/service/{0}/invite/{1}".format(fake_uuid, sample_invited_user.id)
+    url = f"/service/{fake_uuid}/invite/{sample_invited_user.id}"
     auth_header = create_admin_authorization_header()
     response = client.post(
         url,
@@ -237,9 +250,7 @@ def test_update_invited_user_for_wrong_service_returns_404(
 
 def test_update_invited_user_for_invalid_data_returns_400(client, sample_invited_user):
     data = {"status": "garbage"}
-    url = "/service/{0}/invite/{1}".format(
-        sample_invited_user.service_id, sample_invited_user.id
-    )
+    url = f"/service/{sample_invited_user.service_id}/invite/{sample_invited_user.id}"
     auth_header = create_admin_authorization_header()
     response = client.post(
         url,
@@ -291,7 +302,7 @@ def test_validate_invitation_token_for_expired_token_returns_400(client):
             current_app.config["SECRET_KEY"],
             current_app.config["DANGEROUS_SALT"],
         )
-    url = "/invite/service/{}".format(token)
+    url = f"/invite/service/{token}"
     auth_header = create_admin_authorization_header()
     response = client.get(
         url, headers=[("Content-Type", "application/json"), auth_header]
@@ -312,7 +323,7 @@ def test_validate_invitation_token_returns_400_when_invited_user_does_not_exist(
         current_app.config["SECRET_KEY"],
         current_app.config["DANGEROUS_SALT"],
     )
-    url = "/invite/service/{}".format(token)
+    url = f"/invite/service/{token}"
     auth_header = create_admin_authorization_header()
     response = client.get(
         url, headers=[("Content-Type", "application/json"), auth_header]
@@ -331,7 +342,7 @@ def test_validate_invitation_token_returns_400_when_token_is_malformed(client):
         current_app.config["DANGEROUS_SALT"],
     )[:-2]
 
-    url = "/invite/service/{}".format(token)
+    url = f"/invite/service/{token}"
     auth_header = create_admin_authorization_header()
     response = client.get(
         url, headers=[("Content-Type", "application/json"), auth_header]

From 1fdad3099ba91089f1b13e7d8d94538bf9ef8eee Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Fri, 8 Dec 2023 13:15:40 -0500
Subject: [PATCH 05/13] Working on tests.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/notifications/process_notifications.py     | 18 +++++-------------
 .../service_invite/test_service_invite_rest.py |  8 ++++++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/notifications/process_notifications.py b/app/notifications/process_notifications.py
index 08b8963a5..99272f6b0 100644
--- a/app/notifications/process_notifications.py
+++ b/app/notifications/process_notifications.py
@@ -87,9 +87,7 @@ def persist_notification(
     if not notification_id:
         notification_id = uuid.uuid4()
 
-    current_app.logger.info(
-        "Persisting notification with id {}".format(notification_id)
-    )
+    current_app.logger.info(f"Persisting notification with id {notification_id}")
 
     notification = Notification(
         id=notification_id,
@@ -124,9 +122,7 @@ def persist_notification(
         notification.phone_prefix = recipient_info.country_prefix
         notification.rate_multiplier = recipient_info.billable_units
     elif notification_type == EMAIL_TYPE:
-        current_app.logger.info(
-            "Persisting notification with type: {}".format(EMAIL_TYPE)
-        )
+        current_app.logger.info(f"Persisting notification with type: {EMAIL_TYPE}")
         notification.normalised_to = format_email_address(notification.to)
 
     # if simulated create a Notification model to return but do not persist the Notification to the dB
@@ -141,9 +137,7 @@ def persist_notification(
             )
 
         current_app.logger.info(
-            "{} {} created at {}".format(
-                notification_type, notification_id, notification_created_at
-            )
+            f"{notification_type} {notification_id} created at {notification_created_at}"
         )
     return notification
 
@@ -170,15 +164,13 @@ def send_notification_to_queue_detached(
         raise
 
     current_app.logger.debug(
-        "{} {} sent to the {} queue for delivery".format(
-            notification_type, notification_id, queue
-        )
+        f"{notification_type} {notification_id} sent to the {queue} queue for delivery"
     )
 
 
 def send_notification_to_queue(notification, queue=None):
     send_notification_to_queue_detached(
-        notification.key_type, notification.notification_type, notification.id, queue
+        notification.key_type, notification.notification_type, notification.id, queue,
     )
 
 
diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py
index 80d32a3e4..f13aa73ac 100644
--- a/tests/app/service_invite/test_service_invite_rest.py
+++ b/tests/app/service_invite/test_service_invite_rest.py
@@ -1,3 +1,4 @@
+from functools import partial
 import json
 import uuid
 
@@ -202,9 +203,12 @@ def test_get_invited_user_by_service_when_user_does_not_belong_to_the_service(
     assert json_resp["result"] == "error"
 
 
-def test_resend_expired_invite(client, sample_expired_user):
+def test_resend_expired_invite(client, sample_expired_user, mocker):
     url = f"/service/{sample_expired_user.service_id}/invite/{sample_expired_user.id}"
-    # TODO: Don't actually send email, need to mock it out.
+    mock_send = mocker.patch("app.service_invite.rest.send_notification_to_queue")
+    mock_persist = mocker.patch("app.service_invite.rest.persist_notification")
+    from app.notifications.process_notifications import persist_notification
+    mock_persist.side_effect = partial(persist_notification, simulated=True)
     auth_header = create_admin_authorization_header()
     response = client.post(
         url,

From 171326a6b0733ceb34b93fc5c629979bc9c6a599 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Fri, 8 Dec 2023 21:41:56 -0500
Subject: [PATCH 06/13] Maybe tests are working now.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 tests/app/service_invite/test_service_invite_rest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py
index f13aa73ac..fb07e8d78 100644
--- a/tests/app/service_invite/test_service_invite_rest.py
+++ b/tests/app/service_invite/test_service_invite_rest.py
@@ -218,7 +218,8 @@ def test_resend_expired_invite(client, sample_expired_user, mocker):
 
     assert response.status_code == 200
     json_resp = json.loads(response.get_data(as_text=True))["data"]
-    assert json_resp["status"] == "cancelled"
+    assert json_resp["status"] == "pending"
+    assert mock_send.called
 
 
 def test_update_invited_user_set_status_to_cancelled(client, sample_invited_user):

From 1157f5639de32427b8f0662b6680491aa88789d6 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Fri, 8 Dec 2023 21:43:52 -0500
Subject: [PATCH 07/13] black, isort, flake8

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/commands.py                                           | 8 ++++----
 app/notifications/process_notifications.py                | 5 ++++-
 app/service_invite/rest.py                                | 4 ++--
 gunicorn_config.py                                        | 6 +++---
 migrations/env.py                                         | 4 +++-
 migrations/versions/0001_restart_migrations.py            | 2 +-
 migrations/versions/0002_add_content_char_count.py        | 4 ++--
 migrations/versions/0003_add_service_history.py           | 2 +-
 migrations/versions/0004_notification_stats_date.py       | 2 +-
 migrations/versions/0005_add_provider_stats.py            | 2 +-
 migrations/versions/0006_api_keys_history.py              | 2 +-
 migrations/versions/0007_template_history.py              | 2 +-
 migrations/versions/0008_archive_template.py              | 2 +-
 migrations/versions/0009_created_by_for_jobs.py           | 2 +-
 migrations/versions/0010_events_table.py                  | 2 +-
 migrations/versions/0011_ad_provider_details.py           | 2 +-
 migrations/versions/0012_complete_provider_details.py     | 2 +-
 migrations/versions/0014_add_template_version.py          | 2 +-
 migrations/versions/0015_fix_template_data.py             | 2 +-
 migrations/versions/0016_reply_to_email.py                | 2 +-
 migrations/versions/0017_add_failure_types.py             | 4 ----
 migrations/versions/0018_remove_subject_uniqueness.py     | 2 +-
 migrations/versions/0019_add_job_row_number.py            | 2 +-
 migrations/versions/0020_template_history_fix.py          | 2 +-
 migrations/versions/0021_add_delivered_failed_counts.py   | 2 +-
 migrations/versions/0022_add_pending_status.py            | 2 +-
 migrations/versions/0023_add_research_mode.py             | 2 +-
 migrations/versions/0024_add_research_mode_defaults.py    | 2 +-
 migrations/versions/0025_notify_service_data.py           | 3 ++-
 migrations/versions/0026_rename_notify_service.py         | 2 +-
 migrations/versions/0028_fix_reg_template_history.py      | 2 +-
 migrations/versions/0029_fix_email_from.py                | 2 +-
 migrations/versions/0030_service_id_not_null.py           | 2 +-
 migrations/versions/0031_store_personalisation.py         | 2 +-
 migrations/versions/0032_notification_created_status.py   | 2 +-
 migrations/versions/0033_api_key_type.py                  | 2 +-
 migrations/versions/0034_pwd_changed_at_not_null.py       | 2 +-
 migrations/versions/0035_notification_type_.py            | 2 +-
 migrations/versions/0036_notif_key_type_not_null.py       | 2 +-
 migrations/versions/0037_service_sms_sender.py            | 2 +-
 migrations/versions/0039_fix_notifications.py             | 2 +-
 migrations/versions/0042_notification_history.py          | 2 +-
 migrations/versions/0043_notification_indexes.py          | 2 +-
 migrations/versions/0044_jobs_to_notification_hist.py     | 8 ++++----
 migrations/versions/0045_billable_units.py                | 4 ++--
 migrations/versions/0046_organisations_and_branding.py    | 2 +-
 migrations/versions/0048_job_scheduled_time.py            | 2 +-
 migrations/versions/0050_index_for_stats.py               | 2 +-
 migrations/versions/0052_drop_jobs_status.py              | 2 +-
 migrations/versions/0053_cancelled_job_status.py          | 2 +-
 migrations/versions/0054_perform_drop_status_column.py    | 2 +-
 migrations/versions/0055_service_whitelist.py             | 2 +-
 migrations/versions/0056_minor_updates.py                 | 2 +-
 migrations/versions/0058_add_letters_flag.py              | 2 +-
 migrations/versions/0060_add_letter_template_type.py      | 2 +-
 migrations/versions/0061_add_client_reference.py          | 2 +-
 migrations/versions/0062_provider_details_history.py      | 2 +-
 migrations/versions/0063_templates_process_type.py        | 2 +-
 migrations/versions/0064_update_template_process_type.py  | 2 +-
 migrations/versions/0065_users_current_session_id.py      | 2 +-
 migrations/versions/0067_service_contact_block.py         | 2 +-
 migrations/versions/0068_add_created_by_to_provider.py    | 2 +-
 migrations/versions/0069_add_dvla_job_status.py           | 2 +-
 migrations/versions/0070_fix_notify_user_email.py         | 2 +-
 migrations/versions/0071_add_job_error_state.py           | 2 +-
 migrations/versions/0072_add_dvla_orgs.py                 | 2 +-
 migrations/versions/0073_add_international_sms_flag.py    | 2 +-
 migrations/versions/0075_create_rates_table.py            | 2 +-
 migrations/versions/0076_add_intl_flag_to_provider.py     | 2 +-
 migrations/versions/0077_add_intl_notification.py         | 2 +-
 migrations/versions/0078_add_sent_notification_status.py  | 2 +-
 migrations/versions/0081_noti_status_as_enum.py           | 2 +-
 migrations/versions/0082_add_golive_template.py           | 5 ++---
 migrations/versions/0083_add_perm_types_and_svc_perm.py   | 2 +-
 migrations/versions/0084_add_job_stats.py                 | 2 +-
 migrations/versions/0085_update_incoming_to_inbound.py    | 2 +-
 migrations/versions/0086_add_norm_to_notification.py      | 2 +-
 migrations/versions/0087_scheduled_notifications.py       | 2 +-
 migrations/versions/0090_inbound_sms.py                   | 2 +-
 migrations/versions/0092_add_inbound_provider.py          | 2 +-
 migrations/versions/0094_job_stats_update.py              | 2 +-
 migrations/versions/0095_migrate_existing_svc_perms.py    | 2 +-
 migrations/versions/0096_update_job_stats.py              | 2 +-
 migrations/versions/0097_notnull_inbound_provider.py      | 2 +-
 migrations/versions/0098_service_inbound_api.py           | 2 +-
 migrations/versions/0099_tfl_dar.py                       | 2 +-
 migrations/versions/0100_notification_created_by.py       | 2 +-
 migrations/versions/0102_template_redacted.py             | 2 +-
 migrations/versions/0103_add_historical_redact.py         | 4 ++--
 migrations/versions/0105_opg_letter_org.py                | 4 ++--
 migrations/versions/0107_drop_template_stats.py           | 2 +-
 migrations/versions/0108_change_logo_not_nullable.py      | 2 +-
 migrations/versions/0109_rem_old_noti_status.py           | 2 +-
 migrations/versions/0110_monthly_billing.py               | 2 +-
 migrations/versions/0111_drop_old_service_flags.py        | 2 +-
 migrations/versions/0112_add_start_end_dates.py           | 3 ++-
 migrations/versions/0113_job_created_by_nullable.py       | 2 +-
 migrations/versions/0114_drop_monthly_billing_cols.py     | 2 +-
 migrations/versions/0115_add_inbound_numbers.py           | 2 +-
 migrations/versions/0117_international_sms_notify.py      | 2 +-
 migrations/versions/0118_service_sms_senders.py           | 2 +-
 migrations/versions/0119_add_email_reply_to.py            | 2 +-
 migrations/versions/0120_add_org_banner_branding.py       | 2 +-
 migrations/versions/0121_nullable_logos.py                | 3 +--
 migrations/versions/0122_add_service_letter_contact.py    | 2 +-
 migrations/versions/0123_add_noti_to_email_reply.py       | 2 +-
 migrations/versions/0124_add_free_sms_fragment_limit.py   | 3 +--
 migrations/versions/0125_add_organisation_type.py         | 3 +--
 migrations/versions/0126_add_annual_billing.py            | 2 +-
 migrations/versions/0127_remove_unique_constraint.py      | 2 +-
 migrations/versions/0128_noti_to_sms_sender.py            | 2 +-
 migrations/versions/0129_add_email_auth_permission_.py    | 1 -
 migrations/versions/0130_service_email_reply_to_row.py    | 1 -
 migrations/versions/0131_user_auth_types.py               | 3 +--
 migrations/versions/0132_add_sms_prefix_setting.py        | 2 +-
 migrations/versions/0133_set_services_sms_prefix.py       | 2 +-
 migrations/versions/0135_stats_template_usage.py          | 2 +-
 migrations/versions/0136_user_mobile_nullable.py          | 4 ++--
 migrations/versions/0138_sms_sender_nullable.py           | 2 +-
 migrations/versions/0139_migrate_sms_allowance_data.py    | 5 ++---
 migrations/versions/0140_sms_prefix_non_nullable.py       | 2 +-
 migrations/versions/0141_remove_unused.py                 | 2 +-
 migrations/versions/0143_remove_reply_to.py               | 3 +--
 migrations/versions/0144_template_service_letter.py       | 2 +-
 migrations/versions/0145_add_notification_reply_to.py     | 3 +--
 migrations/versions/0146_add_service_callback_api.py      | 2 +-
 migrations/versions/0147_drop_mapping_tables.py           | 2 +-
 migrations/versions/0149_add_crown_to_services.py         | 3 +--
 migrations/versions/0152_kill_service_free_fragments.py   | 2 +-
 migrations/versions/0156_set_temp_letter_contact.py       | 1 -
 migrations/versions/0157_add_rate_limit_to_service.py     | 3 +--
 migrations/versions/0158_remove_rate_limit_default.py     | 3 +--
 migrations/versions/0159_add_historical_redact.py         | 4 ++--
 migrations/versions/0161_email_branding.py                | 2 +-
 migrations/versions/0162_remove_org.py                    | 2 +-
 migrations/versions/0163_add_new_org_model.py             | 2 +-
 migrations/versions/0164_add_organisation_to_service.py   | 2 +-
 migrations/versions/0166_add_org_user_stuff.py            | 2 +-
 migrations/versions/0168_hidden_templates.py              | 3 +--
 migrations/versions/0169_hidden_templates_nullable.py     | 1 -
 migrations/versions/0170_hidden_non_nullable.py           | 1 -
 migrations/versions/0172_deprioritise_examples.py         | 4 ++--
 migrations/versions/0173_create_daily_sorted_letter.py    | 2 +-
 migrations/versions/0174_add_billing_facts.py             | 2 +-
 migrations/versions/0175_drop_job_statistics_table.py     | 2 +-
 migrations/versions/0176_alter_billing_columns.py         | 2 +-
 migrations/versions/0177_add_virus_scan_statuses.py       | 1 -
 migrations/versions/0178_add_filename.py                  | 3 +--
 migrations/versions/0179_billing_primary_const.py         | 2 +-
 migrations/versions/0181_billing_primary_key.py           | 2 +-
 migrations/versions/0183_alter_primary_key.py             | 2 +-
 migrations/versions/0184_alter_primary_key_1.py           | 2 +-
 migrations/versions/0185_add_is_active_to_reply_tos.py    | 3 +--
 migrations/versions/0186_rename_is_active_columns.py      | 3 +--
 migrations/versions/0188_add_ft_notification_status.py    | 2 +-
 migrations/versions/0189_ft_billing_data_type.py          | 2 +-
 migrations/versions/0192_drop_provider_statistics.py      | 2 +-
 migrations/versions/0193_add_ft_billing_timestamps.py     | 3 +--
 migrations/versions/0194_ft_billing_created_at.py         | 2 +-
 migrations/versions/0195_ft_notification_timestamps.py    | 3 +--
 migrations/versions/0196_complaints_table_.py             | 2 +-
 migrations/versions/0197_service_contact_link.py          | 3 +--
 migrations/versions/0204_service_data_retention.py        | 2 +-
 migrations/versions/0205_service_callback_type.py         | 3 +--
 migrations/versions/0206_assign_callback_type.py          | 3 +--
 migrations/versions/0207_set_callback_history_type.py     | 3 +--
 migrations/versions/0210_remove_monthly_billing.py        | 2 +-
 migrations/versions/0211_email_branding_update_.py        | 3 +--
 migrations/versions/0212_remove_caseworking.py            | 1 -
 migrations/versions/0213_brand_colour_domain_.py          | 2 +-
 migrations/versions/0215_email_brand_type.py              | 2 +-
 migrations/versions/0216_remove_colours.py                | 2 +-
 migrations/versions/0221_nullable_service_branding.py     | 1 -
 migrations/versions/0222_drop_service_branding.py         | 3 +--
 migrations/versions/0223_add_domain_constraint.py         | 1 -
 migrations/versions/0224_returned_letter_status.py        | 1 -
 migrations/versions/0226_service_postage.py               | 3 +--
 migrations/versions/0227_postage_constraints.py           | 2 +-
 migrations/versions/0228_notification_postage.py          | 3 +--
 migrations/versions/0230_noti_postage_constraint_1.py     | 1 -
 migrations/versions/0231_noti_postage_constraint_2.py     | 1 -
 migrations/versions/0232_noti_postage_constraint_3.py     | 1 -
 migrations/versions/0234_ft_billing_postage.py            | 3 +--
 migrations/versions/0235_add_postage_to_pk.py             | 3 +--
 migrations/versions/0237_add_filename_to_dvla_org.py      | 3 +--
 migrations/versions/0238_add_validation_failed.py         | 3 +--
 migrations/versions/0239_add_edit_folder_permission.py    | 3 +--
 migrations/versions/0240_dvla_org_non_nullable.py         | 3 +--
 migrations/versions/0242_template_folders.py              | 2 +-
 migrations/versions/0245_archived_flag_jobs.py            | 3 +--
 migrations/versions/0248_enable_choose_postage.py         | 3 +--
 migrations/versions/0250_drop_stats_template_table.py     | 2 +-
 migrations/versions/0252_letter_branding_table.py         | 2 +-
 migrations/versions/0253_set_template_postage_.py         | 3 +--
 migrations/versions/0254_folders_for_all.py               | 1 -
 migrations/versions/0256_set_postage_tmplt_hstr.py        | 3 +--
 migrations/versions/0258_service_postage_nullable.py      | 3 +--
 migrations/versions/0259_remove_service_postage.py        | 3 +--
 migrations/versions/0260_remove_dvla_organisation.py      | 3 +--
 migrations/versions/0261_service_volumes.py               | 4 ++--
 migrations/versions/0263_remove_edit_folders_2.py         | 3 +--
 migrations/versions/0264_add_folder_permissions_perm.py   | 1 -
 migrations/versions/0266_user_folder_perms_table.py       | 2 +-
 migrations/versions/0277_consent_to_research_null.py      | 2 +-
 migrations/versions/0278_add_more_stuff_to_orgs.py        | 2 +-
 migrations/versions/0280_invited_user_folder_perms.py     | 2 +-
 migrations/versions/0281_non_null_folder_permissions.py   | 2 +-
 migrations/versions/0282_add_count_as_live.py             | 2 +-
 migrations/versions/0283_platform_admin_not_live.py       | 3 +--
 migrations/versions/0284_0283_retry.py                    | 2 +-
 migrations/versions/0285_default_org_branding.py          | 2 +-
 migrations/versions/0286_add_unique_email_name.py         | 2 +-
 migrations/versions/0287_drop_branding_domains.py         | 2 +-
 migrations/versions/0288_add_go_live_user.py              | 2 +-
 migrations/versions/0290_org_go_live_notes.py             | 3 +--
 migrations/versions/0291_remove_unused_index.py           | 3 +--
 migrations/versions/0292_give_users_folder_perms.py       | 1 -
 migrations/versions/0293_drop_complaint_fk.py             | 1 -
 migrations/versions/0295_api_key_constraint.py            | 2 +-
 migrations/versions/0296_agreement_signed_by_person.py    | 2 +-
 migrations/versions/0297_template_redacted_fix.py         | 1 -
 migrations/versions/0299_org_types_table.py               | 3 +--
 migrations/versions/0300_migrate_org_types.py             | 3 +--
 migrations/versions/0301_upload_letters_permission.py     | 3 +--
 migrations/versions/0302_add_org_id_to_services.py        | 2 +-
 migrations/versions/0303_populate_services_org_id.py      | 2 +-
 migrations/versions/0304_remove_org_to_service.py         | 2 +-
 migrations/versions/0307_delete_dm_datetime.py            | 2 +-
 migrations/versions/0308_delete_loadtesting_provider.py   | 1 +
 migrations/versions/0310_returned_letters_table_.py       | 2 +-
 migrations/versions/0311_add_inbound_sms_history.py       | 2 +-
 migrations/versions/0313_email_access_validated_at.py     | 3 +--
 migrations/versions/0314_populate_email_access.py         | 1 -
 migrations/versions/0315_document_download_count.py       | 3 +--
 migrations/versions/0316_int_letters_permission.py        | 3 +--
 migrations/versions/0317_uploads_for_all.py               | 1 -
 migrations/versions/0318_service_contact_list.py          | 2 +-
 migrations/versions/0319_contact_list_archived.py         | 2 +-
 migrations/versions/0321_drop_postage_constraints.py      | 1 -
 migrations/versions/0322_broadcast_service_perm.py        | 1 -
 migrations/versions/0323_broadcast_message.py             | 4 ++--
 migrations/versions/0326_broadcast_event.py               | 2 +-
 migrations/versions/0327_idx_notification_history.py      | 1 +
 migrations/versions/0329_purge_broadcast_data.py          | 1 -
 migrations/versions/0331_add_broadcast_org.py             | 5 +++--
 migrations/versions/0332_broadcast_provider_msg.py        | 2 +-
 migrations/versions/0333_service_broadcast_provider.py    | 2 +-
 migrations/versions/0334_broadcast_message_number.py      | 2 +-
 migrations/versions/0335_broadcast_msg_content.py         | 2 +-
 migrations/versions/0336_broadcast_msg_content_2.py       | 2 +-
 migrations/versions/0337_broadcast_msg_api.py             | 2 +-
 migrations/versions/0338_add_notes_to_service.py          | 3 +--
 migrations/versions/0339_service_billing_details.py       | 3 +--
 migrations/versions/0340_stub_training_broadcasts.py      | 3 +--
 migrations/versions/0342_service_broadcast_settings.py    | 2 +-
 migrations/versions/0343_org_billing_details.py           | 3 +--
 migrations/versions/0344_stubbed_not_nullable.py          | 3 +--
 migrations/versions/0345_move_broadcast_provider.py       | 2 +-
 ...grate_broadcast_settings_migrate_broadcast_settings.py | 2 +-
 migrations/versions/0349_add_ft_processing_time.py        | 2 +-
 migrations/versions/0352_broadcast_provider_types.py      | 2 +-
 migrations/versions/0353_broadcast_provider_not_null.py   | 2 +-
 migrations/versions/0355_add_webauthn_table.py            | 2 +-
 migrations/versions/0359_more_permissions.py              | 2 +-
 migrations/versions/0362_broadcast_msg_event.py           | 2 +-
 migrations/versions/0363_cancelled_by_api_key.py          | 2 +-
 migrations/versions/0364_drop_old_column.py               | 2 +-
 migrations/versions/0373_add_notifications_view.py        | 2 +-
 migrations/versions/0374_fix_reg_template_history.py      | 2 +-
 migrations/versions/0376_add_provider_response.py         | 2 +-
 migrations/versions/0378_add_org_names.py                 | 2 +-
 migrations/versions/0379_remove_broadcasts.py             | 4 ++--
 migrations/versions/0380_bst_to_local.py                  | 2 +-
 migrations/versions/0381_encrypted_column_types.py        | 3 +--
 migrations/versions/0383_update_default_templates.py      | 5 +++--
 migrations/versions/0384_remove_letter_branding_.py       | 2 +-
 migrations/versions/0385_remove postage_.py               | 2 +-
 migrations/versions/0387_remove_letter_perms_.py          | 2 +-
 migrations/versions/0388_no_serv_letter_contact.py        | 2 +-
 migrations/versions/0389_no_more_letters.py               | 2 +-
 migrations/versions/0390_drop_dvla_provider.py            | 2 +-
 migrations/versions/0391_update_sms_numbers.py            | 2 +-
 migrations/versions/0392_drop_letter_permissions_.py      | 1 -
 migrations/versions/0393_remove_crown.py                  | 2 +-
 migrations/versions/0394_remove_contact_list_.py          | 2 +-
 migrations/versions/0395_remove_intl_letters_perm.py      | 2 +-
 migrations/versions/0396_rename_organisation.py           | 3 +--
 migrations/versions/0397_rename_organisation_2.py         | 2 +-
 migrations/versions/0398_agreements_table.py              | 2 +-
 migrations/versions/0399_remove_research_mode.py          | 2 +-
 migrations/versions/0400_add_total_message_limit.py       | 3 +--
 migrations/versions/0401_add_e2e_test_user.py             | 2 +-
 migrations/versions/0402_total_message_limit_default.py   | 3 +--
 migrations/versions/0403_add_carrier.py                   | 3 +--
 migrations/versions/0404_expire_invites.py                | 3 ++-
 migrations/versions/0405_add_preferred_timezone.py        | 3 +--
 migrations/versions/0406_adjust_agreement_model.py        | 2 +-
 migrations/versions/0407_fix_preferred_timezone.py        | 5 +++--
 migrations/versions/0408_fix_timezone_again.py            | 5 +++--
 run_celery.py                                             | 3 +--
 scripts/check_if_new_migration.py                         | 5 +++--
 tests/app/service_invite/test_service_invite_rest.py      | 3 ++-
 302 files changed, 317 insertions(+), 389 deletions(-)

diff --git a/app/commands.py b/app/commands.py
index a6734ad29..1883a8a57 100644
--- a/app/commands.py
+++ b/app/commands.py
@@ -117,16 +117,16 @@ def purge_functional_test_data(user_email_prefix):
         current_app.logger.error("Can only be run in development")
         return
 
-    users = User.query.filter(
-        User.email_address.like(f"{user_email_prefix}%")
-    ).all()
+    users = User.query.filter(User.email_address.like(f"{user_email_prefix}%")).all()
     for usr in users:
         # Make sure the full email includes a uuid in it
         # Just in case someone decides to use a similar email address.
         try:
             uuid.UUID(usr.email_address.split("@")[0].split("+")[1])
         except ValueError:
-            print(f"Skipping {usr.email_address} as the user email doesn't contain a UUID.")
+            print(
+                f"Skipping {usr.email_address} as the user email doesn't contain a UUID."
+            )
         else:
             services = dao_fetch_all_services_by_user(usr.id)
             if services:
diff --git a/app/notifications/process_notifications.py b/app/notifications/process_notifications.py
index 99272f6b0..0b46c8b7c 100644
--- a/app/notifications/process_notifications.py
+++ b/app/notifications/process_notifications.py
@@ -170,7 +170,10 @@ def send_notification_to_queue_detached(
 
 def send_notification_to_queue(notification, queue=None):
     send_notification_to_queue_detached(
-        notification.key_type, notification.notification_type, notification.id, queue,
+        notification.key_type,
+        notification.notification_type,
+        notification.id,
+        queue,
     )
 
 
diff --git a/app/service_invite/rest.py b/app/service_invite/rest.py
index e54fba3cd..dbc706ce1 100644
--- a/app/service_invite/rest.py
+++ b/app/service_invite/rest.py
@@ -1,7 +1,6 @@
+from datetime import datetime
 from re import I
 
-
-from datetime import datetime
 from flask import Blueprint, current_app, jsonify, request
 from itsdangerous import BadData, SignatureExpired
 from notifications_utils.url_safe_token import check_token, generate_token
@@ -27,6 +26,7 @@ service_invite = Blueprint("service_invite", __name__)
 
 register_errors(service_invite)
 
+
 def _create_service_invite(invited_user, invite_link_host):
     template_id = current_app.config["INVITATION_EMAIL_TEMPLATE_ID"]
 
diff --git a/gunicorn_config.py b/gunicorn_config.py
index da71c5fe2..e71cbe944 100644
--- a/gunicorn_config.py
+++ b/gunicorn_config.py
@@ -1,10 +1,10 @@
 import os
+import socket
 import sys
 import traceback
-import gunicorn
-import eventlet
-import socket
 
+import eventlet
+import gunicorn
 
 workers = 4
 worker_class = "eventlet"
diff --git a/migrations/env.py b/migrations/env.py
index 8ba18833f..6f3fec0f9 100644
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -1,7 +1,9 @@
 from __future__ import with_statement
+
+from logging.config import fileConfig
+
 from alembic import context
 from sqlalchemy import engine_from_config, pool
-from logging.config import fileConfig
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
diff --git a/migrations/versions/0001_restart_migrations.py b/migrations/versions/0001_restart_migrations.py
index d7cf75d64..266e82a0f 100644
--- a/migrations/versions/0001_restart_migrations.py
+++ b/migrations/versions/0001_restart_migrations.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-07 17:22:12.147542
 revision = "0001_restart_migrations"
 down_revision = None
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0002_add_content_char_count.py b/migrations/versions/0002_add_content_char_count.py
index 4dae72308..0854dd82a 100644
--- a/migrations/versions/0002_add_content_char_count.py
+++ b/migrations/versions/0002_add_content_char_count.py
@@ -10,9 +10,9 @@ Create Date: 2016-04-15 12:12:46.383782
 revision = "0002_add_content_char_count"
 down_revision = "0001_restart_migrations"
 
-from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.sql import table, column
+from alembic import op
+from sqlalchemy.sql import column, table
 
 
 def upgrade():
diff --git a/migrations/versions/0003_add_service_history.py b/migrations/versions/0003_add_service_history.py
index 981517fdc..4d48c517e 100644
--- a/migrations/versions/0003_add_service_history.py
+++ b/migrations/versions/0003_add_service_history.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-19 13:01:54.519821
 revision = "0003_add_service_history"
 down_revision = "0002_add_content_char_count"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0004_notification_stats_date.py b/migrations/versions/0004_notification_stats_date.py
index 9fc841b68..8c1368b11 100644
--- a/migrations/versions/0004_notification_stats_date.py
+++ b/migrations/versions/0004_notification_stats_date.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-20 13:59:01.132535
 revision = "0004_notification_stats_date"
 down_revision = "0003_add_service_history"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0005_add_provider_stats.py b/migrations/versions/0005_add_provider_stats.py
index 9d328ec09..e99360777 100644
--- a/migrations/versions/0005_add_provider_stats.py
+++ b/migrations/versions/0005_add_provider_stats.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-20 15:13:42.229197
 revision = "0005_add_provider_stats"
 down_revision = "0004_notification_stats_date"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0006_api_keys_history.py b/migrations/versions/0006_api_keys_history.py
index dadf3d73f..57647ae3e 100644
--- a/migrations/versions/0006_api_keys_history.py
+++ b/migrations/versions/0006_api_keys_history.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-20 17:21:38.541766
 revision = "0006_api_keys_history"
 down_revision = "0005_add_provider_stats"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0007_template_history.py b/migrations/versions/0007_template_history.py
index e85a5e608..c52c74102 100644
--- a/migrations/versions/0007_template_history.py
+++ b/migrations/versions/0007_template_history.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-22 09:51:55.615891
 revision = "0007_template_history"
 down_revision = "0006_api_keys_history"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0008_archive_template.py b/migrations/versions/0008_archive_template.py
index 836999bc7..c19a47d65 100644
--- a/migrations/versions/0008_archive_template.py
+++ b/migrations/versions/0008_archive_template.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-25 14:16:49.787229
 revision = "0008_archive_template"
 down_revision = "0007_template_history"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0009_created_by_for_jobs.py b/migrations/versions/0009_created_by_for_jobs.py
index 5aebfb099..622b22b63 100644
--- a/migrations/versions/0009_created_by_for_jobs.py
+++ b/migrations/versions/0009_created_by_for_jobs.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-26 14:54:56.852642
 revision = "0009_created_by_for_jobs"
 down_revision = "0008_archive_template"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0010_events_table.py b/migrations/versions/0010_events_table.py
index 1ec629ea6..fdb3a34c5 100644
--- a/migrations/versions/0010_events_table.py
+++ b/migrations/versions/0010_events_table.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-26 13:08:42.892813
 revision = "0010_events_table"
 down_revision = "0009_created_by_for_jobs"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0011_ad_provider_details.py b/migrations/versions/0011_ad_provider_details.py
index 9645e20e6..dfda65ce2 100644
--- a/migrations/versions/0011_ad_provider_details.py
+++ b/migrations/versions/0011_ad_provider_details.py
@@ -14,8 +14,8 @@ down_revision = "0010_events_table"
 
 import uuid
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0012_complete_provider_details.py b/migrations/versions/0012_complete_provider_details.py
index 41d617995..e9b4514ad 100644
--- a/migrations/versions/0012_complete_provider_details.py
+++ b/migrations/versions/0012_complete_provider_details.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-05 09:18:26.926275
 revision = "0012_complete_provider_details"
 down_revision = "0011_ad_provider_details"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.dialects.postgresql import ENUM
 
diff --git a/migrations/versions/0014_add_template_version.py b/migrations/versions/0014_add_template_version.py
index 4e4d0f814..8074187b8 100644
--- a/migrations/versions/0014_add_template_version.py
+++ b/migrations/versions/0014_add_template_version.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-11 16:00:51.478012
 revision = "0014_add_template_version"
 down_revision = "0012_complete_provider_details"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0015_fix_template_data.py b/migrations/versions/0015_fix_template_data.py
index 3052e1caa..3bf8cd332 100644
--- a/migrations/versions/0015_fix_template_data.py
+++ b/migrations/versions/0015_fix_template_data.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-16 13:55:27.179748
 revision = "0015_fix_template_data"
 down_revision = "0014_add_template_version"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0016_reply_to_email.py b/migrations/versions/0016_reply_to_email.py
index 990aa36bf..cada6e580 100644
--- a/migrations/versions/0016_reply_to_email.py
+++ b/migrations/versions/0016_reply_to_email.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-17 09:59:49.032865
 revision = "0016_reply_to_email"
 down_revision = "0015_fix_template_data"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0017_add_failure_types.py b/migrations/versions/0017_add_failure_types.py
index 2e5356a31..959ad4fbf 100644
--- a/migrations/versions/0017_add_failure_types.py
+++ b/migrations/versions/0017_add_failure_types.py
@@ -10,12 +10,8 @@ Create Date: 2016-05-17 11:23:36.881219
 revision = "0017_add_failure_types"
 down_revision = "0016_reply_to_email"
 
-from alembic import op
 import sqlalchemy as sa
-
-
 from alembic import op
-import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0018_remove_subject_uniqueness.py b/migrations/versions/0018_remove_subject_uniqueness.py
index 95fcf5f1b..30e4697c5 100644
--- a/migrations/versions/0018_remove_subject_uniqueness.py
+++ b/migrations/versions/0018_remove_subject_uniqueness.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-18 09:39:22.512042
 revision = "0018_remove_subject_uniqueness"
 down_revision = "0017_add_failure_types"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0019_add_job_row_number.py b/migrations/versions/0019_add_job_row_number.py
index 1860ae623..605f31067 100644
--- a/migrations/versions/0019_add_job_row_number.py
+++ b/migrations/versions/0019_add_job_row_number.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-18 15:04:24.513071
 revision = "0019_add_job_row_number"
 down_revision = "0018_remove_subject_uniqueness"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0020_template_history_fix.py b/migrations/versions/0020_template_history_fix.py
index 06df7cecb..d1ba73d6b 100644
--- a/migrations/versions/0020_template_history_fix.py
+++ b/migrations/versions/0020_template_history_fix.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-20 15:15:03.850862
 revision = "0020_template_history_fix"
 down_revision = "0019_add_job_row_number"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0021_add_delivered_failed_counts.py b/migrations/versions/0021_add_delivered_failed_counts.py
index 620e4e33a..62b69f13b 100644
--- a/migrations/versions/0021_add_delivered_failed_counts.py
+++ b/migrations/versions/0021_add_delivered_failed_counts.py
@@ -12,8 +12,8 @@ from sqlalchemy import text
 revision = "0021_add_delivered_failed_counts"
 down_revision = "0020_template_history_fix"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0022_add_pending_status.py b/migrations/versions/0022_add_pending_status.py
index 9a03adba9..944958326 100644
--- a/migrations/versions/0022_add_pending_status.py
+++ b/migrations/versions/0022_add_pending_status.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-25 15:47:32.568097
 revision = "0022_add_pending_status"
 down_revision = "0021_add_delivered_failed_counts"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0023_add_research_mode.py b/migrations/versions/0023_add_research_mode.py
index a7a085b74..ff2b0497f 100644
--- a/migrations/versions/0023_add_research_mode.py
+++ b/migrations/versions/0023_add_research_mode.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-31 11:11:45.979594
 revision = "0023_add_research_mode"
 down_revision = "0022_add_pending_status"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0024_add_research_mode_defaults.py b/migrations/versions/0024_add_research_mode_defaults.py
index ac45f2abb..26cc733b4 100644
--- a/migrations/versions/0024_add_research_mode_defaults.py
+++ b/migrations/versions/0024_add_research_mode_defaults.py
@@ -10,8 +10,8 @@ Create Date: 2016-05-31 11:11:45.979594
 revision = "0024_add_research_mode_defaults"
 down_revision = "0023_add_research_mode"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0025_notify_service_data.py b/migrations/versions/0025_notify_service_data.py
index c8eceb70c..a5cf99c24 100644
--- a/migrations/versions/0025_notify_service_data.py
+++ b/migrations/versions/0025_notify_service_data.py
@@ -6,6 +6,8 @@ Create Date: 2016-06-01 14:17:01.963181
 
 """
 
+import uuid
+
 # revision identifiers, used by Alembic.
 from datetime import datetime
 
@@ -13,7 +15,6 @@ from alembic import op
 from sqlalchemy import text
 
 from app.hashing import hashpw
-import uuid
 
 revision = "0025_notify_service_data"
 down_revision = "0024_add_research_mode_defaults"
diff --git a/migrations/versions/0026_rename_notify_service.py b/migrations/versions/0026_rename_notify_service.py
index 5d1c080ee..9cf2ed427 100644
--- a/migrations/versions/0026_rename_notify_service.py
+++ b/migrations/versions/0026_rename_notify_service.py
@@ -10,8 +10,8 @@ Create Date: 2016-06-07 09:51:07.343334
 revision = "0026_rename_notify_service"
 down_revision = "0025_notify_service_data"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0028_fix_reg_template_history.py b/migrations/versions/0028_fix_reg_template_history.py
index 602e3c113..8bf11fe59 100644
--- a/migrations/versions/0028_fix_reg_template_history.py
+++ b/migrations/versions/0028_fix_reg_template_history.py
@@ -14,8 +14,8 @@ from sqlalchemy import text
 revision = "0028_fix_reg_template_history"
 down_revision = "0026_rename_notify_service"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 service_id = "d6aa2c68-a2d9-4437-ab19-3ae8eb202553"
 user_id = "6af522d0-2915-4e52-83a3-3690455a5fe6"
diff --git a/migrations/versions/0029_fix_email_from.py b/migrations/versions/0029_fix_email_from.py
index 65a36c233..d4735de50 100644
--- a/migrations/versions/0029_fix_email_from.py
+++ b/migrations/versions/0029_fix_email_from.py
@@ -12,8 +12,8 @@ from sqlalchemy import text
 revision = "0029_fix_email_from"
 down_revision = "0028_fix_reg_template_history"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 service_id = "d6aa2c68-a2d9-4437-ab19-3ae8eb202553"
 
diff --git a/migrations/versions/0030_service_id_not_null.py b/migrations/versions/0030_service_id_not_null.py
index 367d17cd0..788b36281 100644
--- a/migrations/versions/0030_service_id_not_null.py
+++ b/migrations/versions/0030_service_id_not_null.py
@@ -13,8 +13,8 @@ from sqlalchemy.dialects import postgresql
 revision = "0030_service_id_not_null"
 down_revision = "0029_fix_email_from"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0031_store_personalisation.py b/migrations/versions/0031_store_personalisation.py
index c83b8225a..e46b992ce 100644
--- a/migrations/versions/0031_store_personalisation.py
+++ b/migrations/versions/0031_store_personalisation.py
@@ -10,8 +10,8 @@ Create Date: 2016-06-20 10:39:50.892847
 revision = "0031_store_personalisation"
 down_revision = "0030_service_id_not_null"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0032_notification_created_status.py b/migrations/versions/0032_notification_created_status.py
index f82179c4c..26c608426 100644
--- a/migrations/versions/0032_notification_created_status.py
+++ b/migrations/versions/0032_notification_created_status.py
@@ -10,8 +10,8 @@ Create Date: 2016-06-21 11:29:28.963615
 revision = "0032_notification_created_status"
 down_revision = "0031_store_personalisation"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0033_api_key_type.py b/migrations/versions/0033_api_key_type.py
index 5a6a16fa8..e52d04af0 100644
--- a/migrations/versions/0033_api_key_type.py
+++ b/migrations/versions/0033_api_key_type.py
@@ -10,8 +10,8 @@ Create Date: 2016-06-24 12:02:10.915817
 revision = "0033_api_key_type"
 down_revision = "0032_notification_created_status"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0034_pwd_changed_at_not_null.py b/migrations/versions/0034_pwd_changed_at_not_null.py
index 70f4caf31..c3a01d9bb 100644
--- a/migrations/versions/0034_pwd_changed_at_not_null.py
+++ b/migrations/versions/0034_pwd_changed_at_not_null.py
@@ -10,8 +10,8 @@ Create Date: 2016-06-28 10:37:25.389020
 revision = "0034_pwd_changed_at_not_null"
 down_revision = "0033_api_key_type"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0035_notification_type_.py b/migrations/versions/0035_notification_type_.py
index fd129f698..dcffe419c 100644
--- a/migrations/versions/0035_notification_type_.py
+++ b/migrations/versions/0035_notification_type_.py
@@ -10,8 +10,8 @@ Create Date: 2016-06-29 10:48:55.955317
 revision = "0035_notification_type"
 down_revision = "0034_pwd_changed_at_not_null"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0036_notif_key_type_not_null.py b/migrations/versions/0036_notif_key_type_not_null.py
index 75c688f7c..9c5ced60e 100644
--- a/migrations/versions/0036_notif_key_type_not_null.py
+++ b/migrations/versions/0036_notif_key_type_not_null.py
@@ -10,8 +10,8 @@ Create Date: 2016-07-01 16:01:16.892638
 revision = "0036_notif_key_type_not_null"
 down_revision = "0035_notification_type"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0037_service_sms_sender.py b/migrations/versions/0037_service_sms_sender.py
index 3971326c3..d50adcb81 100644
--- a/migrations/versions/0037_service_sms_sender.py
+++ b/migrations/versions/0037_service_sms_sender.py
@@ -10,8 +10,8 @@ Create Date: 2016-06-30 14:55:33.811696
 revision = "0037_service_sms_sender"
 down_revision = "0036_notif_key_type_not_null"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0039_fix_notifications.py b/migrations/versions/0039_fix_notifications.py
index 295666f1f..9f6bfa2f6 100644
--- a/migrations/versions/0039_fix_notifications.py
+++ b/migrations/versions/0039_fix_notifications.py
@@ -12,8 +12,8 @@ from sqlalchemy import text
 revision = "0039_fix_notifications"
 down_revision = "0038_test_api_key_type"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0042_notification_history.py b/migrations/versions/0042_notification_history.py
index 09cc3d8a9..346964477 100644
--- a/migrations/versions/0042_notification_history.py
+++ b/migrations/versions/0042_notification_history.py
@@ -10,8 +10,8 @@ Create Date: 2016-07-07 13:15:35.503107
 revision = "0042_notification_history"
 down_revision = "0039_fix_notifications"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0043_notification_indexes.py b/migrations/versions/0043_notification_indexes.py
index aa96a10c2..431574126 100644
--- a/migrations/versions/0043_notification_indexes.py
+++ b/migrations/versions/0043_notification_indexes.py
@@ -10,8 +10,8 @@ Create Date: 2016-08-01 10:37:41.198070
 revision = "0043_notification_indexes"
 down_revision = "0042_notification_history"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0044_jobs_to_notification_hist.py b/migrations/versions/0044_jobs_to_notification_hist.py
index 86d246849..e813833b4 100644
--- a/migrations/versions/0044_jobs_to_notification_hist.py
+++ b/migrations/versions/0044_jobs_to_notification_hist.py
@@ -10,13 +10,13 @@ Create Date: 2016-07-15 13:28:41.441009
 revision = "0044_jobs_to_notification_hist"
 down_revision = "0043_notification_indexes"
 
-from alembic import op
+import datetime
+import uuid
 
+from alembic import op
 from sqlalchemy.orm.session import Session
 
-import uuid
-import datetime
-from app.models import Job, Template, NotificationHistory
+from app.models import Job, NotificationHistory, Template
 
 
 def upgrade():
diff --git a/migrations/versions/0045_billable_units.py b/migrations/versions/0045_billable_units.py
index 1cede8009..41e7bc899 100644
--- a/migrations/versions/0045_billable_units.py
+++ b/migrations/versions/0045_billable_units.py
@@ -7,13 +7,13 @@ Create Date: 2016-08-02 16:36:42.455838
 """
 
 # revision identifiers, used by Alembic.
-from sqlalchemy import text, bindparam
+from sqlalchemy import bindparam, text
 
 revision = "0045_billable_units"
 down_revision = "0044_jobs_to_notification_hist"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.orm.session import Session
 
 from app.models import Service
diff --git a/migrations/versions/0046_organisations_and_branding.py b/migrations/versions/0046_organisations_and_branding.py
index 3a1092a97..c162d3256 100644
--- a/migrations/versions/0046_organisations_and_branding.py
+++ b/migrations/versions/0046_organisations_and_branding.py
@@ -10,8 +10,8 @@ Create Date: 2016-08-04 12:00:43.682610
 revision = "0046_organisations_and_branding"
 down_revision = "0045_billable_units"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0048_job_scheduled_time.py b/migrations/versions/0048_job_scheduled_time.py
index a8b1d349e..5900176b3 100644
--- a/migrations/versions/0048_job_scheduled_time.py
+++ b/migrations/versions/0048_job_scheduled_time.py
@@ -10,8 +10,8 @@ Create Date: 2016-08-24 13:21:51.744526
 revision = "0048_job_scheduled_time"
 down_revision = "0046_organisations_and_branding"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0050_index_for_stats.py b/migrations/versions/0050_index_for_stats.py
index 69a5e87c3..70514dc9e 100644
--- a/migrations/versions/0050_index_for_stats.py
+++ b/migrations/versions/0050_index_for_stats.py
@@ -10,8 +10,8 @@ Create Date: 2016-08-24 13:21:51.744526
 revision = "0050_index_for_stats"
 down_revision = "0048_job_scheduled_time"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0052_drop_jobs_status.py b/migrations/versions/0052_drop_jobs_status.py
index 9f7285e19..fdee67e93 100644
--- a/migrations/versions/0052_drop_jobs_status.py
+++ b/migrations/versions/0052_drop_jobs_status.py
@@ -10,8 +10,8 @@ Create Date: 2016-08-25 15:56:31.779399
 revision = "0052_drop_jobs_status"
 down_revision = "0051_set_job_status"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0053_cancelled_job_status.py b/migrations/versions/0053_cancelled_job_status.py
index 0485a6c22..05174565b 100644
--- a/migrations/versions/0053_cancelled_job_status.py
+++ b/migrations/versions/0053_cancelled_job_status.py
@@ -10,8 +10,8 @@ Create Date: 2016-09-01 14:34:06.839381
 revision = "0053_cancelled_job_status"
 down_revision = "0052_drop_jobs_status"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0054_perform_drop_status_column.py b/migrations/versions/0054_perform_drop_status_column.py
index 2af29292c..f4c3704e6 100644
--- a/migrations/versions/0054_perform_drop_status_column.py
+++ b/migrations/versions/0054_perform_drop_status_column.py
@@ -10,8 +10,8 @@ Create Date: 2016-08-25 15:56:31.779399
 revision = "0054_perform_drop_status_column"
 down_revision = "0053_cancelled_job_status"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0055_service_whitelist.py b/migrations/versions/0055_service_whitelist.py
index 977e48cdd..574acddde 100644
--- a/migrations/versions/0055_service_whitelist.py
+++ b/migrations/versions/0055_service_whitelist.py
@@ -10,8 +10,8 @@ Create Date: 2016-09-20 12:12:30.838095
 revision = "0055_service_whitelist"
 down_revision = "0054_perform_drop_status_column"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0056_minor_updates.py b/migrations/versions/0056_minor_updates.py
index 0184cd706..a66d12e2d 100644
--- a/migrations/versions/0056_minor_updates.py
+++ b/migrations/versions/0056_minor_updates.py
@@ -10,8 +10,8 @@ Create Date: 2016-10-04 09:43:42.321138
 revision = "0056_minor_updates"
 down_revision = "0055_service_whitelist"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0058_add_letters_flag.py b/migrations/versions/0058_add_letters_flag.py
index aa2492aef..b6afdfda7 100644
--- a/migrations/versions/0058_add_letters_flag.py
+++ b/migrations/versions/0058_add_letters_flag.py
@@ -10,8 +10,8 @@ Create Date: 2016-10-25 17:37:27.660723
 revision = "0058_add_letters_flag"
 down_revision = "0056_minor_updates"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0060_add_letter_template_type.py b/migrations/versions/0060_add_letter_template_type.py
index 256d97170..5ca554265 100644
--- a/migrations/versions/0060_add_letter_template_type.py
+++ b/migrations/versions/0060_add_letter_template_type.py
@@ -6,8 +6,8 @@ Create Date: 2016-11-07 16:13:18.961527
 
 """
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "0060_add_letter_template_type"
diff --git a/migrations/versions/0061_add_client_reference.py b/migrations/versions/0061_add_client_reference.py
index 847f165a7..e594bb7fb 100644
--- a/migrations/versions/0061_add_client_reference.py
+++ b/migrations/versions/0061_add_client_reference.py
@@ -10,8 +10,8 @@ Create Date: 2016-11-17 13:19:25.820617
 revision = "0061_add_client_reference"
 down_revision = "0060_add_letter_template_type"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0062_provider_details_history.py b/migrations/versions/0062_provider_details_history.py
index f6d31e87c..4ac6f77cf 100644
--- a/migrations/versions/0062_provider_details_history.py
+++ b/migrations/versions/0062_provider_details_history.py
@@ -13,8 +13,8 @@ Create Date: 2016-12-14 13:00:24.226990
 revision = "0062_provider_details_history"
 down_revision = "0061_add_client_reference"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0063_templates_process_type.py b/migrations/versions/0063_templates_process_type.py
index ad6692b92..679e6b0c5 100644
--- a/migrations/versions/0063_templates_process_type.py
+++ b/migrations/versions/0063_templates_process_type.py
@@ -10,8 +10,8 @@ Create Date: 2017-01-10 15:39:30.909308
 revision = "0063_templates_process_type"
 down_revision = "0062_provider_details_history"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0064_update_template_process_type.py b/migrations/versions/0064_update_template_process_type.py
index 64c64ef52..58689d532 100644
--- a/migrations/versions/0064_update_template_process_type.py
+++ b/migrations/versions/0064_update_template_process_type.py
@@ -10,8 +10,8 @@ Create Date: 2017-01-16 11:08:00.520678
 revision = "0064_update_template_process"
 down_revision = "0063_templates_process_type"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0065_users_current_session_id.py b/migrations/versions/0065_users_current_session_id.py
index e94f0cb38..9a85aabc0 100644
--- a/migrations/versions/0065_users_current_session_id.py
+++ b/migrations/versions/0065_users_current_session_id.py
@@ -10,8 +10,8 @@ Create Date: 2017-02-17 11:48:40.669235
 revision = "0065_users_current_session_id"
 down_revision = "0064_update_template_process"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0067_service_contact_block.py b/migrations/versions/0067_service_contact_block.py
index 7023dd995..51c147043 100644
--- a/migrations/versions/0067_service_contact_block.py
+++ b/migrations/versions/0067_service_contact_block.py
@@ -10,8 +10,8 @@ Create Date: 2017-02-28 11:23:40.299110
 revision = "0067_service_contact_block"
 down_revision = "0065_users_current_session_id"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0068_add_created_by_to_provider.py b/migrations/versions/0068_add_created_by_to_provider.py
index c0af8467f..396f6a1dd 100644
--- a/migrations/versions/0068_add_created_by_to_provider.py
+++ b/migrations/versions/0068_add_created_by_to_provider.py
@@ -10,8 +10,8 @@ Create Date: 2017-03-06 17:19:28.492005
 revision = "0068_add_created_by_to_provider"
 down_revision = "0067_service_contact_block"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0069_add_dvla_job_status.py b/migrations/versions/0069_add_dvla_job_status.py
index 7feba7e9c..f86ba72e9 100644
--- a/migrations/versions/0069_add_dvla_job_status.py
+++ b/migrations/versions/0069_add_dvla_job_status.py
@@ -10,8 +10,8 @@ Create Date: 2017-03-10 16:15:22.153948
 revision = "0069_add_dvla_job_status"
 down_revision = "0068_add_created_by_to_provider"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0070_fix_notify_user_email.py b/migrations/versions/0070_fix_notify_user_email.py
index 4f55893fd..f60925f3d 100644
--- a/migrations/versions/0070_fix_notify_user_email.py
+++ b/migrations/versions/0070_fix_notify_user_email.py
@@ -10,8 +10,8 @@ Create Date: 2017-03-10 16:15:22.153948
 revision = "0070_fix_notify_user_email"
 down_revision = "0069_add_dvla_job_status"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0071_add_job_error_state.py b/migrations/versions/0071_add_job_error_state.py
index 19d923d01..866c04a70 100644
--- a/migrations/versions/0071_add_job_error_state.py
+++ b/migrations/versions/0071_add_job_error_state.py
@@ -10,8 +10,8 @@ Create Date: 2017-03-10 16:15:22.153948
 revision = "0071_add_job_error_state"
 down_revision = "0070_fix_notify_user_email"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0072_add_dvla_orgs.py b/migrations/versions/0072_add_dvla_orgs.py
index 8c829d2ed..482e47260 100644
--- a/migrations/versions/0072_add_dvla_orgs.py
+++ b/migrations/versions/0072_add_dvla_orgs.py
@@ -10,8 +10,8 @@ Create Date: 2017-04-19 15:25:45.155886
 revision = "0072_add_dvla_orgs"
 down_revision = "0071_add_job_error_state"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0073_add_international_sms_flag.py b/migrations/versions/0073_add_international_sms_flag.py
index 371f4e573..404df3349 100644
--- a/migrations/versions/0073_add_international_sms_flag.py
+++ b/migrations/versions/0073_add_international_sms_flag.py
@@ -10,8 +10,8 @@ Create Date: 2017-10-25 17:37:27.660723
 revision = "0073_add_international_sms_flag"
 down_revision = "0072_add_dvla_orgs"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0075_create_rates_table.py b/migrations/versions/0075_create_rates_table.py
index 4ef36d9b2..f3b27a6e6 100644
--- a/migrations/versions/0075_create_rates_table.py
+++ b/migrations/versions/0075_create_rates_table.py
@@ -14,8 +14,8 @@ from sqlalchemy import text
 revision = "0075_create_rates_table"
 down_revision = "0073_add_international_sms_flag"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0076_add_intl_flag_to_provider.py b/migrations/versions/0076_add_intl_flag_to_provider.py
index 254bc9298..4853db420 100644
--- a/migrations/versions/0076_add_intl_flag_to_provider.py
+++ b/migrations/versions/0076_add_intl_flag_to_provider.py
@@ -10,8 +10,8 @@ Create Date: 2017-04-25 09:44:13.194164
 revision = "0076_add_intl_flag_to_provider"
 down_revision = "0075_create_rates_table"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0077_add_intl_notification.py b/migrations/versions/0077_add_intl_notification.py
index 05c29e96a..ce751414f 100644
--- a/migrations/versions/0077_add_intl_notification.py
+++ b/migrations/versions/0077_add_intl_notification.py
@@ -10,8 +10,8 @@ Create Date: 2017-04-25 11:34:43.229494
 revision = "0077_add_intl_notification"
 down_revision = "0076_add_intl_flag_to_provider"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0078_add_sent_notification_status.py b/migrations/versions/0078_add_sent_notification_status.py
index 4bbdd6e76..3dc088b3b 100644
--- a/migrations/versions/0078_add_sent_notification_status.py
+++ b/migrations/versions/0078_add_sent_notification_status.py
@@ -10,8 +10,8 @@ Create Date: 2017-04-24 16:55:20.731069
 revision = "0078_sent_notification_status"
 down_revision = "0077_add_intl_notification"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 enum_name = "notify_status_type"
 tmp_name = "tmp_" + enum_name
diff --git a/migrations/versions/0081_noti_status_as_enum.py b/migrations/versions/0081_noti_status_as_enum.py
index 42678efe3..968b3a0e2 100644
--- a/migrations/versions/0081_noti_status_as_enum.py
+++ b/migrations/versions/0081_noti_status_as_enum.py
@@ -10,8 +10,8 @@ Create Date: 2017-05-02 14:50:04.070874
 revision = "0081_noti_status_as_enum"
 down_revision = "0078_sent_notification_status"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0082_add_golive_template.py b/migrations/versions/0082_add_golive_template.py
index b8de36f81..55cdc3e04 100644
--- a/migrations/versions/0082_add_golive_template.py
+++ b/migrations/versions/0082_add_golive_template.py
@@ -9,10 +9,9 @@ Create Date: 2017-05-10 16:06:04.070874
 # revision identifiers, used by Alembic.
 from datetime import datetime
 
-from flask import current_app
-
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
+from flask import current_app
 from sqlalchemy import text
 
 revision = "0082_add_go_live_template"
diff --git a/migrations/versions/0083_add_perm_types_and_svc_perm.py b/migrations/versions/0083_add_perm_types_and_svc_perm.py
index af79a08bd..d75d59cd8 100644
--- a/migrations/versions/0083_add_perm_types_and_svc_perm.py
+++ b/migrations/versions/0083_add_perm_types_and_svc_perm.py
@@ -10,8 +10,8 @@ Create Date: 2017-05-12 11:29:32.664811
 revision = "0083_add_perm_types_and_svc_perm"
 down_revision = "0082_add_go_live_template"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0084_add_job_stats.py b/migrations/versions/0084_add_job_stats.py
index 8749bc23f..a7aaf5d4a 100644
--- a/migrations/versions/0084_add_job_stats.py
+++ b/migrations/versions/0084_add_job_stats.py
@@ -10,8 +10,8 @@ Create Date: 2017-05-12 13:16:14.147368
 revision = "0084_add_job_stats"
 down_revision = "0083_add_perm_types_and_svc_perm"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0085_update_incoming_to_inbound.py b/migrations/versions/0085_update_incoming_to_inbound.py
index 936b8255e..a86675e8e 100644
--- a/migrations/versions/0085_update_incoming_to_inbound.py
+++ b/migrations/versions/0085_update_incoming_to_inbound.py
@@ -10,8 +10,8 @@ Create Date: 2017-05-22 10:23:43.939050
 revision = "0085_update_incoming_to_inbound"
 down_revision = "0084_add_job_stats"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0086_add_norm_to_notification.py b/migrations/versions/0086_add_norm_to_notification.py
index c68f33f8c..9617688c7 100644
--- a/migrations/versions/0086_add_norm_to_notification.py
+++ b/migrations/versions/0086_add_norm_to_notification.py
@@ -6,8 +6,8 @@ Create Date: 2017-05-23 10:37:00.404087
 
 """
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0086_add_norm_to_notification"
 down_revision = "0085_update_incoming_to_inbound"
diff --git a/migrations/versions/0087_scheduled_notifications.py b/migrations/versions/0087_scheduled_notifications.py
index 7cc13857c..39f045928 100644
--- a/migrations/versions/0087_scheduled_notifications.py
+++ b/migrations/versions/0087_scheduled_notifications.py
@@ -5,8 +5,8 @@ Revises: 0086_add_norm_to_notification
 Create Date: 2017-05-15 12:50:20.041950
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0087_scheduled_notifications"
diff --git a/migrations/versions/0090_inbound_sms.py b/migrations/versions/0090_inbound_sms.py
index f610d1286..b97a770f5 100644
--- a/migrations/versions/0090_inbound_sms.py
+++ b/migrations/versions/0090_inbound_sms.py
@@ -10,8 +10,8 @@ Create Date: 2017-05-22 11:28:53.471004
 revision = "0090_inbound_sms"
 down_revision = "0089_govuk_sms_sender"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0092_add_inbound_provider.py b/migrations/versions/0092_add_inbound_provider.py
index 9945e4a0c..ccb1531c2 100644
--- a/migrations/versions/0092_add_inbound_provider.py
+++ b/migrations/versions/0092_add_inbound_provider.py
@@ -10,8 +10,8 @@ Create Date: 2017-06-02 16:07:35.445423
 revision = "0092_add_inbound_provider"
 down_revision = "0090_inbound_sms"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0094_job_stats_update.py b/migrations/versions/0094_job_stats_update.py
index 11e205f8d..8a8acd4bc 100644
--- a/migrations/versions/0094_job_stats_update.py
+++ b/migrations/versions/0094_job_stats_update.py
@@ -5,8 +5,8 @@ Revises: 0092_add_inbound_provider
 Create Date: 2017-06-06 14:37:30.051647
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "0094_job_stats_update"
diff --git a/migrations/versions/0095_migrate_existing_svc_perms.py b/migrations/versions/0095_migrate_existing_svc_perms.py
index ef6eb5881..5994e8c25 100644
--- a/migrations/versions/0095_migrate_existing_svc_perms.py
+++ b/migrations/versions/0095_migrate_existing_svc_perms.py
@@ -12,8 +12,8 @@ from sqlalchemy import text
 revision = "0095_migrate_existing_svc_perms"
 down_revision = "0094_job_stats_update"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 migration_date = "2017-05-26 17:30:00.000000"
 
diff --git a/migrations/versions/0096_update_job_stats.py b/migrations/versions/0096_update_job_stats.py
index 46394a272..d3becc8b8 100644
--- a/migrations/versions/0096_update_job_stats.py
+++ b/migrations/versions/0096_update_job_stats.py
@@ -10,8 +10,8 @@ Create Date: 2017-06-08 15:46:49.637642
 revision = "0096_update_job_stats"
 down_revision = "0095_migrate_existing_svc_perms"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0097_notnull_inbound_provider.py b/migrations/versions/0097_notnull_inbound_provider.py
index 6f6e730e6..435fec232 100644
--- a/migrations/versions/0097_notnull_inbound_provider.py
+++ b/migrations/versions/0097_notnull_inbound_provider.py
@@ -10,8 +10,8 @@ Create Date: 2017-06-02 16:50:11.698423
 revision = "0097_notnull_inbound_provider"
 down_revision = "0096_update_job_stats"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0098_service_inbound_api.py b/migrations/versions/0098_service_inbound_api.py
index 24cf212fc..201cb405b 100644
--- a/migrations/versions/0098_service_inbound_api.py
+++ b/migrations/versions/0098_service_inbound_api.py
@@ -5,8 +5,8 @@ Revises: 0097_notnull_inbound_provider
 Create Date: 2017-06-13 15:02:33.609656
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0098_service_inbound_api"
diff --git a/migrations/versions/0099_tfl_dar.py b/migrations/versions/0099_tfl_dar.py
index 07408b1a8..6343bd7a8 100644
--- a/migrations/versions/0099_tfl_dar.py
+++ b/migrations/versions/0099_tfl_dar.py
@@ -12,8 +12,8 @@ from sqlalchemy import text
 revision = "0099_tfl_dar"
 down_revision = "0098_service_inbound_api"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 TFL_DAR_ID = "1d70f564-919b-4c68-8bdf-b8520d92516e"
diff --git a/migrations/versions/0100_notification_created_by.py b/migrations/versions/0100_notification_created_by.py
index 473e7063f..4a3c364ee 100644
--- a/migrations/versions/0100_notification_created_by.py
+++ b/migrations/versions/0100_notification_created_by.py
@@ -10,8 +10,8 @@ Create Date: 2017-06-13 10:53:25.032202
 revision = "0100_notification_created_by"
 down_revision = "0099_tfl_dar"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0102_template_redacted.py b/migrations/versions/0102_template_redacted.py
index dea3c8478..85320cc82 100644
--- a/migrations/versions/0102_template_redacted.py
+++ b/migrations/versions/0102_template_redacted.py
@@ -10,8 +10,8 @@ Create Date: 2017-06-27 15:37:28.878359
 revision = "db6d9d9f06bc"
 down_revision = "0101_een_logo"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0103_add_historical_redact.py b/migrations/versions/0103_add_historical_redact.py
index 7d72330da..47e91ca2d 100644
--- a/migrations/versions/0103_add_historical_redact.py
+++ b/migrations/versions/0103_add_historical_redact.py
@@ -12,10 +12,10 @@ from sqlalchemy import text
 revision = "0103_add_historical_redact"
 down_revision = "db6d9d9f06bc"
 
-from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
+from alembic import op
 from flask import current_app
+from sqlalchemy.dialects import postgresql
 
 
 def upgrade():
diff --git a/migrations/versions/0105_opg_letter_org.py b/migrations/versions/0105_opg_letter_org.py
index e7abc9043..1b3a9f376 100644
--- a/migrations/versions/0105_opg_letter_org.py
+++ b/migrations/versions/0105_opg_letter_org.py
@@ -10,10 +10,10 @@ Create Date: 2017-06-29 12:44:16.815039
 revision = "0105_opg_letter_org"
 down_revision = "0103_add_historical_redact"
 
-from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
+from alembic import op
 from flask import current_app
+from sqlalchemy.dialects import postgresql
 
 
 def upgrade():
diff --git a/migrations/versions/0107_drop_template_stats.py b/migrations/versions/0107_drop_template_stats.py
index 8ed7b5d8d..8aeb6d866 100644
--- a/migrations/versions/0107_drop_template_stats.py
+++ b/migrations/versions/0107_drop_template_stats.py
@@ -10,8 +10,8 @@ Create Date: 2017-07-10 14:25:58.494636
 revision = "0107_drop_template_stats"
 down_revision = "0106_null_noti_status"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0108_change_logo_not_nullable.py b/migrations/versions/0108_change_logo_not_nullable.py
index f65a4737e..ad4e3a56e 100644
--- a/migrations/versions/0108_change_logo_not_nullable.py
+++ b/migrations/versions/0108_change_logo_not_nullable.py
@@ -10,8 +10,8 @@ Create Date: 2017-07-06 10:14:35.188404
 revision = "0108_change_logo_not_nullable"
 down_revision = "0107_drop_template_stats"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0109_rem_old_noti_status.py b/migrations/versions/0109_rem_old_noti_status.py
index 43f148548..ef29a4ec8 100644
--- a/migrations/versions/0109_rem_old_noti_status.py
+++ b/migrations/versions/0109_rem_old_noti_status.py
@@ -5,8 +5,8 @@ Revises: 0108_change_logo_not_nullable
 Create Date: 2017-07-10 14:25:15.712055
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0109_rem_old_noti_status"
diff --git a/migrations/versions/0110_monthly_billing.py b/migrations/versions/0110_monthly_billing.py
index 3a71cb0d0..e2f9380b1 100644
--- a/migrations/versions/0110_monthly_billing.py
+++ b/migrations/versions/0110_monthly_billing.py
@@ -10,8 +10,8 @@ Create Date: 2017-07-13 14:35:03.183659
 revision = "0110_monthly_billing"
 down_revision = "0109_rem_old_noti_status"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0111_drop_old_service_flags.py b/migrations/versions/0111_drop_old_service_flags.py
index 02ecc3af4..172b8ffb6 100644
--- a/migrations/versions/0111_drop_old_service_flags.py
+++ b/migrations/versions/0111_drop_old_service_flags.py
@@ -10,8 +10,8 @@ Create Date: 2017-07-12 13:35:45.636618
 revision = "0111_drop_old_service_flags"
 down_revision = "0110_monthly_billing"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0112_add_start_end_dates.py b/migrations/versions/0112_add_start_end_dates.py
index efeb3eeae..a26860b4a 100644
--- a/migrations/versions/0112_add_start_end_dates.py
+++ b/migrations/versions/0112_add_start_end_dates.py
@@ -6,8 +6,9 @@ Create Date: 2017-07-12 13:35:45.636618
 
 """
 from datetime import datetime
-from alembic import op
+
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy import text
 
 from app.dao.date_util import get_month_start_and_end_date_in_utc
diff --git a/migrations/versions/0113_job_created_by_nullable.py b/migrations/versions/0113_job_created_by_nullable.py
index be039dd20..8b5c75150 100644
--- a/migrations/versions/0113_job_created_by_nullable.py
+++ b/migrations/versions/0113_job_created_by_nullable.py
@@ -10,8 +10,8 @@ Create Date: 2017-07-27 11:12:34.938086
 revision = "0113_job_created_by_nullable"
 down_revision = "0112_add_start_end_dates"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0114_drop_monthly_billing_cols.py b/migrations/versions/0114_drop_monthly_billing_cols.py
index e5ff11924..cdc88d90c 100644
--- a/migrations/versions/0114_drop_monthly_billing_cols.py
+++ b/migrations/versions/0114_drop_monthly_billing_cols.py
@@ -5,8 +5,8 @@ Revises: 0113_job_created_by_nullable
 Create Date: 2017-07-27 13:36:37.304344
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0014_drop_monthly_billing_cols"
diff --git a/migrations/versions/0115_add_inbound_numbers.py b/migrations/versions/0115_add_inbound_numbers.py
index 2088cd702..1bc726d28 100644
--- a/migrations/versions/0115_add_inbound_numbers.py
+++ b/migrations/versions/0115_add_inbound_numbers.py
@@ -10,8 +10,8 @@ Create Date: 2017-08-10 17:30:01.507694
 revision = "0115_add_inbound_numbers"
 down_revision = "0014_drop_monthly_billing_cols"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0117_international_sms_notify.py b/migrations/versions/0117_international_sms_notify.py
index 3e28618ff..ebdbbddef 100644
--- a/migrations/versions/0117_international_sms_notify.py
+++ b/migrations/versions/0117_international_sms_notify.py
@@ -12,9 +12,9 @@ from sqlalchemy import text
 revision = "0117_international_sms_notify"
 down_revision = "0115_add_inbound_numbers"
 
-from alembic import op
 from datetime import datetime
 
+from alembic import op
 
 NOTIFY_SERVICE_ID = "d6aa2c68-a2d9-4437-ab19-3ae8eb202553"
 
diff --git a/migrations/versions/0118_service_sms_senders.py b/migrations/versions/0118_service_sms_senders.py
index 51d58a65b..6dbca2ef6 100644
--- a/migrations/versions/0118_service_sms_senders.py
+++ b/migrations/versions/0118_service_sms_senders.py
@@ -10,8 +10,8 @@ Create Date: 2017-09-05 17:29:38.921045
 revision = "0118_service_sms_senders"
 down_revision = "0117_international_sms_notify"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0119_add_email_reply_to.py b/migrations/versions/0119_add_email_reply_to.py
index fbf6ec2fc..d2c035875 100644
--- a/migrations/versions/0119_add_email_reply_to.py
+++ b/migrations/versions/0119_add_email_reply_to.py
@@ -5,8 +5,8 @@ Revises: 0118_service_sms_senders
 Create Date: 2017-09-07 15:29:49.087143
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0119_add_email_reply_to"
diff --git a/migrations/versions/0120_add_org_banner_branding.py b/migrations/versions/0120_add_org_banner_branding.py
index 189e9ecfc..b7db6ae96 100644
--- a/migrations/versions/0120_add_org_banner_branding.py
+++ b/migrations/versions/0120_add_org_banner_branding.py
@@ -5,8 +5,8 @@ Revises: 0119_add_email_reply_to
 Create Date: 2017-09-18 14:18:49.087143
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0120_add_org_banner_branding"
diff --git a/migrations/versions/0121_nullable_logos.py b/migrations/versions/0121_nullable_logos.py
index d6c983e1e..930c9fe79 100644
--- a/migrations/versions/0121_nullable_logos.py
+++ b/migrations/versions/0121_nullable_logos.py
@@ -5,9 +5,8 @@ Revises: 0120_add_org_banner_branding
 Create Date: 2017-09-20 11:00:20.415523
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0121_nullable_logos"
 down_revision = "0120_add_org_banner_branding"
diff --git a/migrations/versions/0122_add_service_letter_contact.py b/migrations/versions/0122_add_service_letter_contact.py
index 91bd507ce..f743fe0f5 100644
--- a/migrations/versions/0122_add_service_letter_contact.py
+++ b/migrations/versions/0122_add_service_letter_contact.py
@@ -5,8 +5,8 @@ Revises: 0121_nullable_logos
 Create Date: 2017-09-21 12:16:02.975120
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0122_add_service_letter_contact"
diff --git a/migrations/versions/0123_add_noti_to_email_reply.py b/migrations/versions/0123_add_noti_to_email_reply.py
index 8949cf8c2..c8728d6d9 100644
--- a/migrations/versions/0123_add_noti_to_email_reply.py
+++ b/migrations/versions/0123_add_noti_to_email_reply.py
@@ -5,8 +5,8 @@ Revises: 0122_add_service_letter_contact
 Create Date: 2017-09-27 09:42:39.412731
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0123_add_noti_to_email_reply"
diff --git a/migrations/versions/0124_add_free_sms_fragment_limit.py b/migrations/versions/0124_add_free_sms_fragment_limit.py
index 178635bed..67e8f18a6 100644
--- a/migrations/versions/0124_add_free_sms_fragment_limit.py
+++ b/migrations/versions/0124_add_free_sms_fragment_limit.py
@@ -5,9 +5,8 @@ Revises: 0123_add_noti_to_email_reply
 Create Date: 2017-10-10 11:30:16.225980
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0124_add_free_sms_fragment_limit"
 down_revision = "0123_add_noti_to_email_reply"
diff --git a/migrations/versions/0125_add_organisation_type.py b/migrations/versions/0125_add_organisation_type.py
index 53bb519fb..de9451a77 100644
--- a/migrations/versions/0125_add_organisation_type.py
+++ b/migrations/versions/0125_add_organisation_type.py
@@ -5,9 +5,8 @@ Revises: 0124_add_free_sms_fragment_limit
 Create Date: 2017-10-05 14:03:00.248005
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0125_add_organisation_type"
 down_revision = "0124_add_free_sms_fragment_limit"
diff --git a/migrations/versions/0126_add_annual_billing.py b/migrations/versions/0126_add_annual_billing.py
index b8324a852..a734981c0 100644
--- a/migrations/versions/0126_add_annual_billing.py
+++ b/migrations/versions/0126_add_annual_billing.py
@@ -5,8 +5,8 @@ Revises: 0125_add_organisation_type
 Create Date: 2017-10-19 11:38:32.849573
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0126_add_annual_billing"
diff --git a/migrations/versions/0127_remove_unique_constraint.py b/migrations/versions/0127_remove_unique_constraint.py
index 52e429c82..7da79cfae 100644
--- a/migrations/versions/0127_remove_unique_constraint.py
+++ b/migrations/versions/0127_remove_unique_constraint.py
@@ -5,8 +5,8 @@ Revises: 0126_add_annual_billing
 Create Date: 2017-10-17 16:47:37.826333
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0127_remove_unique_constraint"
 down_revision = "0126_add_annual_billing"
diff --git a/migrations/versions/0128_noti_to_sms_sender.py b/migrations/versions/0128_noti_to_sms_sender.py
index 5ce81c725..f191cde49 100644
--- a/migrations/versions/0128_noti_to_sms_sender.py
+++ b/migrations/versions/0128_noti_to_sms_sender.py
@@ -5,8 +5,8 @@ Revises: 0127_remove_unique_constraint
 Create Date: 2017-10-26 15:17:00.752706
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0128_noti_to_sms_sender"
diff --git a/migrations/versions/0129_add_email_auth_permission_.py b/migrations/versions/0129_add_email_auth_permission_.py
index 1f3387e18..927121d26 100644
--- a/migrations/versions/0129_add_email_auth_permission_.py
+++ b/migrations/versions/0129_add_email_auth_permission_.py
@@ -7,7 +7,6 @@ Create Date: 2017-10-26 14:33:41.336861
 """
 from alembic import op
 
-
 revision = "0129_add_email_auth_permission"
 down_revision = "0128_noti_to_sms_sender"
 
diff --git a/migrations/versions/0130_service_email_reply_to_row.py b/migrations/versions/0130_service_email_reply_to_row.py
index afa0fbc9f..f1e3720d1 100644
--- a/migrations/versions/0130_service_email_reply_to_row.py
+++ b/migrations/versions/0130_service_email_reply_to_row.py
@@ -14,7 +14,6 @@ down_revision = "0129_add_email_auth_permission"
 
 from alembic import op
 
-
 NOTIFY_SERVICE_ID = "d6aa2c68-a2d9-4437-ab19-3ae8eb202553"
 EMAIL_REPLY_TO_ID = "b3a58d57-2337-662a-4cba-40792a9322f2"
 
diff --git a/migrations/versions/0131_user_auth_types.py b/migrations/versions/0131_user_auth_types.py
index 861fa5569..d35eddaae 100644
--- a/migrations/versions/0131_user_auth_types.py
+++ b/migrations/versions/0131_user_auth_types.py
@@ -5,9 +5,8 @@ Revises: 0130_service_email_reply_to_row
 Create Date: 2017-10-27 16:19:51.458863
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0131_user_auth_types"
 down_revision = "0130_service_email_reply_to_row"
diff --git a/migrations/versions/0132_add_sms_prefix_setting.py b/migrations/versions/0132_add_sms_prefix_setting.py
index 09455db31..fb404ae9e 100644
--- a/migrations/versions/0132_add_sms_prefix_setting.py
+++ b/migrations/versions/0132_add_sms_prefix_setting.py
@@ -5,8 +5,8 @@ Revises: 0131_user_auth_types
 Create Date: 2017-11-03 11:07:40.537006
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0132_add_sms_prefix_setting"
diff --git a/migrations/versions/0133_set_services_sms_prefix.py b/migrations/versions/0133_set_services_sms_prefix.py
index a4aa64c69..752edf297 100644
--- a/migrations/versions/0133_set_services_sms_prefix.py
+++ b/migrations/versions/0133_set_services_sms_prefix.py
@@ -11,8 +11,8 @@ Revises: 0132_add_sms_prefix_setting
 Create Date: 2017-11-03 15:55:35.657488
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0133_set_services_sms_prefix"
diff --git a/migrations/versions/0135_stats_template_usage.py b/migrations/versions/0135_stats_template_usage.py
index 7145993ce..e628c9f6f 100644
--- a/migrations/versions/0135_stats_template_usage.py
+++ b/migrations/versions/0135_stats_template_usage.py
@@ -5,8 +5,8 @@ Revises: 0134_add_email_2fa_template
 Create Date: 2017-11-07 14:35:04.798561
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0135_stats_template_usage"
diff --git a/migrations/versions/0136_user_mobile_nullable.py b/migrations/versions/0136_user_mobile_nullable.py
index 77e4d2a99..94fc0c16f 100644
--- a/migrations/versions/0136_user_mobile_nullable.py
+++ b/migrations/versions/0136_user_mobile_nullable.py
@@ -5,10 +5,10 @@ Revises: 0135_stats_template_usage
 Create Date: 2017-11-08 11:49:05.773974
 
 """
-from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.sql import column
+from alembic import op
 from sqlalchemy.dialects import postgresql
+from sqlalchemy.sql import column
 
 revision = "0136_user_mobile_nullable"
 down_revision = "0135_stats_template_usage"
diff --git a/migrations/versions/0138_sms_sender_nullable.py b/migrations/versions/0138_sms_sender_nullable.py
index aae95c0ac..76bb50e32 100644
--- a/migrations/versions/0138_sms_sender_nullable.py
+++ b/migrations/versions/0138_sms_sender_nullable.py
@@ -5,8 +5,8 @@ Revises: 0137_notification_template_hist
 Create Date: 2017-11-06 15:44:59.471977
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0138_sms_sender_nullable"
diff --git a/migrations/versions/0139_migrate_sms_allowance_data.py b/migrations/versions/0139_migrate_sms_allowance_data.py
index 926dddb81..f7f45605e 100644
--- a/migrations/versions/0139_migrate_sms_allowance_data.py
+++ b/migrations/versions/0139_migrate_sms_allowance_data.py
@@ -5,15 +5,14 @@ Revises: 0138_sms_sender_nullable.py
 Create Date: 2017-11-10 21:42:59.715203
 
 """
-from datetime import datetime
-from alembic import op
 import uuid
+from datetime import datetime
 
+from alembic import op
 from sqlalchemy import text
 
 from app.dao.date_util import get_current_calendar_year_start_year
 
-
 revision = "0139_migrate_sms_allowance_data"
 down_revision = "0138_sms_sender_nullable"
 
diff --git a/migrations/versions/0140_sms_prefix_non_nullable.py b/migrations/versions/0140_sms_prefix_non_nullable.py
index 98d1cc3cb..8f66d3429 100644
--- a/migrations/versions/0140_sms_prefix_non_nullable.py
+++ b/migrations/versions/0140_sms_prefix_non_nullable.py
@@ -5,9 +5,9 @@ Revises: 0139_migrate_sms_allowance_data
 Create Date: 2017-11-07 13:04:04.077142
 
 """
+import sqlalchemy as sa
 from alembic import op
 from flask import current_app
-import sqlalchemy as sa
 from sqlalchemy import text
 from sqlalchemy.dialects import postgresql
 
diff --git a/migrations/versions/0141_remove_unused.py b/migrations/versions/0141_remove_unused.py
index 75086cf7a..a811e4c4d 100644
--- a/migrations/versions/0141_remove_unused.py
+++ b/migrations/versions/0141_remove_unused.py
@@ -5,8 +5,8 @@ Revises: 0140_sms_prefix_non_nullable
 Create Date: 2017-11-20 11:35:24.402021
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0141_remove_unused"
diff --git a/migrations/versions/0143_remove_reply_to.py b/migrations/versions/0143_remove_reply_to.py
index 0f087b095..ad8544601 100644
--- a/migrations/versions/0143_remove_reply_to.py
+++ b/migrations/versions/0143_remove_reply_to.py
@@ -5,9 +5,8 @@ Revises: 0142_validate_constraint
 Create Date: 2017-11-21 10:42:25.045444
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0143_remove_reply_to"
 down_revision = "0142_validate_constraint"
diff --git a/migrations/versions/0144_template_service_letter.py b/migrations/versions/0144_template_service_letter.py
index 7c158aa31..7fc5f546a 100644
--- a/migrations/versions/0144_template_service_letter.py
+++ b/migrations/versions/0144_template_service_letter.py
@@ -5,8 +5,8 @@ Revises: 0143_remove_reply_to
 Create Date: 2017-11-17 15:42:16.401229
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0144_template_service_letter"
diff --git a/migrations/versions/0145_add_notification_reply_to.py b/migrations/versions/0145_add_notification_reply_to.py
index 25cff51c1..ade8d5959 100644
--- a/migrations/versions/0145_add_notification_reply_to.py
+++ b/migrations/versions/0145_add_notification_reply_to.py
@@ -5,9 +5,8 @@ Revises: 0144_template_service_letter
 Create Date: 2017-11-22 14:23:48.806781
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0145_add_notification_reply_to"
 down_revision = "0144_template_service_letter"
diff --git a/migrations/versions/0146_add_service_callback_api.py b/migrations/versions/0146_add_service_callback_api.py
index c7dc4489c..8ad061353 100644
--- a/migrations/versions/0146_add_service_callback_api.py
+++ b/migrations/versions/0146_add_service_callback_api.py
@@ -5,8 +5,8 @@ Revises: 0145_add_notification_reply_to
 Create Date: 2017-11-28 15:13:48.730554
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0146_add_service_callback_api"
diff --git a/migrations/versions/0147_drop_mapping_tables.py b/migrations/versions/0147_drop_mapping_tables.py
index 9b018ddce..a77fbbe73 100644
--- a/migrations/versions/0147_drop_mapping_tables.py
+++ b/migrations/versions/0147_drop_mapping_tables.py
@@ -5,8 +5,8 @@ Revises: 0146_add_service_callback_api
 Create Date: 2017-11-30 15:48:44.588438
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0147_drop_mapping_tables"
diff --git a/migrations/versions/0149_add_crown_to_services.py b/migrations/versions/0149_add_crown_to_services.py
index f2779ee9e..106960472 100644
--- a/migrations/versions/0149_add_crown_to_services.py
+++ b/migrations/versions/0149_add_crown_to_services.py
@@ -5,9 +5,8 @@ Revises: 0148_add_letters_as_pdf_svc_perm
 Create Date: 2017-12-04 12:13:35.268712
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0149_add_crown_to_services"
 down_revision = "0148_add_letters_as_pdf_svc_perm"
diff --git a/migrations/versions/0152_kill_service_free_fragments.py b/migrations/versions/0152_kill_service_free_fragments.py
index 0cda884cf..518b3ab42 100644
--- a/migrations/versions/0152_kill_service_free_fragments.py
+++ b/migrations/versions/0152_kill_service_free_fragments.py
@@ -5,8 +5,8 @@ Revises: 0149_add_crown_to_services
 Create Date: 2017-12-01 16:49:51.178455
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0152_kill_service_free_fragments"
 down_revision = "0149_add_crown_to_services"
diff --git a/migrations/versions/0156_set_temp_letter_contact.py b/migrations/versions/0156_set_temp_letter_contact.py
index a0ae3fd65..3044ce6be 100644
--- a/migrations/versions/0156_set_temp_letter_contact.py
+++ b/migrations/versions/0156_set_temp_letter_contact.py
@@ -7,7 +7,6 @@ Create Date: 2018-01-05 17:04:20.596271
 """
 from alembic import op
 
-
 revision = "0156_set_temp_letter_contact"
 down_revision = "0152_kill_service_free_fragments"
 
diff --git a/migrations/versions/0157_add_rate_limit_to_service.py b/migrations/versions/0157_add_rate_limit_to_service.py
index 692a704f7..6a3aa7196 100644
--- a/migrations/versions/0157_add_rate_limit_to_service.py
+++ b/migrations/versions/0157_add_rate_limit_to_service.py
@@ -5,9 +5,8 @@ Revises: 0156_set_temp_letter_contact
 Create Date: 2018-01-08 16:13:25.733336
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0157_add_rate_limit_to_service"
 down_revision = "0156_set_temp_letter_contact"
diff --git a/migrations/versions/0158_remove_rate_limit_default.py b/migrations/versions/0158_remove_rate_limit_default.py
index fe569e117..6adeb529c 100644
--- a/migrations/versions/0158_remove_rate_limit_default.py
+++ b/migrations/versions/0158_remove_rate_limit_default.py
@@ -5,9 +5,8 @@ Revises: 0157_add_rate_limit_to_service
 Create Date: 2018-01-09 14:33:08.313893
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0158_remove_rate_limit_default"
 down_revision = "0157_add_rate_limit_to_service"
diff --git a/migrations/versions/0159_add_historical_redact.py b/migrations/versions/0159_add_historical_redact.py
index 8a66a36d2..e449b1eaf 100644
--- a/migrations/versions/0159_add_historical_redact.py
+++ b/migrations/versions/0159_add_historical_redact.py
@@ -12,10 +12,10 @@ from sqlalchemy import text
 revision = "0159_add_historical_redact"
 down_revision = "0158_remove_rate_limit_default"
 
-from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
+from alembic import op
 from flask import current_app
+from sqlalchemy.dialects import postgresql
 
 
 def upgrade():
diff --git a/migrations/versions/0161_email_branding.py b/migrations/versions/0161_email_branding.py
index 78d6ccf8e..41a04208e 100644
--- a/migrations/versions/0161_email_branding.py
+++ b/migrations/versions/0161_email_branding.py
@@ -5,8 +5,8 @@ Revises: 0159_add_historical_redact
 Create Date: 2018-01-30 15:35:12.016574
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0161_email_branding"
diff --git a/migrations/versions/0162_remove_org.py b/migrations/versions/0162_remove_org.py
index 6c75959aa..a4f5795a4 100644
--- a/migrations/versions/0162_remove_org.py
+++ b/migrations/versions/0162_remove_org.py
@@ -5,8 +5,8 @@ Revises: 0161_email_branding
 Create Date: 2018-02-06 17:08:11.879844
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0162_remove_org"
diff --git a/migrations/versions/0163_add_new_org_model.py b/migrations/versions/0163_add_new_org_model.py
index 14a3ea314..7b5cb50e7 100644
--- a/migrations/versions/0163_add_new_org_model.py
+++ b/migrations/versions/0163_add_new_org_model.py
@@ -5,8 +5,8 @@ Revises: 0162_remove_org
 Create Date: 2018-02-07 14:03:00.804849
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0163_add_new_org_model"
diff --git a/migrations/versions/0164_add_organisation_to_service.py b/migrations/versions/0164_add_organisation_to_service.py
index 6e55f8f06..156864a60 100644
--- a/migrations/versions/0164_add_organisation_to_service.py
+++ b/migrations/versions/0164_add_organisation_to_service.py
@@ -5,8 +5,8 @@ Revises: 0163_add_new_org_model
 Create Date: 2018-02-09 17:58:34.617206
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0164_add_organisation_to_service"
diff --git a/migrations/versions/0166_add_org_user_stuff.py b/migrations/versions/0166_add_org_user_stuff.py
index 395706612..4109dd7c7 100644
--- a/migrations/versions/0166_add_org_user_stuff.py
+++ b/migrations/versions/0166_add_org_user_stuff.py
@@ -5,8 +5,8 @@ Revises: 0164_add_organisation_to_service
 Create Date: 2018-02-14 17:25:11.747996
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0166_add_org_user_stuff"
diff --git a/migrations/versions/0168_hidden_templates.py b/migrations/versions/0168_hidden_templates.py
index bbf5063e2..0c3efb1eb 100644
--- a/migrations/versions/0168_hidden_templates.py
+++ b/migrations/versions/0168_hidden_templates.py
@@ -5,9 +5,8 @@ Revises: 0167_add_precomp_letter_svc_perm
 Create Date: 2018-02-21 14:05:04.448977
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0168_hidden_templates"
 down_revision = "0167_add_precomp_letter_svc_perm"
diff --git a/migrations/versions/0169_hidden_templates_nullable.py b/migrations/versions/0169_hidden_templates_nullable.py
index 9ffc6d72f..76bde31c6 100644
--- a/migrations/versions/0169_hidden_templates_nullable.py
+++ b/migrations/versions/0169_hidden_templates_nullable.py
@@ -7,7 +7,6 @@ Create Date: 2018-02-21 14:05:04.448977
 """
 from alembic import op
 
-
 revision = "0169_hidden_templates_nullable"
 down_revision = "0168_hidden_templates"
 
diff --git a/migrations/versions/0170_hidden_non_nullable.py b/migrations/versions/0170_hidden_non_nullable.py
index 2bae3dd68..8101bf703 100644
--- a/migrations/versions/0170_hidden_non_nullable.py
+++ b/migrations/versions/0170_hidden_non_nullable.py
@@ -7,7 +7,6 @@ Create Date: 2018-02-21 14:05:04.448977
 """
 from alembic import op
 
-
 revision = "0170_hidden_non_nullable"
 down_revision = "0169_hidden_templates_nullable"
 
diff --git a/migrations/versions/0172_deprioritise_examples.py b/migrations/versions/0172_deprioritise_examples.py
index 5620c5fb0..f5c3f291d 100644
--- a/migrations/versions/0172_deprioritise_examples.py
+++ b/migrations/versions/0172_deprioritise_examples.py
@@ -5,10 +5,10 @@ Revises: 0171_add_org_invite_template
 Create Date: 2018-02-28 17:09:56.619803
 
 """
-from alembic import op
-from app.models import NORMAL
 import sqlalchemy as sa
+from alembic import op
 
+from app.models import NORMAL
 
 revision = "0172_deprioritise_examples"
 down_revision = "0171_add_org_invite_template"
diff --git a/migrations/versions/0173_create_daily_sorted_letter.py b/migrations/versions/0173_create_daily_sorted_letter.py
index 0fb3686f7..7e6c1b336 100644
--- a/migrations/versions/0173_create_daily_sorted_letter.py
+++ b/migrations/versions/0173_create_daily_sorted_letter.py
@@ -5,8 +5,8 @@ Revises: 0172_deprioritise_examples
 Create Date: 2018-03-01 11:53:32.964256
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0173_create_daily_sorted_letter"
diff --git a/migrations/versions/0174_add_billing_facts.py b/migrations/versions/0174_add_billing_facts.py
index 74b7b5a90..5cf66f7f9 100644
--- a/migrations/versions/0174_add_billing_facts.py
+++ b/migrations/versions/0174_add_billing_facts.py
@@ -5,8 +5,8 @@ Revises: 0173_create_daily_sorted_letter
 Create Date: 2018-03-07 12:21:53.098887
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0174_add_billing_facts"
diff --git a/migrations/versions/0175_drop_job_statistics_table.py b/migrations/versions/0175_drop_job_statistics_table.py
index 287a24506..2d309a3c1 100644
--- a/migrations/versions/0175_drop_job_statistics_table.py
+++ b/migrations/versions/0175_drop_job_statistics_table.py
@@ -5,8 +5,8 @@ Revises: 0174_add_billing_facts
 Create Date: 2018-03-12 10:27:09.050837
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0175_drop_job_statistics_table"
diff --git a/migrations/versions/0176_alter_billing_columns.py b/migrations/versions/0176_alter_billing_columns.py
index 731facb48..c5a5aa942 100644
--- a/migrations/versions/0176_alter_billing_columns.py
+++ b/migrations/versions/0176_alter_billing_columns.py
@@ -5,8 +5,8 @@ Revises: 0175_drop_job_statistics_table
 Create Date: 2018-03-12 16:54:30.663897
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0176_alter_billing_columns"
 down_revision = "0175_drop_job_statistics_table"
diff --git a/migrations/versions/0177_add_virus_scan_statuses.py b/migrations/versions/0177_add_virus_scan_statuses.py
index 2ba512c88..67aac5296 100644
--- a/migrations/versions/0177_add_virus_scan_statuses.py
+++ b/migrations/versions/0177_add_virus_scan_statuses.py
@@ -7,7 +7,6 @@ Create Date: 2018-02-21 14:05:04.448977
 """
 from alembic import op
 
-
 revision = "0177_add_virus_scan_statuses"
 down_revision = "0176_alter_billing_columns"
 
diff --git a/migrations/versions/0178_add_filename.py b/migrations/versions/0178_add_filename.py
index ed4e9bcc3..571f7cc39 100644
--- a/migrations/versions/0178_add_filename.py
+++ b/migrations/versions/0178_add_filename.py
@@ -5,9 +5,8 @@ Revises: 0177_add_virus_scan_statuses
 Create Date: 2018-03-14 16:15:01.886998
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0178_add_filename"
 down_revision = "0177_add_virus_scan_statuses"
diff --git a/migrations/versions/0179_billing_primary_const.py b/migrations/versions/0179_billing_primary_const.py
index c812938dc..36e741a2c 100644
--- a/migrations/versions/0179_billing_primary_const.py
+++ b/migrations/versions/0179_billing_primary_const.py
@@ -5,8 +5,8 @@ Revises: 0178_add_filename
 Create Date: 2018-03-13 14:52:40.413474
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0179_billing_primary_const"
diff --git a/migrations/versions/0181_billing_primary_key.py b/migrations/versions/0181_billing_primary_key.py
index 697f4ad3f..4c7dda841 100644
--- a/migrations/versions/0181_billing_primary_key.py
+++ b/migrations/versions/0181_billing_primary_key.py
@@ -5,8 +5,8 @@ Revises: 0179_billing_primary_const
 Create Date: 2018-03-21 13:41:26.203712
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0181_billing_primary_key"
diff --git a/migrations/versions/0183_alter_primary_key.py b/migrations/versions/0183_alter_primary_key.py
index ea7072f78..ba9d172da 100644
--- a/migrations/versions/0183_alter_primary_key.py
+++ b/migrations/versions/0183_alter_primary_key.py
@@ -5,8 +5,8 @@ Revises: 0182_add_upload_document_perm
 Create Date: 2018-03-25 21:23:32.403212
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0183_alter_primary_key"
diff --git a/migrations/versions/0184_alter_primary_key_1.py b/migrations/versions/0184_alter_primary_key_1.py
index d2eab2e37..531cff747 100644
--- a/migrations/versions/0184_alter_primary_key_1.py
+++ b/migrations/versions/0184_alter_primary_key_1.py
@@ -5,8 +5,8 @@ Revises: 0183_alter_primary_key
 Create Date: 2018-03-28 16:05:54.648645
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0184_alter_primary_key_1"
diff --git a/migrations/versions/0185_add_is_active_to_reply_tos.py b/migrations/versions/0185_add_is_active_to_reply_tos.py
index 0c0cc7a79..d1f046d3d 100644
--- a/migrations/versions/0185_add_is_active_to_reply_tos.py
+++ b/migrations/versions/0185_add_is_active_to_reply_tos.py
@@ -5,9 +5,8 @@ Revises: 0184_alter_primary_key_1
 Create Date: 2018-04-10 16:35:41.824981
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0185_add_is_active_to_reply_tos"
 down_revision = "0184_alter_primary_key_1"
diff --git a/migrations/versions/0186_rename_is_active_columns.py b/migrations/versions/0186_rename_is_active_columns.py
index 70d96ef6a..7c33544b0 100644
--- a/migrations/versions/0186_rename_is_active_columns.py
+++ b/migrations/versions/0186_rename_is_active_columns.py
@@ -5,9 +5,8 @@ Revises: 0185_add_is_active_to_reply_tos
 Create Date: 2018-04-27 16:35:41.824981
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0186_rename_is_active_columns"
 down_revision = "0185_add_is_active_to_reply_tos"
diff --git a/migrations/versions/0188_add_ft_notification_status.py b/migrations/versions/0188_add_ft_notification_status.py
index a7978a01f..04f58cc71 100644
--- a/migrations/versions/0188_add_ft_notification_status.py
+++ b/migrations/versions/0188_add_ft_notification_status.py
@@ -5,8 +5,8 @@ Revises: 0186_rename_is_active_columns
 Create Date: 2018-05-03 10:10:41.824981
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0188_add_ft_notification_status"
diff --git a/migrations/versions/0189_ft_billing_data_type.py b/migrations/versions/0189_ft_billing_data_type.py
index dace98a72..e374d1991 100644
--- a/migrations/versions/0189_ft_billing_data_type.py
+++ b/migrations/versions/0189_ft_billing_data_type.py
@@ -5,8 +5,8 @@ Revises: 0188_add_ft_notification_status
 Create Date: 2018-05-10 14:57:52.589773
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0189_ft_billing_data_type"
 down_revision = "0188_add_ft_notification_status"
diff --git a/migrations/versions/0192_drop_provider_statistics.py b/migrations/versions/0192_drop_provider_statistics.py
index 8cb018e67..513d2be18 100644
--- a/migrations/versions/0192_drop_provider_statistics.py
+++ b/migrations/versions/0192_drop_provider_statistics.py
@@ -5,8 +5,8 @@ Revises: 0191_ft_billing_pkey
 Create Date: 2018-05-21 15:18:43.871256
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0192_drop_provider_statistics"
diff --git a/migrations/versions/0193_add_ft_billing_timestamps.py b/migrations/versions/0193_add_ft_billing_timestamps.py
index 48a7e4ccc..c688ed089 100644
--- a/migrations/versions/0193_add_ft_billing_timestamps.py
+++ b/migrations/versions/0193_add_ft_billing_timestamps.py
@@ -5,9 +5,8 @@ Revises: 0192_drop_provider_statistics
 Create Date: 2018-05-22 10:23:21.937262
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0193_add_ft_billing_timestamps"
 down_revision = "0192_drop_provider_statistics"
diff --git a/migrations/versions/0194_ft_billing_created_at.py b/migrations/versions/0194_ft_billing_created_at.py
index 52b251395..8bc4d007f 100644
--- a/migrations/versions/0194_ft_billing_created_at.py
+++ b/migrations/versions/0194_ft_billing_created_at.py
@@ -5,8 +5,8 @@ Revises: 0193_add_ft_billing_timestamps
 Create Date: 2018-05-22 14:34:27.852096
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0194_ft_billing_created_at"
diff --git a/migrations/versions/0195_ft_notification_timestamps.py b/migrations/versions/0195_ft_notification_timestamps.py
index 2c35d8c5e..fd8dbf3d2 100644
--- a/migrations/versions/0195_ft_notification_timestamps.py
+++ b/migrations/versions/0195_ft_notification_timestamps.py
@@ -5,9 +5,8 @@ Revises: 0194_ft_billing_created_at
 Create Date: 2018-05-22 16:01:53.269137
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0195_ft_notification_timestamps"
 down_revision = "0194_ft_billing_created_at"
diff --git a/migrations/versions/0196_complaints_table_.py b/migrations/versions/0196_complaints_table_.py
index df6095d80..a52cf938c 100644
--- a/migrations/versions/0196_complaints_table_.py
+++ b/migrations/versions/0196_complaints_table_.py
@@ -5,8 +5,8 @@ Revises: 0195_ft_notification_timestamps
 Create Date: 2018-05-31 14:31:36.649544
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0196_complaints_table"
diff --git a/migrations/versions/0197_service_contact_link.py b/migrations/versions/0197_service_contact_link.py
index 076153933..fd7dbeb32 100644
--- a/migrations/versions/0197_service_contact_link.py
+++ b/migrations/versions/0197_service_contact_link.py
@@ -5,9 +5,8 @@ Revises: 0196_complaints_table
 Create Date: 2018-05-31 15:01:32.977620
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0197_service_contact_link"
 down_revision = "0196_complaints_table"
diff --git a/migrations/versions/0204_service_data_retention.py b/migrations/versions/0204_service_data_retention.py
index 7afc59d69..8eb3b220f 100644
--- a/migrations/versions/0204_service_data_retention.py
+++ b/migrations/versions/0204_service_data_retention.py
@@ -5,8 +5,8 @@ Revises: 0203_fix_old_incomplete_jobs
 Create Date: 2018-07-10 11:22:01.761829
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0204_service_data_retention"
diff --git a/migrations/versions/0205_service_callback_type.py b/migrations/versions/0205_service_callback_type.py
index b2dcebce0..624d70c1e 100644
--- a/migrations/versions/0205_service_callback_type.py
+++ b/migrations/versions/0205_service_callback_type.py
@@ -5,9 +5,8 @@ Revises: 0204_service_data_retention
 Create Date: 2018-07-17 15:51:10.776698
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0205_service_callback_type"
 down_revision = "0204_service_data_retention"
diff --git a/migrations/versions/0206_assign_callback_type.py b/migrations/versions/0206_assign_callback_type.py
index bb77e609a..20b15ac44 100644
--- a/migrations/versions/0206_assign_callback_type.py
+++ b/migrations/versions/0206_assign_callback_type.py
@@ -5,9 +5,8 @@ Revises: 0205_service_callback_type
 Create Date: 2018-07-18 10:43:43.864835
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0206_assign_callback_type"
 down_revision = "0205_service_callback_type"
diff --git a/migrations/versions/0207_set_callback_history_type.py b/migrations/versions/0207_set_callback_history_type.py
index 49c2a4fca..1aab1ce27 100644
--- a/migrations/versions/0207_set_callback_history_type.py
+++ b/migrations/versions/0207_set_callback_history_type.py
@@ -5,9 +5,8 @@ Revises: 0206_assign_callback_type
 Create Date: 2018-07-18 10:43:43.864835
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0207_set_callback_history_type"
 down_revision = "0206_assign_callback_type"
diff --git a/migrations/versions/0210_remove_monthly_billing.py b/migrations/versions/0210_remove_monthly_billing.py
index d8a5dc7ae..3dfb7a7ef 100644
--- a/migrations/versions/0210_remove_monthly_billing.py
+++ b/migrations/versions/0210_remove_monthly_billing.py
@@ -5,8 +5,8 @@ Revises: 0209_add_cancelled_status
 Create Date: 2018-07-31 16:43:00.568972
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0210_remove_monthly_billing"
diff --git a/migrations/versions/0211_email_branding_update_.py b/migrations/versions/0211_email_branding_update_.py
index 901f833b0..dedc2dfad 100644
--- a/migrations/versions/0211_email_branding_update_.py
+++ b/migrations/versions/0211_email_branding_update_.py
@@ -5,9 +5,8 @@ Revises: 0210_remove_monthly_billing
 Create Date: 2018-07-31 18:00:20.457755
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0211_email_branding_update"
 down_revision = "0210_remove_monthly_billing"
diff --git a/migrations/versions/0212_remove_caseworking.py b/migrations/versions/0212_remove_caseworking.py
index c64bb078b..89f382188 100644
--- a/migrations/versions/0212_remove_caseworking.py
+++ b/migrations/versions/0212_remove_caseworking.py
@@ -7,7 +7,6 @@ Create Date: 2018-07-31 18:00:20.457755
 """
 from alembic import op
 
-
 revision = "0212_remove_caseworking"
 down_revision = "0211_email_branding_update"
 
diff --git a/migrations/versions/0213_brand_colour_domain_.py b/migrations/versions/0213_brand_colour_domain_.py
index 06144f205..b966f8f8a 100644
--- a/migrations/versions/0213_brand_colour_domain_.py
+++ b/migrations/versions/0213_brand_colour_domain_.py
@@ -5,8 +5,8 @@ Revises: 0212_remove_caseworking
 Create Date: 2018-08-16 16:29:41.374944
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0213_brand_colour_domain"
 down_revision = "0212_remove_caseworking"
diff --git a/migrations/versions/0215_email_brand_type.py b/migrations/versions/0215_email_brand_type.py
index 79bf785d6..2b162eae4 100644
--- a/migrations/versions/0215_email_brand_type.py
+++ b/migrations/versions/0215_email_brand_type.py
@@ -5,8 +5,8 @@ Revises: 0213_brand_colour_domain_
 Create Date: 2018-08-23 11:48:00.800968
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0215_email_brand_type"
 down_revision = "0213_brand_colour_domain"
diff --git a/migrations/versions/0216_remove_colours.py b/migrations/versions/0216_remove_colours.py
index 30805bd51..f0e46de89 100644
--- a/migrations/versions/0216_remove_colours.py
+++ b/migrations/versions/0216_remove_colours.py
@@ -3,8 +3,8 @@
 Revises: 0215_email_brand_type
 Create Date: 2018-08-24 13:36:49.346156
  """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0216_remove_colours"
 down_revision = "0215_email_brand_type"
diff --git a/migrations/versions/0221_nullable_service_branding.py b/migrations/versions/0221_nullable_service_branding.py
index cf626f8eb..7649d4a36 100644
--- a/migrations/versions/0221_nullable_service_branding.py
+++ b/migrations/versions/0221_nullable_service_branding.py
@@ -5,7 +5,6 @@ Create Date: 2018-08-24 13:36:49.346156
  """
 from alembic import op
 
-
 revision = "0221_nullable_service_branding"
 down_revision = "0220_email_brand_type_non_null"
 
diff --git a/migrations/versions/0222_drop_service_branding.py b/migrations/versions/0222_drop_service_branding.py
index b32f8663f..ae08e2c0b 100644
--- a/migrations/versions/0222_drop_service_branding.py
+++ b/migrations/versions/0222_drop_service_branding.py
@@ -3,9 +3,8 @@
 Revises: 0221_nullable_service_branding
 Create Date: 2018-08-24 13:36:49.346156
  """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0222_drop_service_branding"
 down_revision = "0221_nullable_service_branding"
diff --git a/migrations/versions/0223_add_domain_constraint.py b/migrations/versions/0223_add_domain_constraint.py
index 3f99ac3d9..b7f2e1e8f 100644
--- a/migrations/versions/0223_add_domain_constraint.py
+++ b/migrations/versions/0223_add_domain_constraint.py
@@ -5,7 +5,6 @@ Create Date: 2018-08-24 13:36:49.346156
  """
 from alembic import op
 
-
 revision = "0223_add_domain_constraint"
 down_revision = "0222_drop_service_branding"
 
diff --git a/migrations/versions/0224_returned_letter_status.py b/migrations/versions/0224_returned_letter_status.py
index bc56e9ef5..c25ff53b3 100644
--- a/migrations/versions/0224_returned_letter_status.py
+++ b/migrations/versions/0224_returned_letter_status.py
@@ -7,7 +7,6 @@ Create Date: 2018-08-21 14:44:04.203480
 """
 from alembic import op
 
-
 revision = "0224_returned_letter_status"
 down_revision = "0223_add_domain_constraint"
 
diff --git a/migrations/versions/0226_service_postage.py b/migrations/versions/0226_service_postage.py
index 01219337f..28d0fa2c1 100644
--- a/migrations/versions/0226_service_postage.py
+++ b/migrations/versions/0226_service_postage.py
@@ -5,9 +5,8 @@ Revises: 0224_returned_letter_status
 Create Date: 2018-09-13 16:23:59.168877
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0226_service_postage"
 down_revision = "0224_returned_letter_status"
diff --git a/migrations/versions/0227_postage_constraints.py b/migrations/versions/0227_postage_constraints.py
index 804cf303b..7c07e520a 100644
--- a/migrations/versions/0227_postage_constraints.py
+++ b/migrations/versions/0227_postage_constraints.py
@@ -3,8 +3,8 @@ Revision ID: 0227_postage_constraints
 Revises: 0226_service_postage
 Create Date: 2018-09-13 16:23:59.168877
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0227_postage_constraints"
 down_revision = "0226_service_postage"
diff --git a/migrations/versions/0228_notification_postage.py b/migrations/versions/0228_notification_postage.py
index 503642719..98353031e 100644
--- a/migrations/versions/0228_notification_postage.py
+++ b/migrations/versions/0228_notification_postage.py
@@ -5,9 +5,8 @@ Revises: 0227_postage_constraints
 Create Date: 2018-09-19 11:42:52.229430
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0228_notification_postage"
 down_revision = "0227_postage_constraints"
diff --git a/migrations/versions/0230_noti_postage_constraint_1.py b/migrations/versions/0230_noti_postage_constraint_1.py
index 9bbd39577..9830155c5 100644
--- a/migrations/versions/0230_noti_postage_constraint_1.py
+++ b/migrations/versions/0230_noti_postage_constraint_1.py
@@ -7,7 +7,6 @@ Create Date: 2018-09-19 11:42:52.229430
 """
 from alembic import op
 
-
 revision = "0230_noti_postage_constraint_1"
 down_revision = "0228_notification_postage"
 
diff --git a/migrations/versions/0231_noti_postage_constraint_2.py b/migrations/versions/0231_noti_postage_constraint_2.py
index 93220549c..322212af5 100644
--- a/migrations/versions/0231_noti_postage_constraint_2.py
+++ b/migrations/versions/0231_noti_postage_constraint_2.py
@@ -7,7 +7,6 @@ Create Date: 2018-09-19 11:42:52.229430
 """
 from alembic import op
 
-
 revision = "0230_noti_postage_constraint_2"
 down_revision = "0230_noti_postage_constraint_1"
 
diff --git a/migrations/versions/0232_noti_postage_constraint_3.py b/migrations/versions/0232_noti_postage_constraint_3.py
index 811001668..69f0b2ac2 100644
--- a/migrations/versions/0232_noti_postage_constraint_3.py
+++ b/migrations/versions/0232_noti_postage_constraint_3.py
@@ -7,7 +7,6 @@ Create Date: 2018-09-19 11:42:52.229430
 """
 from alembic import op
 
-
 revision = "0232_noti_postage_constraint_3"
 down_revision = "0230_noti_postage_constraint_2"
 
diff --git a/migrations/versions/0234_ft_billing_postage.py b/migrations/versions/0234_ft_billing_postage.py
index 8ba873883..77f2eee75 100644
--- a/migrations/versions/0234_ft_billing_postage.py
+++ b/migrations/versions/0234_ft_billing_postage.py
@@ -5,9 +5,8 @@ Revises: 0232_noti_postage_constraint_3
 Create Date: 2018-09-28 14:43:26.100884
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0234_ft_billing_postage"
 down_revision = "0232_noti_postage_constraint_3"
diff --git a/migrations/versions/0235_add_postage_to_pk.py b/migrations/versions/0235_add_postage_to_pk.py
index cb52d0c0d..fac3ef0f6 100644
--- a/migrations/versions/0235_add_postage_to_pk.py
+++ b/migrations/versions/0235_add_postage_to_pk.py
@@ -5,9 +5,8 @@ Revises: 0234_ft_billing_postage
 Create Date: 2018-09-28 15:39:21.115358
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0235_add_postage_to_pk"
 down_revision = "0234_ft_billing_postage"
diff --git a/migrations/versions/0237_add_filename_to_dvla_org.py b/migrations/versions/0237_add_filename_to_dvla_org.py
index 5f11842de..9c34d32b0 100644
--- a/migrations/versions/0237_add_filename_to_dvla_org.py
+++ b/migrations/versions/0237_add_filename_to_dvla_org.py
@@ -5,11 +5,10 @@ Revises: 0235_add_postage_to_pk
 Create Date: 2018-09-28 15:39:21.115358
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.sql import text
 
-
 revision = "0237_add_filename_to_dvla_org"
 down_revision = "0235_add_postage_to_pk"
 
diff --git a/migrations/versions/0238_add_validation_failed.py b/migrations/versions/0238_add_validation_failed.py
index f9416aed2..9b597666c 100644
--- a/migrations/versions/0238_add_validation_failed.py
+++ b/migrations/versions/0238_add_validation_failed.py
@@ -5,9 +5,8 @@ Revises: 0237_add_filename_to_dvla_org
 Create Date: 2018-09-03 11:24:58.773824
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0238_add_validation_failed"
 down_revision = "0237_add_filename_to_dvla_org"
diff --git a/migrations/versions/0239_add_edit_folder_permission.py b/migrations/versions/0239_add_edit_folder_permission.py
index 9b037be0c..b7bad01c7 100644
--- a/migrations/versions/0239_add_edit_folder_permission.py
+++ b/migrations/versions/0239_add_edit_folder_permission.py
@@ -5,9 +5,8 @@ Revises: 0238_add_validation_failed
 Create Date: 2018-09-03 11:24:58.773824
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0239_add_edit_folder_permission"
 down_revision = "0238_add_validation_failed"
diff --git a/migrations/versions/0240_dvla_org_non_nullable.py b/migrations/versions/0240_dvla_org_non_nullable.py
index fdeab3762..f4000365d 100644
--- a/migrations/versions/0240_dvla_org_non_nullable.py
+++ b/migrations/versions/0240_dvla_org_non_nullable.py
@@ -5,9 +5,8 @@ Revises: 0239_add_edit_folder_permission
 Create Date: 2018-10-25 09:16:54.602182
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0240_dvla_org_non_nullable"
 down_revision = "0239_add_edit_folder_permission"
diff --git a/migrations/versions/0242_template_folders.py b/migrations/versions/0242_template_folders.py
index 1421156c9..3424e2e2b 100644
--- a/migrations/versions/0242_template_folders.py
+++ b/migrations/versions/0242_template_folders.py
@@ -5,8 +5,8 @@ Revises: 0240_dvla_org_non_nullable
 Create Date: 2018-10-26 16:00:40.173840
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0242_template_folders"
diff --git a/migrations/versions/0245_archived_flag_jobs.py b/migrations/versions/0245_archived_flag_jobs.py
index 91f942cd5..068176dc4 100644
--- a/migrations/versions/0245_archived_flag_jobs.py
+++ b/migrations/versions/0245_archived_flag_jobs.py
@@ -5,9 +5,8 @@ Revises: 0242_template_folders
 Create Date: 2018-11-22 16:32:01.105803
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0245_archived_flag_jobs"
 down_revision = "0242_template_folders"
diff --git a/migrations/versions/0248_enable_choose_postage.py b/migrations/versions/0248_enable_choose_postage.py
index a5e9e526c..542ed8ec6 100644
--- a/migrations/versions/0248_enable_choose_postage.py
+++ b/migrations/versions/0248_enable_choose_postage.py
@@ -5,9 +5,8 @@ Revises: 0246_notifications_index
 Create Date: 2018-12-14 12:09:31.375634
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0248_enable_choose_postage"
 down_revision = "0246_notifications_index"
diff --git a/migrations/versions/0250_drop_stats_template_table.py b/migrations/versions/0250_drop_stats_template_table.py
index c4a043ae1..a8af6e9bb 100644
--- a/migrations/versions/0250_drop_stats_template_table.py
+++ b/migrations/versions/0250_drop_stats_template_table.py
@@ -5,8 +5,8 @@ Revises: 0248_enable_choose_postage
 Create Date: 2019-01-15 16:47:08.049369
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0250_drop_stats_template_table"
diff --git a/migrations/versions/0252_letter_branding_table.py b/migrations/versions/0252_letter_branding_table.py
index 7beb1740f..90618c029 100644
--- a/migrations/versions/0252_letter_branding_table.py
+++ b/migrations/versions/0252_letter_branding_table.py
@@ -6,8 +6,8 @@ Create Date: 2019-01-17 15:45:33.242955
 
 """
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0252_letter_branding_table"
diff --git a/migrations/versions/0253_set_template_postage_.py b/migrations/versions/0253_set_template_postage_.py
index e3f176615..8b1ed0596 100644
--- a/migrations/versions/0253_set_template_postage_.py
+++ b/migrations/versions/0253_set_template_postage_.py
@@ -5,9 +5,8 @@ Revises: 0252_letter_branding_table
 Create Date: 2019-01-30 16:47:08.599448
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0253_set_template_postage"
 down_revision = "0252_letter_branding_table"
diff --git a/migrations/versions/0254_folders_for_all.py b/migrations/versions/0254_folders_for_all.py
index 0cd839e46..115adbc56 100644
--- a/migrations/versions/0254_folders_for_all.py
+++ b/migrations/versions/0254_folders_for_all.py
@@ -7,7 +7,6 @@ Create Date: 2019-01-08 13:30:48.694881+00
 """
 from alembic import op
 
-
 revision = "0254_folders_for_all"
 down_revision = "0253_set_template_postage"
 
diff --git a/migrations/versions/0256_set_postage_tmplt_hstr.py b/migrations/versions/0256_set_postage_tmplt_hstr.py
index 60d2d9744..7c87be4d7 100644
--- a/migrations/versions/0256_set_postage_tmplt_hstr.py
+++ b/migrations/versions/0256_set_postage_tmplt_hstr.py
@@ -5,9 +5,8 @@ Revises: 0254_folders_for_all
 Create Date: 2019-02-05 14:51:30.808067
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0256_set_postage_tmplt_hstr"
 down_revision = "0254_folders_for_all"
diff --git a/migrations/versions/0258_service_postage_nullable.py b/migrations/versions/0258_service_postage_nullable.py
index ebe0dccfd..0d1a8ed43 100644
--- a/migrations/versions/0258_service_postage_nullable.py
+++ b/migrations/versions/0258_service_postage_nullable.py
@@ -5,9 +5,8 @@ Revises: 0257_letter_branding_migration
 Create Date: 2019-02-12 11:52:53.139383
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0258_service_postage_nullable"
 down_revision = "0257_letter_branding_migration"
diff --git a/migrations/versions/0259_remove_service_postage.py b/migrations/versions/0259_remove_service_postage.py
index 12ee5c3ec..ae089a54c 100644
--- a/migrations/versions/0259_remove_service_postage.py
+++ b/migrations/versions/0259_remove_service_postage.py
@@ -5,9 +5,8 @@ Revises: 0258_service_postage_nullable
 Create Date: 2019-02-11 17:12:22.341599
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0259_remove_service_postage"
 down_revision = "0258_service_postage_nullable"
diff --git a/migrations/versions/0260_remove_dvla_organisation.py b/migrations/versions/0260_remove_dvla_organisation.py
index cd6c16f6c..ad781df59 100644
--- a/migrations/versions/0260_remove_dvla_organisation.py
+++ b/migrations/versions/0260_remove_dvla_organisation.py
@@ -5,9 +5,8 @@ Revises: 0259_remove_service_postage
 Create Date: 2019-02-12 17:39:02.517571
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0260_remove_dvla_organisation"
 down_revision = "0259_remove_service_postage"
diff --git a/migrations/versions/0261_service_volumes.py b/migrations/versions/0261_service_volumes.py
index 900080205..3c7981326 100644
--- a/migrations/versions/0261_service_volumes.py
+++ b/migrations/versions/0261_service_volumes.py
@@ -5,10 +5,10 @@ Revises: 0260_remove_dvla_organisation
 Create Date: 2019-02-13 13:45:00.782500
 
 """
-from alembic import op
 from itertools import product
-import sqlalchemy as sa
 
+import sqlalchemy as sa
+from alembic import op
 
 revision = "0261_service_volumes"
 down_revision = "0260_remove_dvla_organisation"
diff --git a/migrations/versions/0263_remove_edit_folders_2.py b/migrations/versions/0263_remove_edit_folders_2.py
index 3191790a6..1b26b9cb3 100644
--- a/migrations/versions/0263_remove_edit_folders_2.py
+++ b/migrations/versions/0263_remove_edit_folders_2.py
@@ -5,9 +5,8 @@ Revises: 0262_remove_edit_folders
 Create Date: 2019-02-15 14:38:13.823432
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0263_remove_edit_folders_2"
 down_revision = "0262_remove_edit_folders"
diff --git a/migrations/versions/0264_add_folder_permissions_perm.py b/migrations/versions/0264_add_folder_permissions_perm.py
index d720e2bf6..6c4a8358d 100644
--- a/migrations/versions/0264_add_folder_permissions_perm.py
+++ b/migrations/versions/0264_add_folder_permissions_perm.py
@@ -7,7 +7,6 @@ Create Date: 2019-02-14 11:23:26.694656
 """
 from alembic import op
 
-
 revision = "0264_add_folder_permissions_perm"
 down_revision = "0263_remove_edit_folders_2"
 
diff --git a/migrations/versions/0266_user_folder_perms_table.py b/migrations/versions/0266_user_folder_perms_table.py
index 99afbd48c..f714159de 100644
--- a/migrations/versions/0266_user_folder_perms_table.py
+++ b/migrations/versions/0266_user_folder_perms_table.py
@@ -5,8 +5,8 @@ Revises: 0265_add_confirm_edit_templates
 Create Date: 2019-02-26 17:00:13.247321
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0266_user_folder_perms_table"
diff --git a/migrations/versions/0277_consent_to_research_null.py b/migrations/versions/0277_consent_to_research_null.py
index 84645c205..3054d5000 100644
--- a/migrations/versions/0277_consent_to_research_null.py
+++ b/migrations/versions/0277_consent_to_research_null.py
@@ -5,8 +5,8 @@ Revises: 0266_user_folder_perms_table
 Create Date: 2019-03-01 13:47:15.720238
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0277_consent_to_research_null"
diff --git a/migrations/versions/0278_add_more_stuff_to_orgs.py b/migrations/versions/0278_add_more_stuff_to_orgs.py
index 5aa8e0582..592a206f9 100644
--- a/migrations/versions/0278_add_more_stuff_to_orgs.py
+++ b/migrations/versions/0278_add_more_stuff_to_orgs.py
@@ -5,8 +5,8 @@ Revises: 0277_consent_to_research_null
 Create Date: 2019-02-26 10:15:22.430340
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0278_add_more_stuff_to_orgs"
diff --git a/migrations/versions/0280_invited_user_folder_perms.py b/migrations/versions/0280_invited_user_folder_perms.py
index 8de375c13..914e06df1 100644
--- a/migrations/versions/0280_invited_user_folder_perms.py
+++ b/migrations/versions/0280_invited_user_folder_perms.py
@@ -5,8 +5,8 @@ Revises: 0279_remove_fk_to_users
 Create Date: 2019-03-11 14:38:28.010082
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0280_invited_user_folder_perms"
diff --git a/migrations/versions/0281_non_null_folder_permissions.py b/migrations/versions/0281_non_null_folder_permissions.py
index a6a2f4159..1e12454c3 100644
--- a/migrations/versions/0281_non_null_folder_permissions.py
+++ b/migrations/versions/0281_non_null_folder_permissions.py
@@ -5,8 +5,8 @@ Revises: 0280_invited_user_folder_perms
 Create Date: 2019-03-20 10:12:24.927129
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0281_non_null_folder_permissions"
diff --git a/migrations/versions/0282_add_count_as_live.py b/migrations/versions/0282_add_count_as_live.py
index 462126745..142039391 100644
--- a/migrations/versions/0282_add_count_as_live.py
+++ b/migrations/versions/0282_add_count_as_live.py
@@ -10,8 +10,8 @@ Create Date: 2016-10-25 17:37:27.660723
 revision = "0282_add_count_as_live"
 down_revision = "0281_non_null_folder_permissions"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0283_platform_admin_not_live.py b/migrations/versions/0283_platform_admin_not_live.py
index 28afed033..2d92c8334 100644
--- a/migrations/versions/0283_platform_admin_not_live.py
+++ b/migrations/versions/0283_platform_admin_not_live.py
@@ -12,9 +12,8 @@ from sqlalchemy import text
 revision = "0283_platform_admin_not_live"
 down_revision = "0282_add_count_as_live"
 
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 STATEMENT = """
     UPDATE
diff --git a/migrations/versions/0284_0283_retry.py b/migrations/versions/0284_0283_retry.py
index 79ea49dd8..e22f0d850 100644
--- a/migrations/versions/0284_0283_retry.py
+++ b/migrations/versions/0284_0283_retry.py
@@ -10,8 +10,8 @@ Create Date: 2016-10-25 17:37:27.660723
 revision = "0284_0283_retry"
 down_revision = "0283_platform_admin_not_live"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0285_default_org_branding.py b/migrations/versions/0285_default_org_branding.py
index 4c8fcb4a9..c8c6a2df9 100644
--- a/migrations/versions/0285_default_org_branding.py
+++ b/migrations/versions/0285_default_org_branding.py
@@ -10,8 +10,8 @@ Create Date: 2016-10-25 17:37:27.660723
 revision = "0285_default_org_branding"
 down_revision = "0284_0283_retry"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0286_add_unique_email_name.py b/migrations/versions/0286_add_unique_email_name.py
index 35b0cc036..46b571aec 100644
--- a/migrations/versions/0286_add_unique_email_name.py
+++ b/migrations/versions/0286_add_unique_email_name.py
@@ -5,8 +5,8 @@ Revises: 0285_default_org_branding
 Create Date: 2019-04-09 13:01:13.892249
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0286_add_unique_email_name"
 down_revision = "0285_default_org_branding"
diff --git a/migrations/versions/0287_drop_branding_domains.py b/migrations/versions/0287_drop_branding_domains.py
index fa7efb68e..d8e44dd44 100644
--- a/migrations/versions/0287_drop_branding_domains.py
+++ b/migrations/versions/0287_drop_branding_domains.py
@@ -5,8 +5,8 @@ Revises: 0286_add_unique_email_name
 Create Date: 2019-04-05 16:25:11.535816
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0287_drop_branding_domains"
diff --git a/migrations/versions/0288_add_go_live_user.py b/migrations/versions/0288_add_go_live_user.py
index a940da4ad..d24c1f97b 100644
--- a/migrations/versions/0288_add_go_live_user.py
+++ b/migrations/versions/0288_add_go_live_user.py
@@ -5,8 +5,8 @@ Revises: 0287_drop_branding_domains
 Create Date: 2019-04-15 16:50:22.275673
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0288_add_go_live_user"
diff --git a/migrations/versions/0290_org_go_live_notes.py b/migrations/versions/0290_org_go_live_notes.py
index 9e173d14e..f8775b7a1 100644
--- a/migrations/versions/0290_org_go_live_notes.py
+++ b/migrations/versions/0290_org_go_live_notes.py
@@ -5,9 +5,8 @@ Revises: 0289_precompiled_for_all
 Create Date: 2019-05-13 14:55:10.291781
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0290_org_go_live_notes"
 down_revision = "0289_precompiled_for_all"
diff --git a/migrations/versions/0291_remove_unused_index.py b/migrations/versions/0291_remove_unused_index.py
index 88be0cf98..b31c01898 100644
--- a/migrations/versions/0291_remove_unused_index.py
+++ b/migrations/versions/0291_remove_unused_index.py
@@ -5,9 +5,8 @@ Revises: 0290_org_go_live_notes
 Create Date: 2019-05-16 14:05:18.104274
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0291_remove_unused_index"
 down_revision = "0290_org_go_live_notes"
diff --git a/migrations/versions/0292_give_users_folder_perms.py b/migrations/versions/0292_give_users_folder_perms.py
index 753fbb768..5533554fe 100644
--- a/migrations/versions/0292_give_users_folder_perms.py
+++ b/migrations/versions/0292_give_users_folder_perms.py
@@ -8,7 +8,6 @@ Create Date: 2019-04-01 16:36:53.274394
 from alembic import op
 from sqlalchemy.sql import text
 
-
 revision = "0292_give_users_folder_perms"
 down_revision = "0291_remove_unused_index"
 
diff --git a/migrations/versions/0293_drop_complaint_fk.py b/migrations/versions/0293_drop_complaint_fk.py
index 143882ac2..0236b5e19 100644
--- a/migrations/versions/0293_drop_complaint_fk.py
+++ b/migrations/versions/0293_drop_complaint_fk.py
@@ -7,7 +7,6 @@ Create Date: 2019-05-16 14:05:18.104274
 """
 from alembic import op
 
-
 revision = "0293_drop_complaint_fk"
 down_revision = "0292_give_users_folder_perms"
 
diff --git a/migrations/versions/0295_api_key_constraint.py b/migrations/versions/0295_api_key_constraint.py
index b09c26299..bc3fb39a3 100644
--- a/migrations/versions/0295_api_key_constraint.py
+++ b/migrations/versions/0295_api_key_constraint.py
@@ -5,8 +5,8 @@ Revises: 0294_add_verify_reply_to
 Create Date: 2019-06-04 13:49:50.685493
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0295_api_key_constraint"
 down_revision = "0294_add_verify_reply_to"
diff --git a/migrations/versions/0296_agreement_signed_by_person.py b/migrations/versions/0296_agreement_signed_by_person.py
index dfa0460a6..42eca43c8 100644
--- a/migrations/versions/0296_agreement_signed_by_person.py
+++ b/migrations/versions/0296_agreement_signed_by_person.py
@@ -5,8 +5,8 @@ Revises: 0295_api_key_constraint
 Create Date: 2019-06-13 16:40:32.982607
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0296_agreement_signed_by_person"
 down_revision = "0295_api_key_constraint"
diff --git a/migrations/versions/0297_template_redacted_fix.py b/migrations/versions/0297_template_redacted_fix.py
index 1550adb11..ef4cbe38a 100644
--- a/migrations/versions/0297_template_redacted_fix.py
+++ b/migrations/versions/0297_template_redacted_fix.py
@@ -7,7 +7,6 @@ Create Date: 2019-06-25 17:02:14.350064
 """
 from alembic import op
 
-
 revision = "0297_template_redacted_fix"
 down_revision = "0296_agreement_signed_by_person"
 
diff --git a/migrations/versions/0299_org_types_table.py b/migrations/versions/0299_org_types_table.py
index 5ba68cad5..e25fb1c9d 100644
--- a/migrations/versions/0299_org_types_table.py
+++ b/migrations/versions/0299_org_types_table.py
@@ -5,9 +5,8 @@ Revises: 0298_add_mou_signed_receipt
 Create Date: 2019-07-10 16:07:22.019759
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0299_org_types_table"
 down_revision = "0298_add_mou_signed_receipt"
diff --git a/migrations/versions/0300_migrate_org_types.py b/migrations/versions/0300_migrate_org_types.py
index 2eb6c700e..9f4bdedf5 100644
--- a/migrations/versions/0300_migrate_org_types.py
+++ b/migrations/versions/0300_migrate_org_types.py
@@ -7,9 +7,8 @@ Revises: 0299_org_types_table
 Create Date: 2019-07-24 16:18:27.467361
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0300_migrate_org_types"
 down_revision = "0299_org_types_table"
diff --git a/migrations/versions/0301_upload_letters_permission.py b/migrations/versions/0301_upload_letters_permission.py
index 448834976..b41cb1fa4 100644
--- a/migrations/versions/0301_upload_letters_permission.py
+++ b/migrations/versions/0301_upload_letters_permission.py
@@ -5,9 +5,8 @@ Revises: 0300_migrate_org_types
 Create Date: 2019-08-05 10:49:27.467361
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0301_upload_letters_permission"
 down_revision = "0300_migrate_org_types"
diff --git a/migrations/versions/0302_add_org_id_to_services.py b/migrations/versions/0302_add_org_id_to_services.py
index 1c0acfca2..c1cb28c9d 100644
--- a/migrations/versions/0302_add_org_id_to_services.py
+++ b/migrations/versions/0302_add_org_id_to_services.py
@@ -5,8 +5,8 @@ Revises: 0301_upload_letters_permission
 Create Date: 2019-08-06 09:43:57.993510
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0302_add_org_id_to_services"
diff --git a/migrations/versions/0303_populate_services_org_id.py b/migrations/versions/0303_populate_services_org_id.py
index 3c405322a..17dc0c31c 100644
--- a/migrations/versions/0303_populate_services_org_id.py
+++ b/migrations/versions/0303_populate_services_org_id.py
@@ -5,8 +5,8 @@ Revises: 0302_add_org_id_to_services
 Create Date: 2019-08-06 09:43:57.993510
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.sql import text
 
 revision = "0303_populate_services_org_id"
diff --git a/migrations/versions/0304_remove_org_to_service.py b/migrations/versions/0304_remove_org_to_service.py
index 86e9a7812..5c6779304 100644
--- a/migrations/versions/0304_remove_org_to_service.py
+++ b/migrations/versions/0304_remove_org_to_service.py
@@ -5,8 +5,8 @@ Revises: 0303_populate_services_org_id
 Create Date: 2019-08-15 14:49:00.754390
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0304_remove_org_to_service"
diff --git a/migrations/versions/0307_delete_dm_datetime.py b/migrations/versions/0307_delete_dm_datetime.py
index d8efa1422..6f5f67819 100644
--- a/migrations/versions/0307_delete_dm_datetime.py
+++ b/migrations/versions/0307_delete_dm_datetime.py
@@ -5,8 +5,8 @@ Revises: 0304_remove_org_to_service
 Create Date: 2019-10-08 10:57:54.824807
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0307_delete_dm_datetime"
diff --git a/migrations/versions/0308_delete_loadtesting_provider.py b/migrations/versions/0308_delete_loadtesting_provider.py
index 2b643e2db..a7eb82ccf 100644
--- a/migrations/versions/0308_delete_loadtesting_provider.py
+++ b/migrations/versions/0308_delete_loadtesting_provider.py
@@ -7,6 +7,7 @@ Create Date: 2019-10-22 17:30
 
 """
 import uuid
+
 from alembic import op
 from sqlalchemy.sql import text
 
diff --git a/migrations/versions/0310_returned_letters_table_.py b/migrations/versions/0310_returned_letters_table_.py
index 5984ddfd5..93de65f0e 100644
--- a/migrations/versions/0310_returned_letters_table_.py
+++ b/migrations/versions/0310_returned_letters_table_.py
@@ -5,8 +5,8 @@ Revises: 0309_add_uq_key_row_number
 Create Date: 2019-12-09 12:13:49.432993
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0310_returned_letters_table"
diff --git a/migrations/versions/0311_add_inbound_sms_history.py b/migrations/versions/0311_add_inbound_sms_history.py
index 57a321443..93b73b8e2 100644
--- a/migrations/versions/0311_add_inbound_sms_history.py
+++ b/migrations/versions/0311_add_inbound_sms_history.py
@@ -5,8 +5,8 @@ Revises: 0310_returned_letters_table
 Create Date: 2019-12-20 15:38:53.358509
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0311_add_inbound_sms_history"
diff --git a/migrations/versions/0313_email_access_validated_at.py b/migrations/versions/0313_email_access_validated_at.py
index da3214cb7..b470f2eba 100644
--- a/migrations/versions/0313_email_access_validated_at.py
+++ b/migrations/versions/0313_email_access_validated_at.py
@@ -5,9 +5,8 @@ Revises: 0312_populate_returned_letters
 Create Date: 2020-01-28 18:03:22.237386
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0313_email_access_validated_at"
 down_revision = "0312_populate_returned_letters"
diff --git a/migrations/versions/0314_populate_email_access.py b/migrations/versions/0314_populate_email_access.py
index 63566f16d..8a50d6979 100644
--- a/migrations/versions/0314_populate_email_access.py
+++ b/migrations/versions/0314_populate_email_access.py
@@ -7,7 +7,6 @@ Create Date: 2020-01-31 10:35:44.524606
 """
 from alembic import op
 
-
 revision = "0314_populate_email_access"
 down_revision = "0313_email_access_validated_at"
 
diff --git a/migrations/versions/0315_document_download_count.py b/migrations/versions/0315_document_download_count.py
index d2733cb1e..dd890aa51 100644
--- a/migrations/versions/0315_document_download_count.py
+++ b/migrations/versions/0315_document_download_count.py
@@ -5,9 +5,8 @@ Revises: 0314_populate_email_access
 Create Date: 2020-02-12 14:19:18.066425
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0315_document_download_count"
 down_revision = "0314_populate_email_access"
diff --git a/migrations/versions/0316_int_letters_permission.py b/migrations/versions/0316_int_letters_permission.py
index 7b5fee461..f71709dcc 100644
--- a/migrations/versions/0316_int_letters_permission.py
+++ b/migrations/versions/0316_int_letters_permission.py
@@ -5,9 +5,8 @@ Revises: 0315_document_download_count
 Create Date: 2020-09-13 28:17:17.110495
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0316_int_letters_permission"
 down_revision = "0315_document_download_count"
diff --git a/migrations/versions/0317_uploads_for_all.py b/migrations/versions/0317_uploads_for_all.py
index e4673e2df..074d49860 100644
--- a/migrations/versions/0317_uploads_for_all.py
+++ b/migrations/versions/0317_uploads_for_all.py
@@ -7,7 +7,6 @@ Create Date: 2019-05-13 10:44:51.867661
 """
 from alembic import op
 
-
 revision = "0317_uploads_for_all"
 down_revision = "0316_int_letters_permission"
 
diff --git a/migrations/versions/0318_service_contact_list.py b/migrations/versions/0318_service_contact_list.py
index b964e8f53..cafd5f456 100644
--- a/migrations/versions/0318_service_contact_list.py
+++ b/migrations/versions/0318_service_contact_list.py
@@ -5,8 +5,8 @@ Revises: 0317_uploads_for_all
 Create Date: 2020-03-12 15:44:30.784031
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0318_service_contact_list"
diff --git a/migrations/versions/0319_contact_list_archived.py b/migrations/versions/0319_contact_list_archived.py
index 488526337..f80340641 100644
--- a/migrations/versions/0319_contact_list_archived.py
+++ b/migrations/versions/0319_contact_list_archived.py
@@ -5,8 +5,8 @@ Revises: 0318_service_contact_list
 Create Date: 2020-03-26 11:16:12.389524
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0319_contact_list_archived"
 down_revision = "0318_service_contact_list"
diff --git a/migrations/versions/0321_drop_postage_constraints.py b/migrations/versions/0321_drop_postage_constraints.py
index a102b0c65..0a531419c 100644
--- a/migrations/versions/0321_drop_postage_constraints.py
+++ b/migrations/versions/0321_drop_postage_constraints.py
@@ -9,7 +9,6 @@ import os
 
 from alembic import op
 
-
 revision = "0321_drop_postage_constraints"
 down_revision = "0320_optimise_notifications"
 environment = os.environ["NOTIFY_ENVIRONMENT"]
diff --git a/migrations/versions/0322_broadcast_service_perm.py b/migrations/versions/0322_broadcast_service_perm.py
index ebeb951b5..21997bc3e 100644
--- a/migrations/versions/0322_broadcast_service_perm.py
+++ b/migrations/versions/0322_broadcast_service_perm.py
@@ -7,7 +7,6 @@ Create Date: 2020-06-29 11:14:13.183683
 """
 from alembic import op
 
-
 revision = "0322_broadcast_service_perm"
 down_revision = "0321_drop_postage_constraints"
 
diff --git a/migrations/versions/0323_broadcast_message.py b/migrations/versions/0323_broadcast_message.py
index 514f03982..c3bc387b3 100644
--- a/migrations/versions/0323_broadcast_message.py
+++ b/migrations/versions/0323_broadcast_message.py
@@ -5,10 +5,10 @@ Revises: 0322_broadcast_service_perm
 Create Date: 2020-07-02 11:59:38.734650
 
 """
-from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.sql import column, func
+from alembic import op
 from sqlalchemy.dialects import postgresql
+from sqlalchemy.sql import column, func
 
 revision = "0323_broadcast_message"
 down_revision = "0322_broadcast_service_perm"
diff --git a/migrations/versions/0326_broadcast_event.py b/migrations/versions/0326_broadcast_event.py
index 40ca24f47..b4c263125 100644
--- a/migrations/versions/0326_broadcast_event.py
+++ b/migrations/versions/0326_broadcast_event.py
@@ -5,8 +5,8 @@ Revises: 0323_broadcast_message
 Create Date: 2020-07-24 12:40:35.809523
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0326_broadcast_event"
diff --git a/migrations/versions/0327_idx_notification_history.py b/migrations/versions/0327_idx_notification_history.py
index 25631e34f..3ae88565a 100644
--- a/migrations/versions/0327_idx_notification_history.py
+++ b/migrations/versions/0327_idx_notification_history.py
@@ -6,6 +6,7 @@ Create Date: 2020-07-28 08:11:07.666708
 
 """
 import os
+
 from alembic import op
 
 revision = "0327_idx_notification_history"
diff --git a/migrations/versions/0329_purge_broadcast_data.py b/migrations/versions/0329_purge_broadcast_data.py
index e1961db2d..c1df398a1 100644
--- a/migrations/versions/0329_purge_broadcast_data.py
+++ b/migrations/versions/0329_purge_broadcast_data.py
@@ -7,7 +7,6 @@ Create Date: 2020-09-07 16:00:27.545673
 """
 from alembic import op
 
-
 revision = "0329_purge_broadcast_data"
 down_revision = "0328_international_letters_perm"
 
diff --git a/migrations/versions/0331_add_broadcast_org.py b/migrations/versions/0331_add_broadcast_org.py
index 23136fd04..76e9d8bbe 100644
--- a/migrations/versions/0331_add_broadcast_org.py
+++ b/migrations/versions/0331_add_broadcast_org.py
@@ -5,10 +5,11 @@ Revises: 0330_broadcast_invite_email
 Create Date: 2020-09-23 10:11:01.094412
 
 """
-from alembic import op
-import sqlalchemy as sa
 import os
 
+import sqlalchemy as sa
+from alembic import op
+
 revision = "0331_add_broadcast_org"
 down_revision = "0330_broadcast_invite_email"
 
diff --git a/migrations/versions/0332_broadcast_provider_msg.py b/migrations/versions/0332_broadcast_provider_msg.py
index fb3c2d856..4fa90b67d 100644
--- a/migrations/versions/0332_broadcast_provider_msg.py
+++ b/migrations/versions/0332_broadcast_provider_msg.py
@@ -5,8 +5,8 @@ Revises: 0331_add_broadcast_org
 Create Date: 2020-10-26 16:28:11.917468
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0332_broadcast_provider_msg"
diff --git a/migrations/versions/0333_service_broadcast_provider.py b/migrations/versions/0333_service_broadcast_provider.py
index 2bca3512f..26a5a5462 100644
--- a/migrations/versions/0333_service_broadcast_provider.py
+++ b/migrations/versions/0333_service_broadcast_provider.py
@@ -5,8 +5,8 @@ Revises: 0332_broadcast_provider_msg
 Create Date: 2020-12-01 17:03:18.209780
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0333_service_broadcast_provider"
diff --git a/migrations/versions/0334_broadcast_message_number.py b/migrations/versions/0334_broadcast_message_number.py
index a2df2c9fb..a1221e1c2 100644
--- a/migrations/versions/0334_broadcast_message_number.py
+++ b/migrations/versions/0334_broadcast_message_number.py
@@ -5,8 +5,8 @@ Revises: 0333_service_broadcast_provider
 Create Date: 2020-12-04 15:06:22.544803
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0334_broadcast_message_number"
diff --git a/migrations/versions/0335_broadcast_msg_content.py b/migrations/versions/0335_broadcast_msg_content.py
index a0fe5daf9..c8506a235 100644
--- a/migrations/versions/0335_broadcast_msg_content.py
+++ b/migrations/versions/0335_broadcast_msg_content.py
@@ -5,8 +5,8 @@ Revises: 0334_broadcast_message_number
 Create Date: 2020-12-04 15:06:22.544803
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0335_broadcast_msg_content"
diff --git a/migrations/versions/0336_broadcast_msg_content_2.py b/migrations/versions/0336_broadcast_msg_content_2.py
index 2455e8993..7b3159454 100644
--- a/migrations/versions/0336_broadcast_msg_content_2.py
+++ b/migrations/versions/0336_broadcast_msg_content_2.py
@@ -5,8 +5,8 @@ Revises: 0335_broadcast_msg_content
 Create Date: 2020-12-04 15:06:22.544803
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from notifications_utils.template import BroadcastMessageTemplate
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.orm.session import Session
diff --git a/migrations/versions/0337_broadcast_msg_api.py b/migrations/versions/0337_broadcast_msg_api.py
index 39b61d99e..01cb85e8d 100644
--- a/migrations/versions/0337_broadcast_msg_api.py
+++ b/migrations/versions/0337_broadcast_msg_api.py
@@ -5,8 +5,8 @@ Revises: 0336_broadcast_msg_content_2
 Create Date: 2020-12-04 15:06:22.544803
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0337_broadcast_msg_api"
diff --git a/migrations/versions/0338_add_notes_to_service.py b/migrations/versions/0338_add_notes_to_service.py
index 2f381a2ed..c2ad3b912 100644
--- a/migrations/versions/0338_add_notes_to_service.py
+++ b/migrations/versions/0338_add_notes_to_service.py
@@ -5,9 +5,8 @@ Revises: 0337_broadcast_msg_api
 Create Date: 2021-01-13 11:50:06.333369
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0338_add_notes_to_service"
 down_revision = "0337_broadcast_msg_api"
diff --git a/migrations/versions/0339_service_billing_details.py b/migrations/versions/0339_service_billing_details.py
index e1a570625..7e814e35f 100644
--- a/migrations/versions/0339_service_billing_details.py
+++ b/migrations/versions/0339_service_billing_details.py
@@ -5,9 +5,8 @@ Revises: 0338_add_notes_to_service
 Create Date: 2021-01-20 17:55:46.555460
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0339_service_billing_details"
 down_revision = "0338_add_notes_to_service"
diff --git a/migrations/versions/0340_stub_training_broadcasts.py b/migrations/versions/0340_stub_training_broadcasts.py
index ff761e51a..081f7143a 100644
--- a/migrations/versions/0340_stub_training_broadcasts.py
+++ b/migrations/versions/0340_stub_training_broadcasts.py
@@ -5,9 +5,8 @@ Revises: 0339_service_billing_details
 Create Date: 2021-01-26 16:48:44.921065
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0340_stub_training_broadcasts"
 down_revision = "0339_service_billing_details"
diff --git a/migrations/versions/0342_service_broadcast_settings.py b/migrations/versions/0342_service_broadcast_settings.py
index 90390c231..cc451b871 100644
--- a/migrations/versions/0342_service_broadcast_settings.py
+++ b/migrations/versions/0342_service_broadcast_settings.py
@@ -5,8 +5,8 @@ Revises: 0340_stub_training_broadcasts
 Create Date: 2021-01-28 21:30:23.102340
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0342_service_broadcast_settings"
diff --git a/migrations/versions/0343_org_billing_details.py b/migrations/versions/0343_org_billing_details.py
index a14ca6bf2..d0fb0c105 100644
--- a/migrations/versions/0343_org_billing_details.py
+++ b/migrations/versions/0343_org_billing_details.py
@@ -5,9 +5,8 @@ Revises: 0342_service_broadcast_settings
 Create Date: 2021-02-01 14:40:14.809632
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0343_org_billing_details"
 down_revision = "0342_service_broadcast_settings"
diff --git a/migrations/versions/0344_stubbed_not_nullable.py b/migrations/versions/0344_stubbed_not_nullable.py
index 2c070204f..d9623bb84 100644
--- a/migrations/versions/0344_stubbed_not_nullable.py
+++ b/migrations/versions/0344_stubbed_not_nullable.py
@@ -5,9 +5,8 @@ Revises: 0343_org_billing_details
 Create Date: 2021-02-08 18:10:15.533279
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0344_stubbed_not_nullable"
 down_revision = "0343_org_billing_details"
diff --git a/migrations/versions/0345_move_broadcast_provider.py b/migrations/versions/0345_move_broadcast_provider.py
index 7bd588144..3f246340e 100644
--- a/migrations/versions/0345_move_broadcast_provider.py
+++ b/migrations/versions/0345_move_broadcast_provider.py
@@ -5,8 +5,8 @@ Revises: 0344_stubbed_not_nullable
 Create Date: 2021-02-09 09:19:07.957980
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy import text
 from sqlalchemy.dialects import postgresql
 
diff --git a/migrations/versions/0348_migrate_broadcast_settings_migrate_broadcast_settings.py b/migrations/versions/0348_migrate_broadcast_settings_migrate_broadcast_settings.py
index 8d08e616e..75d431a4c 100644
--- a/migrations/versions/0348_migrate_broadcast_settings_migrate_broadcast_settings.py
+++ b/migrations/versions/0348_migrate_broadcast_settings_migrate_broadcast_settings.py
@@ -5,8 +5,8 @@ Revises: 0347_add_dvla_volumes_template
 Create Date: 2021-02-18 15:25:30.667098
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy import text
 from sqlalchemy.dialects import postgresql
 
diff --git a/migrations/versions/0349_add_ft_processing_time.py b/migrations/versions/0349_add_ft_processing_time.py
index 62066e46b..d2a0c7a2c 100644
--- a/migrations/versions/0349_add_ft_processing_time.py
+++ b/migrations/versions/0349_add_ft_processing_time.py
@@ -5,8 +5,8 @@ Revises: 0348_migrate_broadcast_settings
 Create Date: 2021-02-22 14:05:24.775338
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0349_add_ft_processing_time"
diff --git a/migrations/versions/0352_broadcast_provider_types.py b/migrations/versions/0352_broadcast_provider_types.py
index 1ac9a2b57..d61f5aad3 100644
--- a/migrations/versions/0352_broadcast_provider_types.py
+++ b/migrations/versions/0352_broadcast_provider_types.py
@@ -5,8 +5,8 @@ Revises: 0351_unique_key_annual_billing
 Create Date: 2021-05-05 15:07:22.146657
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy import text
 
 revision = "0352_broadcast_provider_types"
diff --git a/migrations/versions/0353_broadcast_provider_not_null.py b/migrations/versions/0353_broadcast_provider_not_null.py
index a78b68892..ed46213f8 100644
--- a/migrations/versions/0353_broadcast_provider_not_null.py
+++ b/migrations/versions/0353_broadcast_provider_not_null.py
@@ -5,8 +5,8 @@ Revises: 0352_broadcast_provider_types
 Create Date: 2021-05-10 15:06:40.046786
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0353_broadcast_provider_not_null"
 down_revision = "0352_broadcast_provider_types"
diff --git a/migrations/versions/0355_add_webauthn_table.py b/migrations/versions/0355_add_webauthn_table.py
index c5e704deb..6263dfe9a 100644
--- a/migrations/versions/0355_add_webauthn_table.py
+++ b/migrations/versions/0355_add_webauthn_table.py
@@ -5,8 +5,8 @@ Revises: 0354_government_channel
 Create Date: 2021-05-07 17:04:22.017137
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0355_add_webauthn_table"
diff --git a/migrations/versions/0359_more_permissions.py b/migrations/versions/0359_more_permissions.py
index 6bdf1bc5a..e9ac98ed7 100644
--- a/migrations/versions/0359_more_permissions.py
+++ b/migrations/versions/0359_more_permissions.py
@@ -5,8 +5,8 @@ Revises: 0358_operator_channel
 Create Date: 2021-06-15 17:47:16.871071
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0359_more_permissions"
 down_revision = "0358_operator_channel"
diff --git a/migrations/versions/0362_broadcast_msg_event.py b/migrations/versions/0362_broadcast_msg_event.py
index bd3656846..b552b9d33 100644
--- a/migrations/versions/0362_broadcast_msg_event.py
+++ b/migrations/versions/0362_broadcast_msg_event.py
@@ -5,8 +5,8 @@ Revises: 0361_new_user_bcast_permissions
 Create Date: 2020-12-04 15:06:22.544803
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0362_broadcast_msg_event"
diff --git a/migrations/versions/0363_cancelled_by_api_key.py b/migrations/versions/0363_cancelled_by_api_key.py
index 9b11dbb55..828944d5d 100644
--- a/migrations/versions/0363_cancelled_by_api_key.py
+++ b/migrations/versions/0363_cancelled_by_api_key.py
@@ -3,8 +3,8 @@ Revision ID: 0363_cancelled_by_api_key
 Revises: 0362_broadcast_msg_event
 Create Date: 2022-02-09 14:05:27.750234
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0363_cancelled_by_api_key"
diff --git a/migrations/versions/0364_drop_old_column.py b/migrations/versions/0364_drop_old_column.py
index bd43471db..864c552ba 100644
--- a/migrations/versions/0364_drop_old_column.py
+++ b/migrations/versions/0364_drop_old_column.py
@@ -5,8 +5,8 @@ Revises: 0363_cancelled_by_api_key
 Create Date: 2022-01-25 18:05:27.750234
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0364_drop_old_column"
diff --git a/migrations/versions/0373_add_notifications_view.py b/migrations/versions/0373_add_notifications_view.py
index 5e97a0101..88c890bfd 100644
--- a/migrations/versions/0373_add_notifications_view.py
+++ b/migrations/versions/0373_add_notifications_view.py
@@ -6,8 +6,8 @@ Create Date: 2022-05-18 09:39:45.260951
 
 """
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0373_add_notifications_view"
diff --git a/migrations/versions/0374_fix_reg_template_history.py b/migrations/versions/0374_fix_reg_template_history.py
index 307d991a8..7bd0892f5 100644
--- a/migrations/versions/0374_fix_reg_template_history.py
+++ b/migrations/versions/0374_fix_reg_template_history.py
@@ -14,8 +14,8 @@ from sqlalchemy import text
 revision = "0374_fix_reg_template_history"
 down_revision = "0373_add_notifications_view"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 service_id = "d6aa2c68-a2d9-4437-ab19-3ae8eb202553"
 user_id = "6af522d0-2915-4e52-83a3-3690455a5fe6"
diff --git a/migrations/versions/0376_add_provider_response.py b/migrations/versions/0376_add_provider_response.py
index 58d4f0136..239ed850f 100644
--- a/migrations/versions/0376_add_provider_response.py
+++ b/migrations/versions/0376_add_provider_response.py
@@ -11,8 +11,8 @@ from datetime import datetime
 revision = "0376_add_provider_response"
 down_revision = "0375_fix_service_name"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 def upgrade():
diff --git a/migrations/versions/0378_add_org_names.py b/migrations/versions/0378_add_org_names.py
index cb3492aed..b55a2dec2 100644
--- a/migrations/versions/0378_add_org_names.py
+++ b/migrations/versions/0378_add_org_names.py
@@ -5,8 +5,8 @@ Revises: 0377_add_inbound_sms_number
 Create Date: 2022-09-23 20:04:00.766980
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0378_add_org_names"
diff --git a/migrations/versions/0379_remove_broadcasts.py b/migrations/versions/0379_remove_broadcasts.py
index 018f51633..d7b891f57 100644
--- a/migrations/versions/0379_remove_broadcasts.py
+++ b/migrations/versions/0379_remove_broadcasts.py
@@ -5,9 +5,9 @@ Revises: 0378_add_org_names
 Create Date: 2022-10-25 14:41:29.429928
 
 """
-from alembic import op
-import sqlalchemy as sa
 import psycopg2
+import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0379_remove_broadcasts"
diff --git a/migrations/versions/0380_bst_to_local.py b/migrations/versions/0380_bst_to_local.py
index 272d4522a..0316fda6a 100644
--- a/migrations/versions/0380_bst_to_local.py
+++ b/migrations/versions/0380_bst_to_local.py
@@ -5,8 +5,8 @@ Revises: 0379_remove_broadcasts
 Create Date: 2022-11-21 11:35:51.987539
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0380_bst_to_local"
diff --git a/migrations/versions/0381_encrypted_column_types.py b/migrations/versions/0381_encrypted_column_types.py
index f9c78922c..b36a89742 100644
--- a/migrations/versions/0381_encrypted_column_types.py
+++ b/migrations/versions/0381_encrypted_column_types.py
@@ -5,9 +5,8 @@ Revises: 0380_bst_to_local
 Create Date: 2022-12-09 10:17:03.358405
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0381_encrypted_column_types"
 down_revision = "0380_bst_to_local"
diff --git a/migrations/versions/0383_update_default_templates.py b/migrations/versions/0383_update_default_templates.py
index ba4cb3a3b..ff2439555 100644
--- a/migrations/versions/0383_update_default_templates.py
+++ b/migrations/versions/0383_update_default_templates.py
@@ -6,11 +6,12 @@ Create Date: 2023-01-10 11:42:25.633265
 
 """
 import json
-from alembic import op
+
 import sqlalchemy as sa
+from alembic import op
+from flask import current_app
 from sqlalchemy import text
 from sqlalchemy.dialects import postgresql
-from flask import current_app
 
 revision = "0383_update_default_templates.py"
 down_revision = "0381_encrypted_column_types"
diff --git a/migrations/versions/0384_remove_letter_branding_.py b/migrations/versions/0384_remove_letter_branding_.py
index 6b909b994..387de0cc4 100644
--- a/migrations/versions/0384_remove_letter_branding_.py
+++ b/migrations/versions/0384_remove_letter_branding_.py
@@ -5,8 +5,8 @@ Revises: 0383_update_default_templates.py
 Create Date: 2023-02-09 22:24:07.187569
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0384_remove_letter_branding_"
diff --git a/migrations/versions/0385_remove postage_.py b/migrations/versions/0385_remove postage_.py
index e9d856937..5bf88197c 100644
--- a/migrations/versions/0385_remove postage_.py	
+++ b/migrations/versions/0385_remove postage_.py	
@@ -5,8 +5,8 @@ Revises: 0384_remove_letter_branding_
 Create Date: 2023-02-10 12:20:39.411493
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0385_remove_postage_"
diff --git a/migrations/versions/0387_remove_letter_perms_.py b/migrations/versions/0387_remove_letter_perms_.py
index 7d413b7c1..36bc94beb 100644
--- a/migrations/versions/0387_remove_letter_perms_.py
+++ b/migrations/versions/0387_remove_letter_perms_.py
@@ -5,8 +5,8 @@ Revises: 0385_remove_postage_
 Create Date: 2023-02-17 11:56:00.993409
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0387_remove_letter_perms_"
diff --git a/migrations/versions/0388_no_serv_letter_contact.py b/migrations/versions/0388_no_serv_letter_contact.py
index 1f34e5511..7b3e7d170 100644
--- a/migrations/versions/0388_no_serv_letter_contact.py
+++ b/migrations/versions/0388_no_serv_letter_contact.py
@@ -5,8 +5,8 @@ Revises: 0387_remove_letter_perms_
 Create Date: 2023-02-17 14:42:52.679425
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0388_no_serv_letter_contact"
diff --git a/migrations/versions/0389_no_more_letters.py b/migrations/versions/0389_no_more_letters.py
index d030cd916..542a5618b 100644
--- a/migrations/versions/0389_no_more_letters.py
+++ b/migrations/versions/0389_no_more_letters.py
@@ -5,8 +5,8 @@ Revises: 0388_no_serv_letter_contact
 Create Date: 2023-02-28 08:58:38.310095
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0389_no_more_letters"
diff --git a/migrations/versions/0390_drop_dvla_provider.py b/migrations/versions/0390_drop_dvla_provider.py
index 4704162ea..13c299b4f 100644
--- a/migrations/versions/0390_drop_dvla_provider.py
+++ b/migrations/versions/0390_drop_dvla_provider.py
@@ -7,8 +7,8 @@ Create Date: 2023-02-28 14:25:50.751952
 """
 import uuid
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy import text
 from sqlalchemy.dialects import postgresql
 
diff --git a/migrations/versions/0391_update_sms_numbers.py b/migrations/versions/0391_update_sms_numbers.py
index 43599e2fc..3c0c4828b 100644
--- a/migrations/versions/0391_update_sms_numbers.py
+++ b/migrations/versions/0391_update_sms_numbers.py
@@ -5,9 +5,9 @@ Revises: 0390_drop_dvla_provider
 Create Date: 2023-03-01 12:36:38.226954
 
 """
+import sqlalchemy as sa
 from alembic import op
 from flask import current_app
-import sqlalchemy as sa
 from sqlalchemy import text
 
 revision = "0391_update_sms_numbers"
diff --git a/migrations/versions/0392_drop_letter_permissions_.py b/migrations/versions/0392_drop_letter_permissions_.py
index 2e0b40a3b..c43d33e3b 100644
--- a/migrations/versions/0392_drop_letter_permissions_.py
+++ b/migrations/versions/0392_drop_letter_permissions_.py
@@ -7,7 +7,6 @@ Create Date: 2023-03-06 08:55:24.153687
 """
 from alembic import op
 
-
 revision = "0392_drop_letter_permissions"
 down_revision = "0391_update_sms_numbers"
 
diff --git a/migrations/versions/0393_remove_crown.py b/migrations/versions/0393_remove_crown.py
index 39807babd..48649a00d 100644
--- a/migrations/versions/0393_remove_crown.py
+++ b/migrations/versions/0393_remove_crown.py
@@ -5,8 +5,8 @@ Revises: 0392_drop_letter_permissions
 Create Date: 2023-04-10 14:13:38.207790
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 revision = "0393_remove_crown"
 down_revision = "0392_drop_letter_permissions"
diff --git a/migrations/versions/0394_remove_contact_list_.py b/migrations/versions/0394_remove_contact_list_.py
index fe0acd38a..2cbc8e9f5 100644
--- a/migrations/versions/0394_remove_contact_list_.py
+++ b/migrations/versions/0394_remove_contact_list_.py
@@ -5,8 +5,8 @@ Revises: 0393_remove_crown
 Create Date: 2023-04-12 13:12:12.683257
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0394_remove_contact_list"
diff --git a/migrations/versions/0395_remove_intl_letters_perm.py b/migrations/versions/0395_remove_intl_letters_perm.py
index 5c98c7cb7..6b2f028e0 100644
--- a/migrations/versions/0395_remove_intl_letters_perm.py
+++ b/migrations/versions/0395_remove_intl_letters_perm.py
@@ -5,8 +5,8 @@ Revises: 0394_remove_contact_list
 Create Date: 2023-05-23 10:03:10.485368
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0395_remove_intl_letters_perm"
diff --git a/migrations/versions/0396_rename_organisation.py b/migrations/versions/0396_rename_organisation.py
index 7df90b290..8a652a3e8 100644
--- a/migrations/versions/0396_rename_organisation.py
+++ b/migrations/versions/0396_rename_organisation.py
@@ -5,9 +5,8 @@ Revises: 0395_add_total_message_limit
 Create Date: 2023-04-27 14:59:39.428607
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0396_rename_organisation"
 down_revision = "0395_remove_intl_letters_perm"
diff --git a/migrations/versions/0397_rename_organisation_2.py b/migrations/versions/0397_rename_organisation_2.py
index e142300ce..fa05b16ca 100644
--- a/migrations/versions/0397_rename_organisation_2.py
+++ b/migrations/versions/0397_rename_organisation_2.py
@@ -5,8 +5,8 @@ Revises: 0396_rename_organisation
 Create Date: 2023-07-13 09:33:52.455290
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0397_rename_organisation_2"
diff --git a/migrations/versions/0398_agreements_table.py b/migrations/versions/0398_agreements_table.py
index 8efd864cd..683bc2f18 100644
--- a/migrations/versions/0398_agreements_table.py
+++ b/migrations/versions/0398_agreements_table.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-26 13:08:42.892813
 revision = "0398_agreements_table"
 down_revision = "0397_rename_organisation_2"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0399_remove_research_mode.py b/migrations/versions/0399_remove_research_mode.py
index 8edf0291c..585e30fef 100644
--- a/migrations/versions/0399_remove_research_mode.py
+++ b/migrations/versions/0399_remove_research_mode.py
@@ -10,8 +10,8 @@ Create Date: 2016-04-26 13:08:42.892813
 revision = "0399_remove_research_mode"
 down_revision = "0398_agreements_table"
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 
diff --git a/migrations/versions/0400_add_total_message_limit.py b/migrations/versions/0400_add_total_message_limit.py
index b4410c36b..50f7fd4e1 100644
--- a/migrations/versions/0400_add_total_message_limit.py
+++ b/migrations/versions/0400_add_total_message_limit.py
@@ -5,9 +5,8 @@ Revises: 0399_remove_research_mode
 Create Date: 2023-04-24 11:35:22.873930
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 revision = "0400_add_total_message_limit"
 down_revision = "0399_remove_research_mode"
diff --git a/migrations/versions/0401_add_e2e_test_user.py b/migrations/versions/0401_add_e2e_test_user.py
index 020e746e7..de0f45c0b 100644
--- a/migrations/versions/0401_add_e2e_test_user.py
+++ b/migrations/versions/0401_add_e2e_test_user.py
@@ -9,8 +9,8 @@ import datetime
 import os
 import uuid
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 from app import db
 from app.dao.users_dao import get_user_by_email
diff --git a/migrations/versions/0402_total_message_limit_default.py b/migrations/versions/0402_total_message_limit_default.py
index 75539bcf1..6a1c894c5 100644
--- a/migrations/versions/0402_total_message_limit_default.py
+++ b/migrations/versions/0402_total_message_limit_default.py
@@ -5,10 +5,9 @@ Revises: 0401_add_e2e_test_user
 Create Date: 2023-09-18 10:04:58.957374
 
 """
+import sqlalchemy as sa
 from alembic import op
 from flask import current_app
-import sqlalchemy as sa
-
 
 revision = "0402_total_message_limit_default"
 down_revision = "0401_add_e2e_test_user"
diff --git a/migrations/versions/0403_add_carrier.py b/migrations/versions/0403_add_carrier.py
index b13e66c96..852eb2253 100644
--- a/migrations/versions/0403_add_carrier.py
+++ b/migrations/versions/0403_add_carrier.py
@@ -4,10 +4,9 @@ Revision ID: 0403_add_carrier
 Revises: 0402_total_message_limit_default
 
 """
+import sqlalchemy as sa
 from alembic import op
 from flask import current_app
-import sqlalchemy as sa
-
 
 down_revision = "0402_total_message_limit_default"
 revision = "0403_add_carrier"
diff --git a/migrations/versions/0404_expire_invites.py b/migrations/versions/0404_expire_invites.py
index 9c266bfc9..da7ab6a22 100644
--- a/migrations/versions/0404_expire_invites.py
+++ b/migrations/versions/0404_expire_invites.py
@@ -6,8 +6,9 @@ Create Date: 2023-11-10 15:52:07.348485
 
 """
 from re import I
-from alembic import op
+
 import sqlalchemy as sa
+from alembic import op
 
 # Copied pattern for adjusting a enum as defined in 0359_more_permissions
 
diff --git a/migrations/versions/0405_add_preferred_timezone.py b/migrations/versions/0405_add_preferred_timezone.py
index f689516bd..4067b1891 100644
--- a/migrations/versions/0405_add_preferred_timezone.py
+++ b/migrations/versions/0405_add_preferred_timezone.py
@@ -4,10 +4,9 @@ Revision ID: 0405_add_preferred_timezone
 Revises: 0404_expire_invites
 
 """
+import sqlalchemy as sa
 from alembic import op
 from flask import current_app
-import sqlalchemy as sa
-
 
 down_revision = "0404_expire_invites"
 revision = "0405_add_preferred_timezone"
diff --git a/migrations/versions/0406_adjust_agreement_model.py b/migrations/versions/0406_adjust_agreement_model.py
index 4b91b8c9a..9b8c710f9 100644
--- a/migrations/versions/0406_adjust_agreement_model.py
+++ b/migrations/versions/0406_adjust_agreement_model.py
@@ -5,8 +5,8 @@ Revises: 0404_expire_invites
 Create Date: 2023-11-17 15:39:45.470089
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 revision = "0406_adjust_agreement_model"
diff --git a/migrations/versions/0407_fix_preferred_timezone.py b/migrations/versions/0407_fix_preferred_timezone.py
index 441b4dcef..701f9eda4 100644
--- a/migrations/versions/0407_fix_preferred_timezone.py
+++ b/migrations/versions/0407_fix_preferred_timezone.py
@@ -10,8 +10,9 @@ revision = "0407_fix_preferred_timezone"
 
 
 def upgrade():
-    op.execute("update users set preferred_timezone='US/Eastern' where preferred_timezone=''")
-
+    op.execute(
+        "update users set preferred_timezone='US/Eastern' where preferred_timezone=''"
+    )
 
 
 def downgrade():
diff --git a/migrations/versions/0408_fix_timezone_again.py b/migrations/versions/0408_fix_timezone_again.py
index b39cb0191..bed9039dc 100644
--- a/migrations/versions/0408_fix_timezone_again.py
+++ b/migrations/versions/0408_fix_timezone_again.py
@@ -10,8 +10,9 @@ revision = "0408_fix_timezone_again"
 
 
 def upgrade():
-    op.execute("update users set preferred_timezone='US/Eastern' where (preferred_timezone='') is not false")
-
+    op.execute(
+        "update users set preferred_timezone='US/Eastern' where (preferred_timezone='') is not false"
+    )
 
 
 def downgrade():
diff --git a/run_celery.py b/run_celery.py
index 62bab0fbf..9f0c4e704 100644
--- a/run_celery.py
+++ b/run_celery.py
@@ -3,8 +3,7 @@
 from flask import Flask
 
 # notify_celery is referenced from manifest_delivery_base.yml, and cannot be removed
-from app import notify_celery, create_app  # noqa
-
+from app import create_app, notify_celery  # noqa
 
 application = Flask("delivery")
 create_app(application)
diff --git a/scripts/check_if_new_migration.py b/scripts/check_if_new_migration.py
index 06210a537..b28c602c2 100644
--- a/scripts/check_if_new_migration.py
+++ b/scripts/check_if_new_migration.py
@@ -1,7 +1,8 @@
 import os
-from os.path import dirname, abspath
-import requests
 import sys
+from os.path import abspath, dirname
+
+import requests
 
 
 def get_latest_db_migration_to_apply():
diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py
index fb07e8d78..aa7a49626 100644
--- a/tests/app/service_invite/test_service_invite_rest.py
+++ b/tests/app/service_invite/test_service_invite_rest.py
@@ -1,6 +1,6 @@
-from functools import partial
 import json
 import uuid
+from functools import partial
 
 import pytest
 from flask import current_app
@@ -208,6 +208,7 @@ def test_resend_expired_invite(client, sample_expired_user, mocker):
     mock_send = mocker.patch("app.service_invite.rest.send_notification_to_queue")
     mock_persist = mocker.patch("app.service_invite.rest.persist_notification")
     from app.notifications.process_notifications import persist_notification
+
     mock_persist.side_effect = partial(persist_notification, simulated=True)
     auth_header = create_admin_authorization_header()
     response = client.post(

From e4f228ca0d63a19e179b29561299a3e6db44c296 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Fri, 8 Dec 2023 22:01:27 -0500
Subject: [PATCH 08/13] More test fixes.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/commands.py                                      | 3 ++-
 app/service_invite/rest.py                           | 1 -
 tests/app/service_invite/test_service_invite_rest.py | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/commands.py b/app/commands.py
index 1883a8a57..5f73bc3b6 100644
--- a/app/commands.py
+++ b/app/commands.py
@@ -325,7 +325,8 @@ def update_jobs_archived_flag(start_date, end_date):
         )
         db.session.commit()
         current_app.logger.info(
-            f"jobs: --- Completed took {datetime.now() - start_time}ms. Archived {result.rowcount} jobs for {process_date}"
+            f"jobs: --- Completed took {datetime.now() - start_time}ms. Archived "
+            f"{result.rowcount} jobs for {process_date}"
         )
 
         process_date += timedelta(days=1)
diff --git a/app/service_invite/rest.py b/app/service_invite/rest.py
index dbc706ce1..419713688 100644
--- a/app/service_invite/rest.py
+++ b/app/service_invite/rest.py
@@ -1,5 +1,4 @@
 from datetime import datetime
-from re import I
 
 from flask import Blueprint, current_app, jsonify, request
 from itsdangerous import BadData, SignatureExpired
diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py
index aa7a49626..cd499fdb2 100644
--- a/tests/app/service_invite/test_service_invite_rest.py
+++ b/tests/app/service_invite/test_service_invite_rest.py
@@ -213,7 +213,6 @@ def test_resend_expired_invite(client, sample_expired_user, mocker):
     auth_header = create_admin_authorization_header()
     response = client.post(
         url,
-        data=json.dumps(data),
         headers=[("Content-Type", "application/json"), auth_header],
     )
 

From 81b5afc983199a8f94f63b93f9d1850f5d178cd5 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Tue, 12 Dec 2023 09:13:43 -0500
Subject: [PATCH 09/13] Fixing tests.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/commands.py b/app/commands.py
index 5f73bc3b6..32cbd219b 100644
--- a/app/commands.py
+++ b/app/commands.py
@@ -319,7 +319,7 @@ def update_jobs_archived_flag(start_date, end_date):
                 where
                     created_at >= (date :start + time '00:00:00')
                     and created_at < (date :end + time '00:00:00')
-               """
+        """
         result = db.session.execute(
             sql, {"start": process_date, "end": process_date + timedelta(days=1)}
         )

From b72ae4374f0d5da65333fc71503bf67727dd73e6 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Wed, 13 Dec 2023 10:14:14 -0500
Subject: [PATCH 10/13] Working on tests.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/dao/invited_user_dao.py                          | 2 +-
 tests/app/service_invite/test_service_invite_rest.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/dao/invited_user_dao.py b/app/dao/invited_user_dao.py
index c045489e8..ad4ab0a65 100644
--- a/app/dao/invited_user_dao.py
+++ b/app/dao/invited_user_dao.py
@@ -33,7 +33,7 @@ def expire_invitations_created_more_than_two_days_ago():
         db.session.query(InvitedUser)
         .filter(
             InvitedUser.created_at <= datetime.utcnow() - timedelta(days=2),
-            InvitedUser.status.in_(INVITE_PENDING),
+            InvitedUser.status.in_((INVITE_PENDING,)),
         )
         .update({InvitedUser.status: INVITE_EXPIRED})
     )
diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py
index cd499fdb2..fede2596f 100644
--- a/tests/app/service_invite/test_service_invite_rest.py
+++ b/tests/app/service_invite/test_service_invite_rest.py
@@ -204,7 +204,7 @@ def test_get_invited_user_by_service_when_user_does_not_belong_to_the_service(
 
 
 def test_resend_expired_invite(client, sample_expired_user, mocker):
-    url = f"/service/{sample_expired_user.service_id}/invite/{sample_expired_user.id}"
+    url = f"/service/{sample_expired_user.service_id}/invite/{sample_expired_user.id}/resend"
     mock_send = mocker.patch("app.service_invite.rest.send_notification_to_queue")
     mock_persist = mocker.patch("app.service_invite.rest.persist_notification")
     from app.notifications.process_notifications import persist_notification

From 61d294292bf605a531d5385f0f1f00d6ea14df33 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Fri, 15 Dec 2023 13:14:53 -0500
Subject: [PATCH 11/13] Did stuff, fixed things. This seems to work now.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/service_invite/rest.py                           | 2 ++
 tests/app/service_invite/test_service_invite_rest.py | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/service_invite/rest.py b/app/service_invite/rest.py
index 419713688..882c6e346 100644
--- a/app/service_invite/rest.py
+++ b/app/service_invite/rest.py
@@ -30,6 +30,7 @@ def _create_service_invite(invited_user, invite_link_host):
     template_id = current_app.config["INVITATION_EMAIL_TEMPLATE_ID"]
 
     template = dao_get_template_by_id(template_id)
+
     service = Service.query.get(current_app.config["NOTIFY_SERVICE_ID"])
 
     saved_notification = persist_notification(
@@ -116,6 +117,7 @@ def resend_service_invite(service_id, invited_user_id):
 
     current_data = {k: v for k, v in invited_user_schema.dump(fetched).items()}
     update_dict = invited_user_schema.load(current_data)
+
     save_invited_user(update_dict)
 
     _create_service_invite(fetched, current_app.config["ADMIN_BASE_URL"])
diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py
index fede2596f..e4ac9532c 100644
--- a/tests/app/service_invite/test_service_invite_rest.py
+++ b/tests/app/service_invite/test_service_invite_rest.py
@@ -203,7 +203,12 @@ def test_get_invited_user_by_service_when_user_does_not_belong_to_the_service(
     assert json_resp["result"] == "error"
 
 
-def test_resend_expired_invite(client, sample_expired_user, mocker):
+def test_resend_expired_invite(
+    client,
+    sample_expired_user,
+    invitation_email_template,
+    mocker,
+):
     url = f"/service/{sample_expired_user.service_id}/invite/{sample_expired_user.id}/resend"
     mock_send = mocker.patch("app.service_invite.rest.send_notification_to_queue")
     mock_persist = mocker.patch("app.service_invite.rest.persist_notification")

From ff70dc9b8bc37fa56cdc1eb2c165efc7d0181e0d Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Wed, 20 Dec 2023 08:15:19 -0500
Subject: [PATCH 12/13] Filtering the rest endpoint for resending invites by
 status = pending now.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/service_invite/rest.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/service_invite/rest.py b/app/service_invite/rest.py
index 882c6e346..19102c12b 100644
--- a/app/service_invite/rest.py
+++ b/app/service_invite/rest.py
@@ -14,7 +14,13 @@ from app.dao.invited_user_dao import (
 )
 from app.dao.templates_dao import dao_get_template_by_id
 from app.errors import InvalidRequest, register_errors
-from app.models import EMAIL_TYPE, INVITE_PENDING, KEY_TYPE_NORMAL, Service
+from app.models import (
+    EMAIL_TYPE,
+    INVITE_EXPIRED,
+    INVITE_PENDING,
+    KEY_TYPE_NORMAL,
+    Service,
+)
 from app.notifications.process_notifications import (
     persist_notification,
     send_notification_to_queue,
@@ -109,7 +115,9 @@ def resend_service_invite(service_id, invited_user_id):
         This ignores the POST data entirely.
     """
     fetched = get_invited_user_by_service_and_id(
-        service_id=service_id, invited_user_id=invited_user_id
+        service_id=service_id,
+        invited_user_id=invited_user_id,
+        status=INVITE_EXPIRED,
     )
 
     fetched.created_at = datetime.utcnow()

From affc5e7aff5a8bbc562dba5b154e8bca0cabb222 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Wed, 20 Dec 2023 09:51:43 -0500
Subject: [PATCH 13/13] Fixing stuff.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/dao/invited_user_dao.py |  8 ++++++++
 app/service_invite/rest.py  | 12 +++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/dao/invited_user_dao.py b/app/dao/invited_user_dao.py
index ad4ab0a65..2e807c069 100644
--- a/app/dao/invited_user_dao.py
+++ b/app/dao/invited_user_dao.py
@@ -16,6 +16,14 @@ def get_invited_user_by_service_and_id(service_id, invited_user_id):
     ).one()
 
 
+def get_expired_invite_by_service_and_id(service_id, invited_user_id):
+    return InvitedUser.query.filter(
+        InvitedUser.service_id == service_id,
+        InvitedUser.id == invited_user_id,
+        InvitedUser.status == INVITE_EXPIRED,
+    ).one()
+
+
 def get_invited_user_by_id(invited_user_id):
     return InvitedUser.query.filter(InvitedUser.id == invited_user_id).one()
 
diff --git a/app/service_invite/rest.py b/app/service_invite/rest.py
index 19102c12b..e18d158ac 100644
--- a/app/service_invite/rest.py
+++ b/app/service_invite/rest.py
@@ -6,6 +6,7 @@ from notifications_utils.url_safe_token import check_token, generate_token
 
 from app.config import QueueNames
 from app.dao.invited_user_dao import (
+    get_expired_invite_by_service_and_id,
     get_expired_invited_users_for_service,
     get_invited_user_by_id,
     get_invited_user_by_service_and_id,
@@ -14,13 +15,7 @@ from app.dao.invited_user_dao import (
 )
 from app.dao.templates_dao import dao_get_template_by_id
 from app.errors import InvalidRequest, register_errors
-from app.models import (
-    EMAIL_TYPE,
-    INVITE_EXPIRED,
-    INVITE_PENDING,
-    KEY_TYPE_NORMAL,
-    Service,
-)
+from app.models import EMAIL_TYPE, INVITE_PENDING, KEY_TYPE_NORMAL, Service
 from app.notifications.process_notifications import (
     persist_notification,
     send_notification_to_queue,
@@ -114,10 +109,9 @@ def resend_service_invite(service_id, invited_user_id):
     Note:
         This ignores the POST data entirely.
     """
-    fetched = get_invited_user_by_service_and_id(
+    fetched = get_expired_invite_by_service_and_id(
         service_id=service_id,
         invited_user_id=invited_user_id,
-        status=INVITE_EXPIRED,
     )
 
     fetched.created_at = datetime.utcnow()