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

- Add comment to test and new if statement

Browse Source 
- Update assert in test
This commit is contained in:
Rebecca Law
2021-06-02 14:13:31 +01:00
parent b170b5ed80
commit a341536de0
2 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dao/fact_notification_status_dao.py
View File

@@ -155,6 +155,9 @@ def fetch_notification_status_for_service_for_today_and_7_previous_days(service_
FactNotificationStatus.key_type != KEY_TYPE_TEST
)
if str(service_id) in (current_app.config['HIGH_VOLUME_SERVICE']):
# As a temporary measure we are not including today's totals for high volume service. This will allow the
# services to view the dashboard and /notification pages more easily. There is a story to try to resolve the
# query performance, https://www.pivotaltracker.com/story/show/178330973
all_stats_table = stats_for_7_days.subquery()
else:
stats_for_today = db.session.query(

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

@@ -251,22 +251,8 @@ def test_fetch_notification_status_for_service_for_today_and_7_previous_days(not
)
assert len(results) == 4
assert results[0].notification_type == 'email'
assert results[0].status == 'delivered'
assert results[0].count == 4
assert results[1].notification_type == 'letter'
assert results[1].status == 'delivered'
assert results[1].count == 5
assert results[2].notification_type == 'sms'
assert results[2].status == 'created'
assert results[2].count == 3
assert results[3].notification_type == 'sms'
assert results[3].status == 'delivered'
assert results[3].count == 19
assert sorted(results, key=lambda x: (x.notification_type, x.status, x.count)) == \
[('email', 'delivered', 4), ('letter', 'delivered', 5), ('sms', 'created', 3), ('sms', 'delivered', 19)]
@freeze_time('2018-10-31T18:00:00')
@@ -283,7 +269,7 @@ def test_fetch_notification_status_for_service_for_today_and_7_previous_days_for
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, 26), 'letter', service_1, count=5)
# notifications created today will not be included in the resultset
create_notification(sms_template, created_at=datetime(2018, 10, 31, 11, 0, 0))
create_notification(sms_template_2, created_at=datetime(2018, 10, 31, 11, 0, 0))
create_notification(sms_template, created_at=datetime(2018, 10, 31, 12, 0, 0), status='delivered')
@@ -301,22 +287,8 @@ def test_fetch_notification_status_for_service_for_today_and_7_previous_days_for
)
assert len(results) == 4
assert results[0].notification_type == 'email'
assert results[0].status == 'delivered'
assert results[0].count == 3
assert results[1].notification_type == 'letter'
assert results[1].status == 'delivered'
assert results[1].count == 5
assert results[2].notification_type == 'sms'
assert results[2].status == 'created'
assert results[2].count == 1
assert results[3].notification_type == 'sms'
assert results[3].status == 'delivered'
assert results[3].count == 18
assert sorted(results, key=lambda x: (x.notification_type, x.status, x.count)) == \
[('email', 'delivered', 3), ('letter', 'delivered', 5), ('sms', 'created', 1), ('sms', 'delivered', 18)]
@freeze_time('2018-10-31T18:00:00')