Merge pull request #783 from alphagov/add-date-filter-to-get-services

Added a date range filter for the get all services end point.

app/dao/services_dao.py

@@ -262,4 +262,32 @@ def dao_fetch_todays_stats_for_all_services(include_from_test_key=True):
     if not include_from_test_key:
         query = query.filter(Notification.key_type != KEY_TYPE_TEST)
 
-    return query
+    return query.all()
+
+
+@statsd(namespace='dao')
+def fetch_stats_by_date_range_for_all_services(start_date, end_date, include_from_test_key=True):
+    query = db.session.query(
+        NotificationHistory.notification_type,
+        NotificationHistory.status,
+        NotificationHistory.service_id,
+        func.count(NotificationHistory.id).label('count')
+    ).select_from(
+        Service
+    ).join(
+        NotificationHistory
+    ).filter(
+        func.date(NotificationHistory.created_at) >= start_date,
+        func.date(NotificationHistory.created_at) <= end_date
+    ).group_by(
+        NotificationHistory.notification_type,
+        NotificationHistory.status,
+        NotificationHistory.service_id
+    ).order_by(
+        NotificationHistory.service_id
+    )
+
+    if not include_from_test_key:
+        query = query.filter(NotificationHistory.key_type != KEY_TYPE_TEST)
+
+    return query.all()

app/service/rest.py

@@ -1,4 +1,5 @@
 import itertools
+from datetime import datetime
 
 from flask import (
     jsonify,
@@ -26,7 +27,8 @@ from app.dao.services_dao import (
     dao_fetch_todays_stats_for_service,
     dao_fetch_weekly_historical_stats_for_service,
     dao_fetch_todays_stats_for_all_services,
-    dao_deactive_service
+    dao_deactive_service,
+    fetch_stats_by_date_range_for_all_services
 )
 from app.dao.service_whitelist_dao import (
     dao_fetch_service_whitelist,
@@ -63,11 +65,16 @@ 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'
+    # If start and end date are not set, we are expecting today's stats.
+    start_date = request.args.get('start_date', datetime.utcnow().date())
+    end_date = request.args.get('end_date', datetime.utcnow().date())
 
     if user_id:
         services = dao_fetch_all_services_by_user(user_id, only_active)
     elif detailed:
-        return jsonify(data=get_detailed_services(only_active, include_from_test_key=include_from_test_key))
+        return 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
+                                                  ))
     else:
         services = dao_fetch_all_services(only_active)
     data = service_schema.dump(services, many=True).data
@@ -269,9 +276,14 @@ def get_detailed_service(service_id, today_only=False):
     return detailed_service_schema.dump(service).data
 
 
-def get_detailed_services(only_active=False, include_from_test_key=True):
+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)}
-    stats = dao_fetch_todays_stats_for_all_services(include_from_test_key=include_from_test_key)
+    if start_date == datetime.utcnow().date():
+        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,
+                                                           end_date=end_date,
+                                                           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)
@@ -280,7 +292,6 @@ def get_detailed_services(only_active=False, include_from_test_key=True):
     for service in services.values():
         if not hasattr(service, 'statistics'):
             service.statistics = statistics.create_zeroed_stats_dicts()
-
     return detailed_service_schema.dump(services.values(), many=True).data