[WIP]

app/dao/services_dao.py

@@ -413,8 +413,7 @@ def fetch_stats_by_date_range_for_all_services(start_date, end_date, include_fro
 
     if start_date >= datetime.utcnow() - timedelta(days=7):
         table = Notification
-
+    subquery = db.session.query(
-    query = db.session.query(
         table.notification_type,
         table.status,
         table.service_id,
@@ -426,12 +425,23 @@ def fetch_stats_by_date_range_for_all_services(start_date, end_date, include_fro
         table.notification_type,
         table.status,
         table.service_id
-    ).order_by(
-        table.service_id
     )
-
     if not include_from_test_key:
-        query = query.filter(table.key_type != KEY_TYPE_TEST)
+        subquery = subquery.filter(table.key_type != KEY_TYPE_TEST)
+    subquery = subquery.subquery()
+
+    query = db.session.query(
+        Service.id.label('service_id'),
+        Service.name,
+        Service.restricted,
+        Service.research_mode,
+        subquery.c.notification_type,
+        subquery.c.status,
+        subquery.c.count
+    ).join(
+        subquery,
+        subquery.c.service_id == Service.id
+    ).order_by(Service.id)
 
     return query.all()
 

app/service/rest.py

@@ -409,7 +409,7 @@ def get_detailed_service(service_id, today_only=False):
 
 
 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)}
+    services_old = {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)
     else:
@@ -417,15 +417,18 @@ def get_detailed_services(start_date, end_date, only_active=False, include_from_
         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)
-
+    services = {service.service_id: service for service in stats}
     for service_id, rows in itertools.groupby(stats, lambda x: x.service_id):
         services[service_id].statistics = statistics.format_statistics(rows)
 
+    # for service_id, rows in itertools.groupby(stats, lambda x: x.service_id):
+    #     services[service_id].statistics = statistics.format_statistics(rows)
+
     # if service has not sent anything, query will not have set statistics correctly
     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
+    return services
 
 
 @service_blueprint.route('/<uuid:service_id>/whitelist', methods=['GET'])

tests/app/dao/test_services_dao.py

@@ -711,12 +711,11 @@ def test_dao_fetch_todays_stats_for_all_services_groups_correctly(notify_db, not
     create_notification(notify_db, notify_db_session, service=service2)
 
     stats = dao_fetch_todays_stats_for_all_services()
-
     assert len(stats) == 4
-    assert ('sms', 'created', service1.id, 2) in stats
+    assert (service1.id, service1.name, service1.restricted, service1.research_mode, 'sms', 'created', 2) in stats
-    assert ('sms', 'failed', service1.id, 1) in stats
+    assert (service1.id, service1.name, service1.restricted, service1.research_mode, 'sms', 'failed', 1) in stats
-    assert ('email', 'created', service1.id, 1) in stats
+    assert (service1.id, service1.name, service1.restricted, service1.research_mode, 'email', 'created', 1) in stats
-    assert ('sms', 'created', service2.id, 1) in stats
+    assert (service2.id, service2.name, service2.restricted, service2.research_mode, 'sms', 'created', 1) in stats
 
 
 def test_dao_fetch_todays_stats_for_all_services_includes_all_keys_by_default(notify_db, notify_db_session):
@@ -754,7 +753,8 @@ def test_fetch_stats_by_date_range_for_all_services(notify_db, notify_db_session
     results = fetch_stats_by_date_range_for_all_services(start_date, end_date)
 
     assert len(results) == 1
-    assert results[0] == ('sms', 'created', result_one.service_id, 2)
+    assert results[0] == (result_one.service.id, result_one.service.name, result_one.service.restricted,
+                          result_one.service.research_mode, 'sms', 'created', 2)
 
 
 @freeze_time('2001-01-01T23:59:00')
@@ -793,7 +793,8 @@ def test_fetch_stats_by_date_range_for_all_services_returns_test_notifications(n
     results = fetch_stats_by_date_range_for_all_services(start_date, end_date, include_from_test_key=True)
 
     assert len(results) == 1
-    assert results[0] == ('sms', 'created', result_one.service_id, int(expected))
+    assert results[0] == (result_one.service.id, result_one.service.name, result_one.service.restricted,
+                          result_one.service.research_mode, 'sms', 'created', int(expected))
 
 
 @pytest.mark.parametrize("start_delta, end_delta, expected",
@@ -820,7 +821,8 @@ def test_fetch_stats_by_date_range_during_bst_hour_for_all_services_returns_test
     results = fetch_stats_by_date_range_for_all_services(start_date, end_date, include_from_test_key=True)
 
     assert len(results) == 1
-    assert results[0] == ('sms', 'created', result_one.service_id, int(expected))
+    assert results[0] == (result_one.service.id, result_one.service.name, result_one.service.restricted,
+                          result_one.service.research_mode, 'sms', 'created', int(expected))
 
 
 @freeze_time('2001-01-01T23:59:00')

tests/app/service/test_rest.py

@@ -1753,7 +1753,8 @@ def test_get_detailed_services_only_includes_todays_notifications(notify_db, not
 
 @pytest.mark.parametrize(
     'set_time',
-    ['2017-03-28T12:00:00', '2017-01-28T12:00:00', '2017-01-02T12:00:00', '2017-10-31T12:00:00']
+    ['2017-03-28T12:00:00']
+        #, '2017-01-28T12:00:00', '2017-01-02T12:00:00', '2017-10-31T12:00:00']
 )
 def test_get_detailed_services_for_date_range(notify_db, notify_db_session, set_time):
     from app.service.rest import get_detailed_services