darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-23 17:39:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Let users send inbound emoji

Browse Source 
Implements:
- [ ] https://github.com/alphagov/notifications-utils/pull/167

Required some refactoring to be able to defined the `is_inbound`
variable.
This commit is contained in:
Chris Hill-Scott
2017-06-07 15:46:34 +01:00
parent 085f5f9b22
commit bff9365d1b
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/main/views/conversation.py
View File

@@ -33,23 +33,23 @@ def get_user_number(service_id, notification_id):
def get_sms_thread(service_id, user_number):
return [
{
'inbound': ('notify_number' in notification),
for notification in sorted((
notification_api_client.get_notifications_for_service(service_id, to=user_number)['notifications'] +
service_api_client.get_inbound_sms(service_id, user_number=user_number)
), key=lambda notification: notification['created_at']):
is_inbound = ('notify_number' in notification)
yield {
'inbound': is_inbound,
'content': SMSPreviewTemplate(
{
'content': notification.get('content') or notification['template']['content']
}
},
downgrade_non_gsm_characters=(not is_inbound)
),
'created_at': notification['created_at'],
'status': notification.get('status'),
'id': notification['id'],
}
for notification in sorted(
(
notification_api_client.get_notifications_for_service(service_id, to=user_number)['notifications'] +
service_api_client.get_inbound_sms(service_id, user_number=user_number)
),
key=lambda notification: notification['created_at'],
)
]

2
requirements.txt
View File

@@ -28,4 +28,4 @@ notifications-python-client>=3.1,<3.2
awscli>=1.11,<1.12
awscli-cwlogs>=1.4,<1.5
git+https://github.com/alphagov/notifications-utils.git@17.2.0#egg=notifications-utils==17.2.0
git+https://github.com/alphagov/notifications-utils.git@17.3.0#egg=notifications-utils==17.3.0

7
tests/app/main/views/test_conversation.py
View File

@@ -76,8 +76,6 @@ def test_view_conversation(
expected,
):
print(index)
response = logged_in_client.get(url_for(
'main.conversation',
service_id=SERVICE_ONE_ID,
@@ -89,9 +87,8 @@ def test_view_conversation(
messages = page.select('.sms-message-wrapper')
statuses = page.select('.sms-message-status')
for elements in (messages, statuses):
assert len(elements) == 13
assert len(messages) == 13
assert len(statuses) == 13
assert (
normalize_spaces(messages[index].text),
normalize_spaces(statuses[index].text),