darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-23 07:46:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #378 from alphagov/order-templates-created-at

Browse Source 
Order templates by newest created first
This commit is contained in:
Chris Hill-Scott
2016-06-06 11:17:21 +01:00
parent eae0c252a0 c2ae4773da
commit e51f6c6916
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/templates_dao.py
View File

@@ -45,7 +45,7 @@ def dao_get_all_templates_for_service(service_id):
service_id=service_id, service_id=service_id,
archived=False archived=False
).order_by( ).order_by(
asc(Template.updated_at), asc(Template.created_at) desc(Template.created_at)
).all() ).all()

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

@@ -99,7 +99,7 @@ def test_get_all_templates_for_service(notify_db, notify_db_session, service_fac
assert len(dao_get_all_templates_for_service(service_2.id)) == 2 assert len(dao_get_all_templates_for_service(service_2.id)) == 2
def test_get_all_templates_for_service_in_created_order(notify_db, notify_db_session, sample_service): def test_get_all_templates_for_service_shows_newest_created_first(notify_db, notify_db_session, sample_service):
template_1 = create_sample_template( template_1 = create_sample_template(
notify_db, notify_db,
notify_db_session, notify_db_session,
@@ -126,13 +126,14 @@ def test_get_all_templates_for_service_in_created_order(notify_db, notify_db_ses
) )
assert Template.query.count() == 3 assert Template.query.count() == 3
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 1' assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 3'
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)[1].name == 'Sample Template 2'
assert dao_get_all_templates_for_service(sample_service.id)[2].name == 'Sample Template 3' assert dao_get_all_templates_for_service(sample_service.id)[2].name == 'Sample Template 1'
template_2.name = 'Sample Template 2 (updated)' template_2.name = 'Sample Template 2 (updated)'
dao_update_template(template_2) dao_update_template(template_2)
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 2 (updated)' assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 3'
assert dao_get_all_templates_for_service(sample_service.id)[1].name == 'Sample Template 2 (updated)'
def test_get_all_returns_empty_list_if_no_templates(sample_service): def test_get_all_returns_empty_list_if_no_templates(sample_service):

4
tests/app/template/test_rest.py
View File

@@ -250,10 +250,10 @@ def test_should_be_able_to_get_all_templates_for_a_service(notify_api, sample_us
assert response.status_code == 200 assert response.status_code == 200
update_json_resp = json.loads(response.get_data(as_text=True)) update_json_resp = json.loads(response.get_data(as_text=True))
assert update_json_resp['data'][0]['name'] == 'my template 1' assert update_json_resp['data'][0]['name'] == 'my template 2'
assert update_json_resp['data'][0]['version'] == 1 assert update_json_resp['data'][0]['version'] == 1
assert update_json_resp['data'][0]['created_at'] assert update_json_resp['data'][0]['created_at']
assert update_json_resp['data'][1]['name'] == 'my template 2' assert update_json_resp['data'][1]['name'] == 'my template 1'
assert update_json_resp['data'][1]['version'] == 1 assert update_json_resp['data'][1]['version'] == 1
assert update_json_resp['data'][1]['created_at'] assert update_json_resp['data'][1]['created_at']