darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-10 13:23:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #585 from alphagov/format-failures

Browse Source 
Notifications page filters
This commit is contained in:
Rebecca Law
2016-05-18 12:19:10 +01:00
parent 97b268182b 6c14d925c5
commit 613ff1a05e
6 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/__init__.py
View File

@@ -108,6 +108,7 @@ def create_app():
application.add_template_filter(linkable_name)
application.add_template_filter(format_date)
application.add_template_filter(format_date_short)
application.add_template_filter(format_notification_status)
application.after_request(useful_headers_after_request)
application.after_request(save_service_after_request)
@@ -218,6 +219,17 @@ def valid_phone_number(phone_number):
return False
def format_notification_status(status):
m = {'failed': 'Failed',
'technical-failure': 'Technical failure',
'temporary-failure': 'Temporarily failed',
'permanent-failure': 'Permanently failed',
'delivered': 'Delivered',
'sending': 'Sending'
}
return m.get(status, status)
@login_manager.user_loader
def load_user(user_id):
return user_api_client.get_user(user_id)

23
app/main/views/jobs.py
View File

@@ -41,6 +41,20 @@ def _parse_filter_args(filter_dict):
)
def _set_status_filters(filter_args):
if filter_args.get('status'):
if 'failed' in filter_args.get('status'):
filter_args['status'].extend(['temporary-failure', 'permanent-failure', 'technical-failure'])
else:
# default to everything
filter_args['status'] = ['delivered', 'failed', 'temporary-failure', 'permanent-failure', 'technical-failure']
def _set_template_filters(filter_args):
if not filter_args.get('template_type'):
filter_args['template_type'] = ['email', 'sms']
@main.route("/services/<service_id>/jobs")
@login_required
@user_has_permissions('view_activity', admin_override=True)
@@ -119,12 +133,14 @@ def view_notifications(service_id):
abort(404, "Invalid page argument ({}) reverting to page 1.".format(request.args['page'], None))
filter_args = _parse_filter_args(request.args)
_set_status_filters(filter_args)
_set_template_filters(filter_args)
notifications = notification_api_client.get_notifications_for_service(
service_id=service_id,
page=page,
template_type=filter_args.get('template_type') if 'template_type' in filter_args else ['email', 'sms'],
status=filter_args.get('status') if 'status' in filter_args else ['delivered', 'failed'],
template_type=filter_args.get('template_type'),
status=filter_args.get('status'),
limit_days=current_app.config['ACTIVITY_STATS_LIMIT_DAYS'])
view_dict = MultiDict(request.args)
prev_page = None
@@ -152,8 +168,7 @@ def view_notifications(service_id):
page=page,
page_size=notifications['total'],
template_type=filter_args.get('template_type') if 'template_type' in filter_args else ['email', 'sms'],
status=filter_args.get('status')
if 'status' in filter_args else ['delivered', 'failed'],
status=filter_args.get('status'),
limit_days=current_app.config['ACTIVITY_STATS_LIMIT_DAYS'])['notifications'])
return csv_content, 200, {
'Content-Type': 'text/csv; charset=utf-8',

2
app/templates/partials/jobs/notifications.html
View File

@@ -27,7 +27,7 @@
align='right',
status='error' if item.status == 'Failed' else 'default'
) %}
{{ item.status|title }} at {{ item.updated_at|format_time }}
{{ item.status|format_notification_status }} at {{ item.updated_at|format_time }}
{% endcall %}
{% endcall %}
</div>

2
app/templates/views/notifications.html
View File

@@ -91,7 +91,7 @@
</p>
{% endcall %}
{{ text_field(item.status|capitalize) }}
{{ text_field(item.status|format_notification_status) }}
{% call field(align='right') %}
{{ item.updated_at|format_datetime_short }}

2
tests/__init__.py
View File

@@ -159,7 +159,7 @@ def notification_json(service_id,
job=None,
template=None,
to='07123456789',
status='sent',
status='delivered',
sent_at=None,
created_at=None,
updated_at=None,

12
tests/app/main/views/test_jobs.py
View File

@@ -47,7 +47,7 @@ def test_should_show_page_for_one_job(
content = response.get_data(as_text=True)
assert "{}: Your vehicle tax is about to expire".format(service_one['name']) in content
assert file_name in content
assert "Sent at 11:10" in content
assert "Delivered at 11:10" in content
def test_should_show_updates_for_one_job_as_json(
@@ -95,7 +95,7 @@ def test_should_show_notifications_for_a_service(app_,
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Activity'
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['delivered', 'failed'], template_type=['email', 'sms']) # noqa
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['delivered', 'failed', 'temporary-failure', 'permanent-failure', 'technical-failure'], template_type=['email', 'sms']) # noqa
def test_can_view_only_sms_notifications_for_a_service(app_,
@@ -123,7 +123,7 @@ def test_can_view_only_sms_notifications_for_a_service(app_,
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Text messages'
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['delivered', 'failed'], template_type=['sms']) # noqa
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['delivered', 'failed', 'temporary-failure', 'permanent-failure', 'technical-failure'], template_type=['sms']) # noqa
def test_can_view_only_email_notifications_for_a_service(app_,
@@ -151,7 +151,7 @@ def test_can_view_only_email_notifications_for_a_service(app_,
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Emails'
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['delivered', 'failed'], template_type=['email']) # noqa
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['delivered', 'failed', 'temporary-failure', 'permanent-failure', 'technical-failure'], template_type=['email']) # noqa
def test_can_view_successful_notifications_for_a_service(app_,
@@ -203,7 +203,7 @@ def test_can_view_failed_notifications_for_a_service(app_,
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Failed emails and text messages'
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['failed'], template_type=['email', 'sms']) # noqa
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['failed', 'temporary-failure', 'permanent-failure', 'technical-failure'], template_type=['email', 'sms']) # noqa
def test_can_view_failed_combination_of_notification_type_and_status(
@@ -225,7 +225,7 @@ def test_can_view_failed_combination_of_notification_type_and_status(
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Failed text messages'
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['failed'], template_type=['sms']) # noqa
mock_get_notifications.assert_called_with(limit_days=7, page=1, service_id=service_one['id'], status=['failed', 'temporary-failure', 'permanent-failure', 'technical-failure'], template_type=['sms']) # noqa
def test_should_show_notifications_for_a_service_with_next_previous(app_,