Merge branch 'master' into new-staging

app/dao/services_dao.py

@@ -1,4 +1,5 @@
 import uuid
+from datetime import date
 
 from sqlalchemy import asc, func
 from sqlalchemy.orm import joinedload
@@ -136,6 +137,16 @@ def delete_service_and_all_associated_db_objects(service):
 
 
 def dao_fetch_stats_for_service(service_id):
+    return _stats_for_service_query(service_id).all()
+
+
+def dao_fetch_todays_stats_for_service(service_id):
+    return _stats_for_service_query(service_id).filter(
+        func.date(Notification.created_at) == date.today()
+    ).all()
+
+
+def _stats_for_service_query(service_id):
     return db.session.query(
         Notification.notification_type,
         Notification.status,
@@ -145,4 +156,4 @@ def dao_fetch_stats_for_service(service_id):
     ).group_by(
         Notification.notification_type,
         Notification.status,
-    ).all()
+    )

app/service/rest.py

@@ -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)