darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-24 01:11:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #218 from alphagov/order-templates-updated

Browse Source 
Order templates by last updated date
This commit is contained in:
Chris Hill-Scott
2016-04-12 15:26:20 +01:00
parent 2abdad8d20 29b9e50952
commit 19b3a53499
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/dao/templates_dao.py
View File

@@ -22,4 +22,8 @@ def dao_get_template_by_id(template_id):
def dao_get_all_templates_for_service(service_id):
return Template.query.filter_by(service=Service.query.get(service_id)).order_by(asc(Template.created_at)).all()
return Template.query.filter_by(
service=Service.query.get(service_id)
).order_by(
asc(Template.updated_at), asc(Template.created_at)
).all()

4
tests/app/dao/test_templates_dao.py
View File

@@ -136,6 +136,10 @@ def test_get_all_templates_for_service_in_created_order(sample_service):
assert dao_get_all_templates_for_service(sample_service.id)[1].name == 'Sample Template 2'
assert dao_get_all_templates_for_service(sample_service.id)[2].name == 'Sample Template 3'
template_2.name = 'Sample Template 2 (updated)'
dao_update_template(template_2)
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 2 (updated)'
def test_get_all_returns_empty_list_if_no_templates(sample_service):
assert Template.query.count() == 0