Merge pull request #2288 from alphagov/plat-adm-fix

Platform admin fix

app/dao/fact_notification_status_dao.py

@@ -153,8 +153,6 @@ def fetch_notification_status_totals_for_all_services(start_date, end_date):
         FactNotificationStatus.notification_type,
         FactNotificationStatus.notification_status,
         FactNotificationStatus.key_type,
-    ).order_by(
-        FactNotificationStatus.notification_type
     )
     today = get_london_midnight_in_utc(datetime.utcnow())
     if start_date <= today.date() <= end_date:
@@ -184,7 +182,9 @@ def fetch_notification_status_totals_for_all_services(start_date, end_date):
             all_stats_table.c.notification_type
         )
     else:
-        query = stats
+        query = stats.order_by(
+            FactNotificationStatus.notification_type
+        )
     return query.all()
 
 
@@ -245,7 +245,7 @@ def fetch_stats_for_all_services_by_date_range(start_date, end_date, include_fro
             Notification.service_id
         )
         if not include_from_test_key:
-            subquery = subquery.filter(FactNotificationStatus.key_type != KEY_TYPE_TEST)
+            subquery = subquery.filter(Notification.key_type != KEY_TYPE_TEST)
         subquery = subquery.subquery()
 
         stats_for_today = db.session.query(
@@ -261,7 +261,7 @@ def fetch_stats_for_all_services_by_date_range(start_date, end_date, include_fro
         ).outerjoin(
             subquery,
             subquery.c.service_id == Service.id
-        ).order_by(Service.id)
+        )
 
         all_stats_table = stats.union_all(stats_for_today).subquery()
         query = db.session.query(

app/service/rest.py

@@ -478,10 +478,7 @@ def get_detailed_services(start_date, end_date, only_active=False, include_from_
     results = []
     for service_id, rows in itertools.groupby(stats, lambda x: x.service_id):
         rows = list(rows)
-        if rows[0].count is None:
-            s = statistics.create_zeroed_stats_dicts()
-        else:
-            s = statistics.format_statistics(rows)
+        s = statistics.format_statistics(rows)
         results.append({
             'id': str(rows[0].service_id),
             'name': rows[0].name,

app/service/statistics.py

@@ -13,7 +13,10 @@ def format_statistics(statistics):
     # so we can return emails/sms * created, sent, and failed
     counts = create_zeroed_stats_dicts()
     for row in statistics:
-        _update_statuses_from_row(counts[row.notification_type], row)
+        # any row could be null, if the service either has no notifications in the notifications table,
+        # or no historical data in the ft_notification_status table.
+        if row.notification_type:
+            _update_statuses_from_row(counts[row.notification_type], row)
 
     return counts
 

tests/app/service/test_statistics.py

@@ -45,6 +45,10 @@ NewStatsRow = collections.namedtuple('row', ('notification_type', 'status', 'key
         StatsRow('sms', 'delivered', 1),
         StatsRow('sms', 'sent', 1),
     ], [0, 0, 0], [3, 2, 0], [0, 0, 0]),
+    'handles_none_rows': ([
+        StatsRow('sms', 'sending', 1),
+        StatsRow(None, None, None)
+    ], [0, 0, 0], [1, 0, 0], [0, 0, 0])
 })
 def test_format_statistics(stats, email_counts, sms_counts, letter_counts):