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

Merge pull request #2305 from alphagov/fix-template-usage-query

Browse Source 
Add missing filter for template usage query
This commit is contained in:
Rebecca Law
2019-01-15 16:25:23 +00:00
committed by GitHub
parent 3fdf0c7822 3dca36ecfc
commit ac9186f95a
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dao/fact_notification_status_dao.py
View File

@@ -312,7 +312,8 @@ def fetch_monthly_template_usage_for_service(start_date, end_date, service_id):
FactNotificationStatus.service_id == service_id, FactNotificationStatus.service_id == service_id,
FactNotificationStatus.bst_date >= start_date, FactNotificationStatus.bst_date >= start_date,
FactNotificationStatus.bst_date <= end_date, FactNotificationStatus.bst_date <= end_date,
FactNotificationStatus.notification_status != NOTIFICATION_CANCELLED FactNotificationStatus.key_type != KEY_TYPE_TEST,
FactNotificationStatus.notification_status != NOTIFICATION_CANCELLED,
).group_by( ).group_by(
FactNotificationStatus.template_id, FactNotificationStatus.template_id,
Template.name, Template.name,

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

@@ -461,3 +461,24 @@ def test_fetch_monthly_template_usage_for_service_does_not_include_cancelled_sta
) )
assert len(results) == 0 assert len(results) == 0
@freeze_time('2018-03-30 14:00')
def test_fetch_monthly_template_usage_for_service_does_not_include_test_notifications(
sample_template
):
create_ft_notification_status(bst_date=date(2018, 3, 1),
service=sample_template.service,
template=sample_template,
notification_status='delivered',
key_type='test',
count=15)
create_notification(template=sample_template,
created_at=datetime.utcnow(),
status='delivered',
key_type='test',)
results = fetch_monthly_template_usage_for_service(
datetime(2018, 1, 1), datetime(2018, 3, 31), sample_template.service_id
)
assert len(results) == 0