Merge pull request #287 from alphagov/statistics_group_by_week_backup

Group by Notification Statistics added and all tests working.

tests/app/conftest.py

@@ -13,7 +13,8 @@ from app.models import (
     MMG_PROVIDER,
     SES_PROVIDER,
     TWILIO_PROVIDER,
-    ProviderStatistics)
+    ProviderStatistics,
+    NotificationStatistics)
 from app.dao.users_dao import (save_model_user, create_user_code, create_secret_code)
 from app.dao.services_dao import (dao_create_service, dao_add_user_to_service)
 from app.dao.templates_dao import dao_create_template
@@ -493,3 +494,32 @@ def sample_provider_statistics(notify_db,
     notify_db.session.add(stats)
     notify_db.session.commit()
     return stats
+
+
+@pytest.fixture(scope='function')
+def sample_notification_statistics(notify_db,
+                                   notify_db_session,
+                                   service=None,
+                                   day=None,
+                                   emails_requested=2,
+                                   emails_delivered=1,
+                                   emails_failed=1,
+                                   sms_requested=2,
+                                   sms_delivered=1,
+                                   sms_failed=1):
+    if service is None:
+        service = sample_service(notify_db, notify_db_session)
+    if day is None:
+        day = date.today()
+    stats = NotificationStatistics(
+        service=service,
+        day=day,
+        emails_requested=emails_requested,
+        emails_delivered=emails_delivered,
+        emails_failed=emails_failed,
+        sms_requested=sms_requested,
+        sms_delivered=sms_delivered,
+        sms_failed=sms_failed)
+    notify_db.session.add(stats)
+    notify_db.session.commit()
+    return stats