From f72922ffb1393f88ceabf1a48dab2aa363199e9e Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 6 Dec 2023 10:13:27 -0500 Subject: [PATCH 1/2] Remove unused variable This changeset follows up PR #636 to remove a variable no longer used in the go live email template. Signed-off-by: Carlo Costino --- app/service/rest.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/service/rest.py b/app/service/rest.py index 9a833eaab..05635a1da 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -261,8 +261,7 @@ def update_service(service_id): service_id=service_id, template_id=current_app.config["SERVICE_NOW_LIVE_TEMPLATE_ID"], personalisation={ - "service_name": current_data["name"], - "message_limit": "{:,}".format(current_data["message_limit"]), + "service_name": current_data["name"] }, include_user_fields=["name"], ) From 5ae2335c82a782802f6c08390d246ac2c1776251 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 6 Dec 2023 11:11:00 -0500 Subject: [PATCH 2/2] Update failing test; include blackened files Signed-off-by: Carlo Costino --- app/service/rest.py | 4 +--- migrations/versions/0407_fix_preferred_timezone.py | 5 +++-- migrations/versions/0408_fix_timezone_again.py | 5 +++-- tests/app/service/test_rest.py | 5 +---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/service/rest.py b/app/service/rest.py index 05635a1da..99d2b4c97 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -260,9 +260,7 @@ def update_service(service_id): send_notification_to_service_users( service_id=service_id, template_id=current_app.config["SERVICE_NOW_LIVE_TEMPLATE_ID"], - personalisation={ - "service_name": current_data["name"] - }, + personalisation={"service_name": current_data["name"]}, include_user_fields=["name"], ) 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/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 9cf0829ea..ce6afc065 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -2399,10 +2399,7 @@ def test_update_service_calls_send_notification_as_service_becomes_live( send_notification_mock.assert_called_once_with( service_id=restricted_service.id, template_id="618185c6-3636-49cd-b7d2-6f6f5eb3bdde", - personalisation={ - "service_name": restricted_service.name, - "message_limit": "1,000", - }, + personalisation={"service_name": restricted_service.name}, include_user_fields=["name"], )