add today_only flag to GET /service/:id

if both detailed=True and today_only=True are passed in, the stats
returned will only be for today.

if detailed is false or not specified, today_only has no effect
This commit is contained in:
Leo Hemsted
2016-07-25 14:27:06 +01:00
parent fd96c854e1
commit 48eff9a2ee
2 changed files with 31 additions and 15 deletions

View File

@@ -22,7 +22,8 @@ from app.dao.services_dao import (
dao_fetch_all_services_by_user,
dao_add_user_to_service,
dao_remove_user_from_service,
dao_fetch_stats_for_service
dao_fetch_stats_for_service,
dao_fetch_todays_stats_for_service
)
from app.dao import notifications_dao
from app.dao.provider_statistics_dao import get_fragment_count
@@ -60,8 +61,8 @@ def get_services():
@service.route('/<uuid:service_id>', methods=['GET'])
def get_service_by_id(service_id):
if 'detailed' in request.args:
return get_detailed_service(service_id)
if request.args.get('detailed') == 'True':
return get_detailed_service(service_id, today_only=request.args.get('today_only') == 'True')
else:
fetched = dao_fetch_service_by_id(service_id)
@@ -235,9 +236,10 @@ def get_all_notifications_for_service(service_id):
), 200
def get_detailed_service(service_id):
def get_detailed_service(service_id, today_only=False):
service = dao_fetch_service_by_id(service_id)
statistics = dao_fetch_stats_for_service(service_id)
stats_fn = dao_fetch_todays_stats_for_service if today_only else dao_fetch_stats_for_service
statistics = stats_fn(service_id)
service.statistics = format_statistics(statistics)
data = detailed_service_schema.dump(service).data
return jsonify(data=data)