From b9688f9ad38643548c0c7c4fa351be8231ed5b5c Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Thu, 29 Nov 2018 11:37:38 +0000
Subject: [PATCH] Update banner message for CSV letters

This was always showing the text 'Your letter has been sent...' This has
now been updated to start 'Your letters have been sent...' if a job has
more than one notification in it.
---
 app/main/views/jobs.py            |  7 ++++++-
 app/templates/views/jobs/job.html |  4 +---
 tests/app/main/views/test_jobs.py | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index 1560e4e56..04cc17751 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -93,6 +93,11 @@ def view_job(service_id, job_id):
         version=job['template_version']
     )['data']
 
+    just_sent_message = 'Your {} been sent. Printing starts {} at 5.30pm.'.format(
+        'letter has' if job['notification_count'] == 1 else 'letters have',
+        printing_today_or_tomorrow()
+    )
+
     return render_template(
         'views/jobs/job.html',
         finished=(total_notifications == processed_notifications),
@@ -110,7 +115,7 @@ def view_job(service_id, job_id):
             request.args.get('just_sent') == 'yes' and
             template['template_type'] == 'letter'
         ),
-        printing_day=printing_today_or_tomorrow()
+        just_sent_message=just_sent_message,
     )
 
 
diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html
index e65d4bf97..25d4745c9 100644
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -14,9 +14,7 @@
     </h1>
 
     {% if just_sent %}
-      {{ banner('Your letter has been sent. Printing starts {} at 5.30pm.'.format(printing_day),
-        type='default',
-        with_tick=True) }}
+      {{ banner(just_sent_message, type='default', with_tick=True) }}
     {% else %}
       {{ ajax_block(partials, updates_url, 'status', finished=finished) }}
     {% endif %}
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index 01223abc8..4d7c008b7 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -366,6 +366,29 @@ def test_should_show_letter_job_with_banner_after_sending_before_1730(
     )
 
 
+@freeze_time("2016-01-01 11:09:00")
+def test_should_show_letter_job_with_banner_when_there_are_multiple_CSV_rows(
+    client_request,
+    mock_get_service_letter_template,
+    mock_get_job_in_progress,
+    mock_get_notifications,
+    mock_get_service_data_retention_by_notification_type,
+    fake_uuid,
+):
+
+    page = client_request.get(
+        'main.view_job',
+        service_id=SERVICE_ONE_ID,
+        job_id=fake_uuid,
+        just_sent='yes',
+    )
+
+    assert page.select('p.bottom-gutter') == []
+    assert normalize_spaces(page.select('.banner-default-with-tick')[0].text) == (
+        'Your letters have been sent. Printing starts today at 5.30pm.'
+    )
+
+
 @freeze_time("2016-01-01 18:09:00")
 def test_should_show_letter_job_with_banner_after_sending_after_1730(
     client_request,