darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 01:08:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Display if broadcast was cancelled via API

Browse Source 
If broadcast_message has no value under cancelled_by_id, display
in the view that it was cancelled by an API call.
This commit is contained in:
Pea Tyczynska
2022-01-18 12:23:20 +00:00
parent f9fe0a460d
commit 78681eb452
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/broadcast_message.py
View File

@@ -181,7 +181,9 @@ class BroadcastMessage(JSONModel):
@cached_property @cached_property
def cancelled_by(self): def cancelled_by(self):
return User.from_id(self.cancelled_by_id) if not self.cancelled_by_id:
return "an API call"
return User.from_id(self.cancelled_by_id).name
@cached_property @cached_property
def count_of_phones(self): def count_of_phones(self):

2
app/templates/views/broadcast/view-message.html
View File

@@ -212,7 +212,7 @@
</p> </p>
{% elif broadcast_message.status == 'cancelled' %} {% elif broadcast_message.status == 'cancelled' %}
<p class="govuk-body"> <p class="govuk-body">
Stopped by {{ broadcast_message.cancelled_by.name }} Stopped by {{ broadcast_message.cancelled_by }}
{{ broadcast_message.cancelled_at|format_datetime_human }}. {{ broadcast_message.cancelled_at|format_datetime_human }}.
</p> </p>
{% elif broadcast_message.status == 'completed' %} {% elif broadcast_message.status == 'completed' %}

9
tests/app/main/views/test_broadcast.py
View File

@@ -1695,6 +1695,15 @@ def test_start_broadcasting(
'Created by Alice and approved by Bob.', 'Created by Alice and approved by Bob.',
'Stopped by Carol yesterday at 9:21pm.', 'Stopped by Carol yesterday at 9:21pm.',
]), ]),
('.view_previous_broadcast', False, {
'status': 'cancelled',
'cancelled_by_id': None,
'cancelled_at': '2020-02-21T21:21:21.000000',
}, [
'Sent on 20 February at 8:20pm.',
'Created by Alice and approved by Bob.',
'Stopped by an API call yesterday at 9:21pm.',
]),
('.view_rejected_broadcast', False, { ('.view_rejected_broadcast', False, {
'status': 'rejected', 'status': 'rejected',
'updated_at': '2020-02-21T21:21:21.000000', 'updated_at': '2020-02-21T21:21:21.000000',