Group by Notification Statistics added and all tests working.

Fixed tests for upgraded client.

app/dao/notifications_dao.py

@@ -1,5 +1,6 @@
 import math
-from sqlalchemy import desc, func
+from sqlalchemy import (desc, func, Integer)
+from sqlalchemy.sql.expression import cast
 
 from datetime import (
     datetime,
@@ -51,6 +52,33 @@ def dao_get_notification_statistics_for_service_and_day(service_id, day):
     ).order_by(desc(NotificationStatistics.day)).first()
 
 
+def dao_get_7_day_agg_notification_statistics_for_service(service_id,
+                                                          date_from,
+                                                          week_count=52):
+    doy = date_from.timetuple().tm_yday
+    return db.session.query(
+        cast(func.floor((func.extract('doy', NotificationStatistics.day) - doy) / 7), Integer),
+        cast(func.sum(NotificationStatistics.emails_requested), Integer),
+        cast(func.sum(NotificationStatistics.emails_delivered), Integer),
+        cast(func.sum(NotificationStatistics.emails_failed), Integer),
+        cast(func.sum(NotificationStatistics.sms_requested), Integer),
+        cast(func.sum(NotificationStatistics.sms_delivered), Integer),
+        cast(func.sum(NotificationStatistics.sms_failed), Integer)
+    ).filter(
+        NotificationStatistics.service_id == service_id
+    ).filter(
+        NotificationStatistics.day >= date_from
+    ).filter(
+        NotificationStatistics.day < date_from + timedelta(days=7 * week_count)
+    ).group_by(
+        func.floor(((func.extract('doy', NotificationStatistics.day) - doy) / 7))
+    ).order_by(
+        desc(func.floor(((func.extract('doy', NotificationStatistics.day) - doy) / 7)))
+    ).limit(
+        week_count
+    )
+
+
 def dao_get_template_statistics_for_service(service_id, limit_days=None):
     filter = [TemplateStatistics.service_id == service_id]
     if limit_days is not None: