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

Merge pull request #399 from alphagov/order-template-api

Browse Source 
fix template api tests being inconsistent by adding ordering
This commit is contained in:
Leo Hemsted
2016-06-09 11:59:33 +01:00
parent 511e65b9f9 3e72440f38
commit c14cb5c291
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/notifications_dao.py
View File

@@ -142,6 +142,8 @@ def dao_get_template_statistics_for_service(service_id, limit_days=None):
def dao_get_template_statistics_for_template(template_id): def dao_get_template_statistics_for_template(template_id):
return TemplateStatistics.query.filter( return TemplateStatistics.query.filter(
TemplateStatistics.template_id == template_id TemplateStatistics.template_id == template_id
).order_by(
desc(TemplateStatistics.updated_at)
).all() ).all()

11
tests/app/template_statistics/test_rest.py
View File

@@ -168,7 +168,12 @@ def test_get_template_statistics_for_template_only_returns_for_provided_template
service_id=sample_service.id, service_id=sample_service.id,
day=datetime(2001, 1, 1) day=datetime(2001, 1, 1)
) )
db.session.add_all([template_1_stats_1, template_1_stats_2, template_2_stats])
# separate commit to ensure stats_1 has earlier updated_at time
db.session.add(template_1_stats_1)
db.session.commit()
db.session.add_all([template_1_stats_2, template_2_stats])
db.session.commit() db.session.commit()
with notify_api.test_request_context(): with notify_api.test_request_context():
@@ -183,8 +188,8 @@ def test_get_template_statistics_for_template_only_returns_for_provided_template
assert response.status_code == 200 assert response.status_code == 200
json_resp = json.loads(response.get_data(as_text=True)) json_resp = json.loads(response.get_data(as_text=True))
assert len(json_resp['data']) == 2 assert len(json_resp['data']) == 2
assert json_resp['data'][0]['id'] == str(template_1_stats_1.id) assert json_resp['data'][0]['id'] == str(template_1_stats_2.id)
assert json_resp['data'][1]['id'] == str(template_1_stats_2.id) assert json_resp['data'][1]['id'] == str(template_1_stats_1.id)
def test_get_template_statistics_for_template_returns_empty_if_no_statistics( def test_get_template_statistics_for_template_returns_empty_if_no_statistics(