Need to be able to query the notification statistics for the right number of days.

If the request is for the big numbers on the activity page, then we need to use the number right number of days.
Added an end point to get the data retention for the service and notification type, which is needed on the activity page to say how long the report is available for.

tests/app/dao/test_services_dao.py

@@ -534,7 +534,7 @@ def test_fetch_stats_filters_on_service(sample_notification):
                           message_limit=1000)
     dao_create_service(service_two, sample_notification.service.created_by)
 
-    stats = dao_fetch_stats_for_service(service_two.id)
+    stats = dao_fetch_stats_for_service(service_two.id, 7)
     assert len(stats) == 0
 
 
@@ -546,7 +546,7 @@ def test_fetch_stats_ignores_historical_notification_data(sample_notification):
     assert Notification.query.count() == 0
     assert NotificationHistory.query.count() == 1
 
-    stats = dao_fetch_stats_for_service(service_id)
+    stats = dao_fetch_stats_for_service(service_id, 7)
     assert len(stats) == 0
 
 
@@ -557,7 +557,7 @@ def test_fetch_stats_counts_correctly(notify_db, notify_db_session, sample_templ
     create_notification(notify_db, notify_db_session, template=sample_email_template, status='technical-failure')
     create_notification(notify_db, notify_db_session, template=sample_template, status='created')
 
-    stats = dao_fetch_stats_for_service(sample_template.service_id)
+    stats = dao_fetch_stats_for_service(sample_template.service_id, 7)
     stats = sorted(stats, key=lambda x: (x.notification_type, x.status))
     assert len(stats) == 3
 
@@ -591,7 +591,7 @@ def test_fetch_stats_counts_should_ignore_team_key(
     create_notification(
         notify_db, notify_db_session)
 
-    stats = dao_fetch_stats_for_service(sample_template.service_id)
+    stats = dao_fetch_stats_for_service(sample_template.service_id, 7)
     assert len(stats) == 1
     assert stats[0].notification_type == 'sms'
     assert stats[0].status == 'created'
@@ -634,7 +634,30 @@ def test_fetch_stats_should_not_gather_notifications_older_than_7_days(sample_te
         create_notification_db(sample_template,)
 
     with freeze_time('Monday 16th July 2018 12:00'):
-        stats = dao_fetch_stats_for_service(sample_template.service_id)
+        stats = dao_fetch_stats_for_service(sample_template.service_id, 7)
+
+    assert len(stats) == rows_returned
+
+
+@pytest.mark.parametrize('created_at, rows_returned', [
+    ('Saturday 7th July 2018 12:00', 0),
+    ('Saturday 7th July 2018 22:59', 0),
+    ('Sunday 8th July 2018 12:00', 1),
+    ('Sunday 8th July 2018 22:59', 1),
+    ('Sunday 8th July 2018 23:00', 1),
+    ('Monday 9th July 2018 09:00', 1),
+    ('Monday 9th July 2018 15:00', 1),
+    ('Monday 16th July 2018 12:00', 1),
+])
+def test_fetch_stats_should_not_gather_notifications_older_than_the_days_given(
+        sample_template, created_at, rows_returned
+):
+    # It's monday today. Things made last monday should still show
+    with freeze_time(created_at):
+        create_notification_db(sample_template,)
+
+    with freeze_time('Monday 16th July 2018 12:00'):
+        stats = dao_fetch_stats_for_service(sample_template.service_id, 8)
 
     assert len(stats) == rows_returned
 

tests/app/service/test_service_data_retention_rest.py

@@ -35,6 +35,15 @@ def test_get_service_data_retention_returns_empty_list(client, sample_service):
     assert len(json.loads(response.get_data(as_text=True))) == 0
 
 
+def test_get_data_retention_for_service_notification_type(client, sample_service):
+    data_retention = create_service_data_retention(service_id=sample_service.id)
+    response = client.get('/service/{}/data-retention/notification-type/{}'.format(sample_service.id, 'sms'),
+                          headers=[('Content-Type', 'application/json'), create_authorization_header()],
+                          )
+    assert response.status_code == 200
+    assert json.loads(response.get_data(as_text=True)) == data_retention.serialize()
+
+
 def test_get_service_data_retention_by_id(client, sample_service):
     sms_data_retention = create_service_data_retention(service_id=sample_service.id)
     create_service_data_retention(service_id=sample_service.id, notification_type='email',

tests/app/service/test_statistics_rest.py

@@ -129,11 +129,11 @@ def test_get_template_usage_by_month_returns_two_templates(admin_request, sample
     assert resp_json[2]["is_precompiled_letter"] is False
 
 
-@pytest.mark.parametrize('today_only, stats', [
-    (False, {'requested': 2, 'delivered': 1, 'failed': 0}),
-    (True, {'requested': 1, 'delivered': 0, 'failed': 0})
+@pytest.mark.parametrize('today_only, limit_days, stats', [
+    (False, 7, {'requested': 2, 'delivered': 1, 'failed': 0}),
+    (True, 7, {'requested': 1, 'delivered': 0, 'failed': 0})
 ], ids=['seven_days', 'today'])
-def test_get_service_notification_statistics(admin_request, sample_template, today_only, stats):
+def test_get_service_notification_statistics(admin_request, sample_template, today_only, limit_days, stats):
     with freeze_time('2000-01-01T12:00:00'):
         create_notification(sample_template, status='delivered')
     with freeze_time('2000-01-02T12:00:00'):
@@ -141,7 +141,8 @@ def test_get_service_notification_statistics(admin_request, sample_template, tod
         resp = admin_request.get(
             'service.get_service_notification_statistics',
             service_id=sample_template.service_id,
-            today_only=today_only
+            today_only=today_only,
+            limit_days=limit_days
         )
 
     assert set(resp['data'].keys()) == {SMS_TYPE, EMAIL_TYPE, LETTER_TYPE}
@@ -151,7 +152,8 @@ def test_get_service_notification_statistics(admin_request, sample_template, tod
 def test_get_service_notification_statistics_with_unknown_service(admin_request):
     resp = admin_request.get(
         'service.get_service_notification_statistics',
-        service_id=uuid.uuid4()
+        service_id=uuid.uuid4(),
+        limit_days=7
     )
 
     assert resp['data'] == {