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 #758 from alphagov/stats-toggle-test-key

Browse Source 
Add include_from_test_key parameter to /service
This commit is contained in:
Jenny Duckett
2016-12-06 10:58:10 +00:00
committed by GitHub
parent f452bf46f0 d2649aebc8
commit f02869c1e6
4 changed files with 124 additions and 10 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

7
app/service/rest.py
View File

@@ -62,11 +62,12 @@ def get_services():
only_active = request.args.get('only_active') == 'True'
detailed = request.args.get('detailed') == 'True'
user_id = request.args.get('user_id', None)
include_from_test_key = request.args.get('include_from_test_key', 'True') != 'False'
if user_id:
services = dao_fetch_all_services_by_user(user_id, only_active)
elif detailed:
return jsonify(data=get_detailed_services(only_active))
return jsonify(data=get_detailed_services(only_active, include_from_test_key=include_from_test_key))
else:
services = dao_fetch_all_services(only_active)
data = service_schema.dump(services, many=True).data
@@ -268,9 +269,9 @@ def get_detailed_service(service_id, today_only=False):
return detailed_service_schema.dump(service).data
def get_detailed_services(only_active=False):
def get_detailed_services(only_active=False, include_from_test_key=True):
services = {service.id: service for service in dao_fetch_all_services(only_active)}
stats = dao_fetch_todays_stats_for_all_services()
stats = dao_fetch_todays_stats_for_all_services(include_from_test_key=include_from_test_key)
for service_id, rows in itertools.groupby(stats, lambda x: x.service_id):
services[service_id].statistics = statistics.format_statistics(rows)