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

filter on key types to avoid research mode (that dont actually send)

Browse Source
This commit is contained in:
Leo Hemsted
2016-08-01 10:22:22 +01:00
parent 1617f058e2
commit 9a9ebf0886
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/dao/provider_statistics_dao.py
View File

@@ -7,7 +7,8 @@ from app.models import (
NotificationHistory, NotificationHistory,
SMS_TYPE, SMS_TYPE,
EMAIL_TYPE, EMAIL_TYPE,
NOTIFICATION_STATUS_TYPES_BILLABLE NOTIFICATION_STATUS_TYPES_BILLABLE,
KEY_TYPE_TEST
) )
@@ -21,6 +22,13 @@ def get_provider_statistics(service, **kwargs):
def get_fragment_count(service_id): def get_fragment_count(service_id):
live_dates = get_service_live_dates(service_id)
shared_filters = [
NotificationHistory.service_id == service_id,
NotificationHistory.status.in_(NOTIFICATION_STATUS_TYPES_BILLABLE),
NotificationHistory.key_type != KEY_TYPE_TEST
]
sms_count = db.session.query( sms_count = db.session.query(
func.sum( func.sum(
case( case(
@@ -34,16 +42,15 @@ def get_fragment_count(service_id):
) )
) )
).filter( ).filter(
NotificationHistory.service_id == service_id,
NotificationHistory.notification_type == SMS_TYPE, NotificationHistory.notification_type == SMS_TYPE,
NotificationHistory.status.in_(NOTIFICATION_STATUS_TYPES_BILLABLE) *shared_filters
) )
email_count = db.session.query( email_count = db.session.query(
func.count(NotificationHistory.id) func.count(NotificationHistory.id)
).filter( ).filter(
NotificationHistory.service_id == service_id,
NotificationHistory.notification_type == EMAIL_TYPE, NotificationHistory.notification_type == EMAIL_TYPE,
NotificationHistory.status.in_(NOTIFICATION_STATUS_TYPES_BILLABLE) *shared_filters
) )
return { return {
'sms_count': int(sms_count.scalar() or 0), 'sms_count': int(sms_count.scalar() or 0),

18
tests/app/dao/test_provider_statistics_dao.py
View File

@@ -113,6 +113,12 @@ def test_get_fragment_count_filters_on_status(notify_db, sample_template):
assert get_fragment_count(sample_template.service_id)['sms_count'] == 6 assert get_fragment_count(sample_template.service_id)['sms_count'] == 6
def test_get_fragment_count_filters_on_service_id(notify_db, sample_template, service_factory):
service_2 = service_factory.get('service 2', email_from='service.2')
noti_hist(notify_db, sample_template)
assert get_fragment_count(service_2.id)['sms_count'] == 0
def test_get_fragment_count_sums_char_count_for_sms(notify_db, sample_template): def test_get_fragment_count_sums_char_count_for_sms(notify_db, sample_template):
noti_hist(notify_db, sample_template, content_char_count=1) # 1 noti_hist(notify_db, sample_template, content_char_count=1) # 1
noti_hist(notify_db, sample_template, content_char_count=159) # 1 noti_hist(notify_db, sample_template, content_char_count=159) # 1
@@ -120,7 +126,17 @@ def test_get_fragment_count_sums_char_count_for_sms(notify_db, sample_template):
assert get_fragment_count(sample_template.service_id)['sms_count'] == 4 assert get_fragment_count(sample_template.service_id)['sms_count'] == 4
def noti_hist(notify_db, template, status='delivered', content_char_count=None): @pytest.mark.parametrize('key_type,sms_count', [
(KEY_TYPE_NORMAL, 1),
(KEY_TYPE_TEAM, 1),
(KEY_TYPE_TEST, 0),
])
def test_get_fragment_count_ignores_test_api_keys(notify_db, sample_template, key_type, sms_count):
noti_hist(notify_db, sample_template, key_type=key_type)
assert get_fragment_count(sample_template.service_id)['sms_count'] == sms_count
def noti_hist(notify_db, template, status='delivered', content_char_count=None, key_type=KEY_TYPE_NORMAL):
if not content_char_count and template.template_type == 'sms': if not content_char_count and template.template_type == 'sms':
content_char_count = 1 content_char_count = 1