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

Merge pull request #1289 from alphagov/vb-platform-admin-api

Browse Source 
admin to api not passing trial_mode_service
This commit is contained in:
Venus Bailey
2017-10-02 16:39:07 +01:00
committed by GitHub
parent 9d26e28c82 9a5addb896
commit 84d7e93b9b
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/dao/services_dao.py
View File

@@ -358,15 +358,13 @@ def dao_fetch_monthly_historical_stats_for_service(service_id, year):
@statsd(namespace='dao')
def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, trial_mode_services=None):
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,
func.count(Notification.id).label('count')
).join(
Service
).filter(
func.date(Notification.created_at) == date.today(),
).group_by(
@@ -380,9 +378,6 @@ def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, trial_mo
if not include_from_test_key:
query = query.filter(Notification.key_type != KEY_TYPE_TEST)
if trial_mode_services is not None:
query = query.filter(Service.restricted == trial_mode_services)
return query.all()

10
app/service/rest.py
View File

@@ -90,7 +90,6 @@ def get_services():
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'
trial_mode_services = request.args.get('trial_mode_services')
# If start and end date are not set, we are expecting today's stats.
today = str(datetime.utcnow().date())
@@ -103,8 +102,7 @@ def get_services():
elif detailed:
result = jsonify(data=get_detailed_services(start_date=start_date, end_date=end_date,
only_active=only_active,
include_from_test_key=include_from_test_key,
trial_mode_services=trial_mode_services
include_from_test_key=include_from_test_key
))
return result
else:
@@ -369,12 +367,10 @@ def get_detailed_service(service_id, today_only=False):
return detailed_service_schema.dump(service).data
def get_detailed_services(start_date, end_date, only_active=False, include_from_test_key=True,
trial_mode_services=None):
def get_detailed_services(start_date, end_date, only_active=False, include_from_test_key=True):
services = {service.id: service for service in dao_fetch_all_services(only_active)}
if start_date == datetime.utcnow().date():
stats = dao_fetch_todays_stats_for_all_services(include_from_test_key=include_from_test_key,
trial_mode_services=trial_mode_services)
stats = dao_fetch_todays_stats_for_all_services(include_from_test_key=include_from_test_key)
else:
stats = fetch_stats_by_date_range_for_all_services(start_date=start_date,