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

Refactored the get_detailed_services to stop using marshmallow.

Browse Source 
Also removed an extra query to services.
The query has been refactored to use an outer join to services on the notifications or notification_history table.
The expectation is that this change will improve the performance of the trial/live-services pages for platform admins.
This commit is contained in:
Rebecca Law
2017-10-26 12:15:52 +01:00
parent 61a68a2d13
commit 1998034b52
4 changed files with 50 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/app/dao/test_services_dao.py
View File

@@ -682,7 +682,7 @@ def test_dao_fetch_todays_stats_for_all_services_includes_all_services(notify_db
assert stats == sorted(stats, key=lambda x: x.service_id)
def test_dao_fetch_todays_stats_for_all_services_only_includes_today(notify_db):
def test_dao_fetch_todays_stats_for_all_services_only_includes_today(notify_db, notify_db_session):
with freeze_time('2001-01-01T23:59:00'):
just_before_midnight_yesterday = create_notification(notify_db, None, to_field='1', status='delivered')
@@ -712,10 +712,14 @@ def test_dao_fetch_todays_stats_for_all_services_groups_correctly(notify_db, not
stats = dao_fetch_todays_stats_for_all_services()
assert len(stats) == 4
assert (service1.id, service1.name, service1.restricted, service1.research_mode, 'sms', 'created', 2) in stats
assert (service1.id, service1.name, service1.restricted, service1.research_mode, 'sms', 'failed', 1) in stats
assert (service1.id, service1.name, service1.restricted, service1.research_mode, 'email', 'created', 1) in stats
assert (service2.id, service2.name, service2.restricted, service2.research_mode, 'sms', 'created', 1) in stats
assert (service1.id, service1.name, service1.restricted, service1.research_mode, service1.active,
service1.created_at, 'sms', 'created', 2) in stats
assert (service1.id, service1.name, service1.restricted, service1.research_mode, service1.active,
service1.created_at, 'sms', 'failed', 1) in stats
assert (service1.id, service1.name, service1.restricted, service1.research_mode, service1.active,
service1.created_at, 'email', 'created', 1) in stats
assert (service2.id, service2.name, service2.restricted, service2.research_mode, service2.active,
service2.created_at, 'sms', 'created', 1) in stats
def test_dao_fetch_todays_stats_for_all_services_includes_all_keys_by_default(notify_db, notify_db_session):
@@ -754,7 +758,8 @@ def test_fetch_stats_by_date_range_for_all_services(notify_db, notify_db_session
assert len(results) == 1
assert results[0] == (result_one.service.id, result_one.service.name, result_one.service.restricted,
result_one.service.research_mode, 'sms', 'created', 2)
result_one.service.research_mode, result_one.service.active,
result_one.service.created_at, 'sms', 'created', 2)
@freeze_time('2001-01-01T23:59:00')
@@ -794,7 +799,8 @@ def test_fetch_stats_by_date_range_for_all_services_returns_test_notifications(n
assert len(results) == 1
assert results[0] == (result_one.service.id, result_one.service.name, result_one.service.restricted,
result_one.service.research_mode, 'sms', 'created', int(expected))
result_one.service.research_mode, result_one.service.active, result_one.service.created_at,
'sms', 'created', int(expected))
@pytest.mark.parametrize("start_delta, end_delta, expected",
@@ -822,7 +828,8 @@ def test_fetch_stats_by_date_range_during_bst_hour_for_all_services_returns_test
assert len(results) == 1
assert results[0] == (result_one.service.id, result_one.service.name, result_one.service.restricted,
result_one.service.research_mode, 'sms', 'created', int(expected))
result_one.service.research_mode, result_one.service.active, result_one.service.created_at,
'sms', 'created', int(expected))
@freeze_time('2001-01-01T23:59:00')