diff --git a/app/formatters.py b/app/formatters.py index 94d7aedbd..0737e64ab 100644 --- a/app/formatters.py +++ b/app/formatters.py @@ -421,7 +421,7 @@ def redact_mobile_number(mobile_number, spacing=""): return "".join(mobile_number_list) -def get_time_left(created_at, service_data_retention_days=7): +def get_time_left(created_at, service_data_retention_days=8): return ago.human( (datetime.now(timezone.utc)) - ( diff --git a/app/main/views/activity.py b/app/main/views/activity.py index 3e92c0f64..258dcddf8 100644 --- a/app/main/views/activity.py +++ b/app/main/views/activity.py @@ -125,7 +125,7 @@ def get_filtered_jobs(service_id, page): @main.route("/activity/services/") @user_has_permissions(ServicePermission.VIEW_ACTIVITY) def all_jobs_activity(service_id): - service_data_retention_days = 7 + service_data_retention_days = 8 page = get_page_from_request() jobs = get_filtered_jobs(service_id, page) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index be958fa7c..c8ed951a0 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -41,7 +41,7 @@ def service_dashboard(service_id): return redirect(url_for("main.choose_template", service_id=service_id)) job_response = job_api_client.get_jobs(service_id)["data"] - service_data_retention_days = 7 + service_data_retention_days = 8 active_jobs = [ job for job in job_response if job["job_status"] != JobStatus.CANCELLED @@ -55,7 +55,7 @@ def service_dashboard(service_id): messages_remaining = total_messages.get("messages_remaining", 0) messages_sent = total_messages.get("messages_sent", 0) all_statistics = template_statistics_client.get_template_statistics_for_service( - service_id, limit_days=7 + service_id, limit_days=8 ) template_statistics = aggregate_template_usage(all_statistics) return render_template( @@ -361,7 +361,7 @@ def get_stats_date_range(): current_financial_year = get_current_financial_year() current_month = get_current_month_for_financial_year(current_financial_year) start_date = datetime.now().strftime("%Y-%m-%d") - days = 7 + days = 8 return { "current_financial_year": current_financial_year, "current_month": current_month, diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html index 9205c5228..f637265a9 100644 --- a/app/templates/views/dashboard/activity-table.html +++ b/app/templates/views/dashboard/activity-table.html @@ -10,7 +10,7 @@
-
{{ current_service.name }} - last 7 days
+
{{ current_service.name }}
diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py index ae8155f1c..967bf6edb 100644 --- a/tests/app/main/views/test_activity.py +++ b/tests/app/main/views/test_activity.py @@ -694,10 +694,11 @@ def test_doesnt_show_pagination_with_search_term( @pytest.mark.parametrize( ("job_created_at", "expected_message"), [ - ("2016-01-10 11:09:00.000000+00:00", "Data available for 7 days"), - ("2016-01-04 11:09:00.000000+00:00", "Data available for 1 day"), - ("2016-01-03 11:09:00.000000+00:00", "Data available for 12 hours"), - ("2016-01-02 23:59:59.000000+00:00", "Data no longer available"), + ("2016-01-10 11:09:00.000000+00:00", "Data available for 8 days"), + ("2016-01-04 11:09:00.000000+00:00", "Data available for 2 days"), + ("2016-01-03 11:09:00.000000+00:00", "Data available for 1 day"), + ("2016-01-02 11:09:00.000000+00:00", "Data available for 12 hours"), + ("2016-01-01 23:59:59.000000+00:00", "Data no longer available"), ], ) @freeze_time("2016-01-10 12:00:00.000000") diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 5d0b040e9..dbabba8a8 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -348,7 +348,7 @@ def test_should_show_recent_templates_on_dashboard( service_id=SERVICE_ONE_ID, ) - mock_template_stats.assert_called_once_with(SERVICE_ONE_ID, limit_days=7) + mock_template_stats.assert_called_once_with(SERVICE_ONE_ID, limit_days=8) headers = [ header.text.strip() for header in page.find_all("h2") + page.find_all("h1") @@ -394,7 +394,7 @@ def test_should_not_show_recent_templates_on_dashboard_if_only_one_template_used page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) main = page.select_one("main").text - mock_template_stats.assert_called_once_with(SERVICE_ONE_ID, limit_days=7) + mock_template_stats.assert_called_once_with(SERVICE_ONE_ID, limit_days=8) assert ( stats[0]["template_name"] == "one" diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index beff6a868..17bccfc82 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -467,10 +467,11 @@ def test_should_show_updates_for_scheduled_job_as_json( @pytest.mark.parametrize( ("job_created_at", "expected_message"), [ - ("2016-01-10 11:09:00.000000+00:00", "Data available for 7 days"), - ("2016-01-04 11:09:00.000000+00:00", "Data available for 1 day"), - ("2016-01-03 11:09:00.000000+00:00", "Data available for 12 hours"), - ("2016-01-02 23:59:59.000000+00:00", "Data no longer available"), + ("2016-01-10 11:09:00.000000+00:00", "Data available for 8 days"), + ("2016-01-04 11:09:00.000000+00:00", "Data available for 2 days"), + ("2016-01-03 11:09:00.000000+00:00", "Data available for 1 day"), + ("2016-01-02 11:09:00.000000+00:00", "Data available for 12 hours"), + ("2016-01-01 23:59:59.000000+00:00", "Data no longer available"), ], ) @freeze_time("2016-01-10 12:00:00.000000") diff --git a/tests/javascripts/activityChart.test.js b/tests/javascripts/activityChart.test.js index ff90d3342..4992e2076 100644 --- a/tests/javascripts/activityChart.test.js +++ b/tests/javascripts/activityChart.test.js @@ -38,7 +38,7 @@ beforeAll(done => {
-
Service Name - last 7 days
+
Service Name - last 8 days
@@ -313,7 +313,7 @@ test('handleDropdownChange shows empty message when user has no jobs', () => { Another User Different User - No batched job messages found (messages are kept for 7 days). + No batched job messages found (messages are kept for 8 days).