darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 01:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2678 from alphagov/convert-uuid-to-str

Browse Source 
Use .format instead of concatenation to avoid type issues
This commit is contained in:
Pea M. Tyczynska
2019-12-11 12:10:20 +00:00
committed by GitHub
parent 1555d218c9 c00f82b81b
commit 8f9930792a
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/celery/scheduled_tasks.py
View File

@@ -271,14 +271,20 @@ def check_for_services_with_high_failure_rates_or_sending_to_tv_numbers():
len(services_with_failures) len(services_with_failures)
) )
for service in services_with_failures: for service in services_with_failures:
service_dashboard = current_app.config['ADMIN_BASE_URL'] + "/services/" + service.service_id service_dashboard = "{}/services/{}".format(
current_app.config['ADMIN_BASE_URL'],
str(service.service_id),
)
message += "service: {} failure rate: {},\n".format(service_dashboard, service.permanent_failure_rate) message += "service: {} failure rate: {},\n".format(service_dashboard, service.permanent_failure_rate)
elif services_sending_to_tv_numbers: elif services_sending_to_tv_numbers:
message += "{} service(s) have sent over 100 sms messages to tv numbers in last 24 hours:\n".format( message += "{} service(s) have sent over 100 sms messages to tv numbers in last 24 hours:\n".format(
len(services_sending_to_tv_numbers) len(services_sending_to_tv_numbers)
) )
for service in services_sending_to_tv_numbers: for service in services_sending_to_tv_numbers:
service_dashboard = current_app.config['ADMIN_BASE_URL'] + "/services/" + service.service_id service_dashboard = "{}/services/{}".format(
current_app.config['ADMIN_BASE_URL'],
str(service.service_id),
)
message += "service: {} count of sms to tv numbers: {},\n".format( message += "service: {} count of sms to tv numbers: {},\n".format(
service_dashboard, service.notification_count service_dashboard, service.notification_count
) )

8
tests/app/celery/test_scheduled_tasks.py
View File

@@ -519,16 +519,16 @@ MockServicesWithHighFailureRate = namedtuple(
[MockServicesWithHighFailureRate("123", 0.3)], [MockServicesWithHighFailureRate("123", 0.3)],
[], [],
"1 service(s) have had high permanent-failure rates for sms messages in last " "1 service(s) have had high permanent-failure rates for sms messages in last "
"24 hours:\nservice: {} failure rate: 0.3,\n".format( "24 hours:\nservice: {}/services/{} failure rate: 0.3,\n".format(
Config.ADMIN_BASE_URL + "/services/" + "123" Config.ADMIN_BASE_URL, "123"
) )
], ],
[ [
[], [],
[MockServicesSendingToTVNumbers("123", 300)], [MockServicesSendingToTVNumbers("123", 300)],
"1 service(s) have sent over 100 sms messages to tv numbers in last 24 hours:\n" "1 service(s) have sent over 100 sms messages to tv numbers in last 24 hours:\n"
"service: {} count of sms to tv numbers: 300,\n".format( "service: {}/services/{} count of sms to tv numbers: 300,\n".format(
Config.ADMIN_BASE_URL + "/services/" + "123" Config.ADMIN_BASE_URL, "123"
) )
] ]
]) ])