From 9ba1dbfffa3638d6b6de6778e9e17d168b786115 Mon Sep 17 00:00:00 2001
From: David McDonald <david.mcdonald@digital.cabinet-office.gov.uk>
Date: Wed, 9 Oct 2019 13:47:28 +0100
Subject: [PATCH] Do not show postage stamp for letter preview

---
 app/main/forms.py                    | 4 +++-
 app/main/views/uploads.py            | 4 ++++
 tests/app/main/views/test_uploads.py | 8 ++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index ecd8af8a8..775de728c 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -775,7 +775,9 @@ class LetterUploadPostageForm(StripWhitespaceForm):
         default='second',
         validators=[DataRequired()]
     )
-    file_id = HiddenField()
+    file_id = HiddenField(
+        validators=[DataRequired()]
+    )
 
 
 class ForgotPasswordForm(StripWhitespaceForm):
diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py
index 0fd7dbe84..f39ccf402 100644
--- a/app/main/views/uploads.py
+++ b/app/main/views/uploads.py
@@ -153,6 +153,10 @@ def uploaded_letter_preview(service_id, file_id):
 
     error = get_letter_validation_error(error_message, invalid_pages, page_count)
     template_dict = service_api_client.get_precompiled_template(service_id)
+    # Override pre compiled letter template postage to none as it has not yet been picked even though
+    # the pre compiled letter template has its postage set as second class as the DB currently requires
+    # a non null value of postage for letter templates
+    template_dict['postage'] = None
 
     form = LetterUploadPostageForm()
 
diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py
index a45daaafc..a9f89bd3d 100644
--- a/tests/app/main/views/test_uploads.py
+++ b/tests/app/main/views/test_uploads.py
@@ -125,9 +125,7 @@ def test_post_upload_letter_shows_letter_preview_for_valid_file(
         )
 
     assert page.find('h1').text == 'tests/test_pdf_files/one_page_pdf.pdf'
-    assert len(page.select('.letter-postage')) == 1
-    assert normalize_spaces(page.select_one('.letter-postage').text) == ('Postage: second class')
-    assert page.select_one('.letter-postage')['class'] == ['letter-postage', 'letter-postage-second']
+    assert len(page.select('.letter-postage')) == 0
 
     letter_images = page.select('main img')
     assert len(letter_images) == 3
@@ -283,9 +281,7 @@ def test_post_upload_letter_shows_letter_preview_for_invalid_file(mocker, client
             _follow_redirects=True,
         )
 
-    assert len(page.select('.letter-postage')) == 1
-    assert normalize_spaces(page.select_one('.letter-postage').text) == ('Postage: first class')
-    assert page.select_one('.letter-postage')['class'] == ['letter-postage', 'letter-postage-first']
+    assert len(page.select('.letter-postage')) == 0
 
     letter_images = page.select('main img')
     assert len(letter_images) == 1