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

Return precompiled_letter flag rather than hidden

Browse Source
This commit is contained in:
Ken Tsang
2018-03-05 18:51:04 +00:00
parent b5a2dbb24e
commit bca858f4a8
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/service/rest.py
View File

@@ -537,7 +537,11 @@ def get_monthly_template_usage(service_id):
'month': i.month, 'month': i.month,
'year': i.year, 'year': i.year,
'count': i.count, 'count': i.count,
'hidden': i.hidden 'precompiled_letter': (
i.template_type == 'letter' and
i.hidden and
i.name == current_app.config['PRECOMPILED_TEMPLATE_NAME']
)
} }
) )

6
app/template_statistics/rest.py
View File

@@ -48,7 +48,11 @@ def get_template_statistics_for_service_by_day(service_id):
'template_id': str(data.template_id), 'template_id': str(data.template_id),
'template_name': data.name, 'template_name': data.name,
'template_type': data.template_type, 'template_type': data.template_type,
'template_hidden': data.hidden 'precompiled_letter': (
data.template_type == 'letter' and
data.hidden and
data.name == current_app.config['PRECOMPILED_TEMPLATE_NAME']
)
} }
return jsonify(data=[serialize(row) for row in stats]) return jsonify(data=[serialize(row) for row in stats])

21
tests/app/service/test_rest.py
View File

@@ -1831,7 +1831,12 @@ def test_get_template_usage_by_month_returns_two_templates(
sample_service sample_service
): ):
template_one = create_template(sample_service, hidden=True) template_one = create_template(
sample_service,
template_type=LETTER_TYPE,
template_name=current_app.config['PRECOMPILED_TEMPLATE_NAME'],
hidden=True
)
# add a historical notification for template # add a historical notification for template
not1 = create_notification_history( not1 = create_notification_history(
@@ -1889,7 +1894,7 @@ def test_get_template_usage_by_month_returns_two_templates(
assert resp_json[0]["month"] == 4 assert resp_json[0]["month"] == 4
assert resp_json[0]["year"] == 2017 assert resp_json[0]["year"] == 2017
assert resp_json[0]["count"] == 1 assert resp_json[0]["count"] == 1
assert resp_json[0]["hidden"] is True assert resp_json[0]["precompiled_letter"] is True
assert resp_json[1]["template_id"] == str(sample_template.id) assert resp_json[1]["template_id"] == str(sample_template.id)
assert resp_json[1]["name"] == sample_template.name assert resp_json[1]["name"] == sample_template.name
@@ -1897,7 +1902,7 @@ def test_get_template_usage_by_month_returns_two_templates(
assert resp_json[1]["month"] == 4 assert resp_json[1]["month"] == 4
assert resp_json[1]["year"] == 2017 assert resp_json[1]["year"] == 2017
assert resp_json[1]["count"] == 3 assert resp_json[1]["count"] == 3
assert resp_json[1]["hidden"] is False assert resp_json[1]["precompiled_letter"] is False
assert resp_json[2]["template_id"] == str(sample_template.id) assert resp_json[2]["template_id"] == str(sample_template.id)
assert resp_json[2]["name"] == sample_template.name assert resp_json[2]["name"] == sample_template.name
@@ -1905,7 +1910,7 @@ def test_get_template_usage_by_month_returns_two_templates(
assert resp_json[2]["month"] == 11 assert resp_json[2]["month"] == 11
assert resp_json[2]["year"] == 2017 assert resp_json[2]["year"] == 2017
assert resp_json[2]["count"] == 1 assert resp_json[2]["count"] == 1
assert resp_json[2]["hidden"] is False assert resp_json[2]["precompiled_letter"] is False
def test_search_for_notification_by_to_field(client, notify_db, notify_db_session): def test_search_for_notification_by_to_field(client, notify_db, notify_db_session):
@@ -2142,7 +2147,7 @@ def test_get_notification_for_service_includes_template_redacted(admin_request,
assert resp['template']['redact_personalisation'] is False assert resp['template']['redact_personalisation'] is False
def test_get_notification_for_service_includes_template_hidden(admin_request, sample_notification): def test_get_notification_for_service_includes_precompiled_letter(admin_request, sample_notification):
resp = admin_request.get( resp = admin_request.get(
'service.get_notification_for_service', 'service.get_notification_for_service',
service_id=sample_notification.service_id, service_id=sample_notification.service_id,
@@ -2150,7 +2155,7 @@ def test_get_notification_for_service_includes_template_hidden(admin_request, sa
) )
assert resp['id'] == str(sample_notification.id) assert resp['id'] == str(sample_notification.id)
assert resp['template']['hidden'] is False assert resp['template']['precompiled_letter'] is False
def test_get_all_notifications_for_service_includes_template_redacted(admin_request, sample_service): def test_get_all_notifications_for_service_includes_template_redacted(admin_request, sample_service):
@@ -2197,10 +2202,10 @@ def test_get_all_notifications_for_service_includes_template_hidden(admin_reques
) )
assert resp['notifications'][0]['id'] == str(precompiled_noti.id) assert resp['notifications'][0]['id'] == str(precompiled_noti.id)
assert resp['notifications'][0]['template']['hidden'] is True assert resp['notifications'][0]['template']['precompiled_letter'] is True
assert resp['notifications'][1]['id'] == str(letter_noti.id) assert resp['notifications'][1]['id'] == str(letter_noti.id)
assert resp['notifications'][1]['template']['hidden'] is False assert resp['notifications'][1]['template']['precompiled_letter'] is False
def test_search_for_notification_by_to_field_returns_personlisation( def test_search_for_notification_by_to_field_returns_personlisation(