darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-08 10:27:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow excluding test key use in the all services stats query

Browse Source
This commit is contained in:
Jenny Duckett
2016-12-02 16:43:24 +00:00
parent ad7278fd4e
commit 7668745d8b
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/dao/services_dao.py
View File

@@ -239,8 +239,8 @@ def dao_fetch_weekly_historical_stats_for_service(service_id):
@statsd(namespace='dao')
def dao_fetch_todays_stats_for_all_services():
return db.session.query(
def dao_fetch_todays_stats_for_all_services(include_from_test_key=True):
query = db.session.query(
Notification.notification_type,
Notification.status,
Notification.service_id,
@@ -258,3 +258,8 @@ def dao_fetch_todays_stats_for_all_services():
).order_by(
Notification.service_id
)
if not include_from_test_key:
query = query.filter(Notification.key_type != KEY_TYPE_TEST)
return query

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

@@ -628,3 +628,14 @@ def test_dao_fetch_todays_stats_for_all_services_includes_all_keys_by_default(no
assert len(stats) == 1
assert stats[0].count == 3
def test_dao_fetch_todays_stats_for_all_services_can_exclude_from_test_key(notify_db, notify_db_session):
create_notification(notify_db, notify_db_session, key_type=KEY_TYPE_NORMAL)
create_notification(notify_db, notify_db_session, key_type=KEY_TYPE_TEAM)
create_notification(notify_db, notify_db_session, key_type=KEY_TYPE_TEST)
stats = dao_fetch_todays_stats_for_all_services(include_from_test_key=False).all()
assert len(stats) == 1
assert stats[0].count == 2