From 937dd77f4fa5b90584e3d55da0cba168181441ae Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 3 Nov 2023 10:27:45 -0700 Subject: [PATCH] fix some tests --- app/models.py | 9 ++++++++- tests/app/job/test_rest.py | 2 ++ tests/app/v2/notifications/test_get_notifications.py | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/models.py b/app/models.py index c46aa6bd9..e43fd1913 100644 --- a/app/models.py +++ b/app/models.py @@ -554,8 +554,13 @@ class Service(db.Model, Versioned): def get_default_sms_sender(self): default_sms_sender = [x for x in self.service_sms_senders if x.is_default] - # return "sns" return default_sms_sender[0].sms_sender + if default_sms_sender: + return default_sms_sender[0].sms_sender + # Right now there is no default_sms_sender if we just go to 'Send messages' and click on a template. + # It will blow up. What should we return if no default sender? Testing locally, the app seems happy + # with anything. + return "sns" def get_default_reply_to_email_address(self): default_reply_to = [x for x in self.reply_to_email_addresses if x.is_default] @@ -1761,6 +1766,8 @@ class Notification(db.Model): "template_name": self.template.name, "template_type": self.template.template_type, "job_name": self.job.original_file_name if self.job else "", + "carrier": self.carrier, + "provider_response": self.provider_response, "status": self.formatted_status, "created_at": self.created_at.strftime("%Y-%m-%d %H:%M:%S"), "created_by_name": self.get_created_by_name(), diff --git a/tests/app/job/test_rest.py b/tests/app/job/test_rest.py index 87ac6aeb4..56f2461b1 100644 --- a/tests/app/job/test_rest.py +++ b/tests/app/job/test_rest.py @@ -830,6 +830,8 @@ def test_get_all_notifications_for_job_returns_csv_format( "template_type", "template_name", "job_name", + "carrier", + "provider_response", "status", "row_number", "recipient", diff --git a/tests/app/v2/notifications/test_get_notifications.py b/tests/app/v2/notifications/test_get_notifications.py index be03595b9..4229b2cc2 100644 --- a/tests/app/v2/notifications/test_get_notifications.py +++ b/tests/app/v2/notifications/test_get_notifications.py @@ -123,7 +123,7 @@ def test_get_notification_by_id_with_placeholders_returns_200( "completed_at": sample_notification.completed_at(), "scheduled_for": None, "provider_response": None, - "carrier": None + "carrier": None, } assert json_response == expected_response