darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-30 14:31:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2249 from alphagov/improve-performance-of-platform-admin-page

Browse Source 
Improve performance of platform stats page
This commit is contained in:
Rebecca Law
2018-12-12 12:20:13 +00:00
committed by GitHub
parent 8b4655d8af 5b90fd6fb0
commit 4bb68c3e52
6 changed files with 167 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tests/app/dao/notification_dao/test_notification_dao.py
View File

@@ -1,5 +1,5 @@
import uuid
from datetime import datetime, timedelta, date
from datetime import datetime, timedelta
from functools import partial
import pytest
@@ -35,7 +35,6 @@ from app.dao.notifications_dao import (
dao_get_notifications_by_references,
dao_get_notification_history_by_reference,
notifications_not_yet_sent,
fetch_aggregate_stats_by_date_range_for_all_services,
)
from app.dao.services_dao import dao_update_service
from app.models import (
@@ -1787,51 +1786,3 @@ def test_notifications_not_yet_sent_return_no_rows(sample_service, notification_
results = notifications_not_yet_sent(older_than, notification_type)
assert len(results) == 0
def test_fetch_aggregate_stats_by_date_range_for_all_services_returns_empty_list_when_no_stats(notify_db_session):
start_date = date(2018, 1, 1)
end_date = date(2018, 1, 5)
result = fetch_aggregate_stats_by_date_range_for_all_services(start_date, end_date)
assert result == []
@freeze_time('2018-01-08')
def test_fetch_aggregate_stats_by_date_range_for_all_services_groups_stats(
sample_template,
sample_email_template,
sample_letter_template,
):
today = datetime.now().date()
for i in range(3):
create_notification(template=sample_email_template, status='permanent-failure',
created_at=today)
create_notification(template=sample_email_template, status='sent', created_at=today)
create_notification(template=sample_template, status='sent', created_at=today)
create_notification(template=sample_template, status='sent', created_at=today,
key_type=KEY_TYPE_TEAM)
create_notification(template=sample_letter_template, status='virus-scan-failed',
created_at=today)
result = fetch_aggregate_stats_by_date_range_for_all_services(today, today)
assert len(result) == 5
assert ('email', 'permanent-failure', 'normal', 3) in result
assert ('email', 'sent', 'normal', 1) in result
assert ('sms', 'sent', 'normal', 1) in result
assert ('sms', 'sent', 'team', 1) in result
assert ('letter', 'virus-scan-failed', 'normal', 1) in result
def test_fetch_aggregate_stats_by_date_range_for_all_services_uses_bst_date(sample_template):
query_day = datetime(2018, 6, 5).date()
create_notification(sample_template, status='sent', created_at=datetime(2018, 6, 4, 23, 59))
create_notification(sample_template, status='created', created_at=datetime(2018, 6, 5, 23, 00))
result = fetch_aggregate_stats_by_date_range_for_all_services(query_day, query_day)
assert len(result) == 1
assert result[0].status == 'sent'

72
tests/app/dao/test_fact_notification_status_dao.py
View File

@@ -1,14 +1,17 @@
from datetime import timedelta, datetime, date
from uuid import UUID
import pytest
from app.dao.fact_notification_status_dao import (
update_fact_notification_status,
fetch_notification_status_for_day,
fetch_notification_status_for_service_by_month,
fetch_notification_status_for_service_for_day,
fetch_notification_status_for_service_for_today_and_7_previous_days
fetch_notification_status_for_service_for_today_and_7_previous_days,
fetch_notification_status_totals_for_all_services
)
from app.models import FactNotificationStatus, KEY_TYPE_TEST, KEY_TYPE_TEAM, EMAIL_TYPE, SMS_TYPE
from app.models import FactNotificationStatus, KEY_TYPE_TEST, KEY_TYPE_TEAM, EMAIL_TYPE, SMS_TYPE, LETTER_TYPE
from freezegun import freeze_time
from tests.app.db import create_notification, create_service, create_template, create_ft_notification_status
@@ -220,3 +223,68 @@ def test_fetch_notification_status_for_service_for_today_and_7_previous_days(not
assert results[3].notification_type == 'sms'
assert results[3].status == 'delivered'
assert results[3].count == 19
@pytest.mark.parametrize(
"start_date, end_date, expected_email, expected_letters, expected_sms, expected_created_sms",
[
(29, 30, 3, 10, 10, 1), # not including today
(29, 31, 4, 10, 11, 2), # today included
(26, 31, 4, 15, 11, 2),
]
)
@freeze_time('2018-10-31 14:00')
def test_fetch_notification_status_totals_for_all_services(
notify_db_session,
start_date,
end_date,
expected_email,
expected_letters,
expected_sms,
expected_created_sms
):
set_up_data()
results = sorted(
fetch_notification_status_totals_for_all_services(
start_date=date(2018, 10, start_date), end_date=date(2018, 10, end_date)),
key=lambda x: (x.notification_type, x.status)
)
assert len(results) == 4
assert results[0].notification_type == 'email'
assert results[0].status == 'delivered'
assert results[0].count == expected_email
assert results[1].notification_type == 'letter'
assert results[1].status == 'delivered'
assert results[1].count == expected_letters
assert results[2].notification_type == 'sms'
assert results[2].status == 'created'
assert results[2].count == expected_created_sms
assert results[3].notification_type == 'sms'
assert results[3].status == 'delivered'
assert results[3].count == expected_sms
def set_up_data():
service_2 = create_service(service_name='service_2')
create_template(service=service_2, template_type=LETTER_TYPE)
service_1 = create_service(service_name='service_1')
sms_template = create_template(service=service_1, template_type=SMS_TYPE)
email_template = create_template(service=service_1, template_type=EMAIL_TYPE)
create_ft_notification_status(date(2018, 10, 24), 'sms', service_1, count=8)
create_ft_notification_status(date(2018, 10, 26), 'letter', service_1, count=5)
create_ft_notification_status(date(2018, 10, 29), 'sms', service_1, count=10)
create_ft_notification_status(date(2018, 10, 29), 'sms', service_1, notification_status='created')
create_ft_notification_status(date(2018, 10, 29), 'email', service_1, count=3)
create_ft_notification_status(date(2018, 10, 29), 'letter', service_2, count=10)
create_notification(service_1.templates[0], created_at=datetime(2018, 10, 30, 12, 0, 0), status='delivered')
create_notification(sms_template, created_at=datetime(2018, 10, 31, 11, 0, 0))
create_notification(sms_template, created_at=datetime(2018, 10, 31, 12, 0, 0), status='delivered')
create_notification(email_template, created_at=datetime(2018, 10, 31, 13, 0, 0), status='delivered')

41
tests/app/platform_stats/test_rest.py
View File

@@ -2,11 +2,14 @@ from datetime import date, datetime
from freezegun import freeze_time
from app.models import SMS_TYPE, EMAIL_TYPE
from tests.app.db import create_service, create_template, create_ft_notification_status, create_notification
@freeze_time('2018-06-01')
def test_get_platform_stats_uses_todays_date_if_no_start_or_end_date_is_provided(admin_request, mocker):
today = datetime.now().date()
dao_mock = mocker.patch('app.platform_stats.rest.fetch_aggregate_stats_by_date_range_for_all_services')
dao_mock = mocker.patch('app.platform_stats.rest.fetch_notification_status_totals_for_all_services')
mocker.patch('app.service.rest.statistics.format_statistics')
admin_request.get('platform_stats.get_platform_stats')
@@ -17,7 +20,7 @@ def test_get_platform_stats_uses_todays_date_if_no_start_or_end_date_is_provided
def test_get_platform_stats_can_filter_by_date(admin_request, mocker):
start_date = date(2017, 1, 1)
end_date = date(2018, 1, 1)
dao_mock = mocker.patch('app.platform_stats.rest.fetch_aggregate_stats_by_date_range_for_all_services')
dao_mock = mocker.patch('app.platform_stats.rest.fetch_notification_status_totals_for_all_services')
mocker.patch('app.service.rest.statistics.format_statistics')
admin_request.get('platform_stats.get_platform_stats', start_date=start_date, end_date=end_date)
@@ -35,3 +38,37 @@ def test_get_platform_stats_validates_the_date(admin_request):
assert response['errors'][0]['message'] == 'start_date time data {} does not match format %Y-%m-%d'.format(
start_date)
@freeze_time('2018-10-31 14:00')
def test_get_platform_stats_with_real_query(admin_request, notify_db_session):
service_1 = create_service(service_name='service_1')
sms_template = create_template(service=service_1, template_type=SMS_TYPE)
email_template = create_template(service=service_1, template_type=EMAIL_TYPE)
create_ft_notification_status(date(2018, 10, 29), 'sms', service_1, count=10)
create_ft_notification_status(date(2018, 10, 29), 'email', service_1, count=3)
create_notification(sms_template, created_at=datetime(2018, 10, 31, 11, 0, 0), key_type='test')
create_notification(sms_template, created_at=datetime(2018, 10, 31, 12, 0, 0), status='delivered')
create_notification(email_template, created_at=datetime(2018, 10, 31, 13, 0, 0), status='delivered')
response = admin_request.get(
'platform_stats.get_platform_stats', start_date=date(2018, 10, 29),
)
assert response == {
'email': {
'failures': {
'virus-scan-failed': 0, 'temporary-failure': 0, 'permanent-failure': 0, 'technical-failure': 0},
'total': 4, 'test-key': 0
},
'letter': {
'failures': {
'virus-scan-failed': 0, 'temporary-failure': 0, 'permanent-failure': 0, 'technical-failure': 0},
'total': 0, 'test-key': 0
},
'sms': {
'failures': {
'virus-scan-failed': 0, 'temporary-failure': 0, 'permanent-failure': 0, 'technical-failure': 0},
'total': 11, 'test-key': 1
}
}