From 46292949cd0699c753928e36eae72ada719b7ba5 Mon Sep 17 00:00:00 2001
From: Pea Tyczynska <pea.tyczynska@digital.cabinet-office.gov.uk>
Date: Tue, 4 Feb 2020 14:19:07 +0000
Subject: [PATCH 1/2] Fix bug where job url type was constructed for letter on
 uploads page

---
 app/templates/views/dashboard/_jobs.html | 2 +-
 tests/app/main/views/test_uploads.py     | 8 ++++++++
 tests/conftest.py                        | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html
index 9020b926c..a4066b4a7 100644
--- a/app/templates/views/dashboard/_jobs.html
+++ b/app/templates/views/dashboard/_jobs.html
@@ -19,7 +19,7 @@
   ) %}
     {% call row_heading() %}
       <div class="file-list">
-        {% if item.upload_type == 'letter' %}
+        {% if item._dict.upload_type == 'letter' %}
           <a class="file-list-filename" href="{{ url_for('.view_notification', service_id=current_service.id, notification_id=item.id) }}">{{ item.original_file_name }}</a>
         {% else %}
           <a class="file-list-filename" href="{{ url_for('.view_job', service_id=current_service.id, job_id=item.id) }}">{{ item.original_file_name }}</a>
diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py
index ed46f500e..73f1e282f 100644
--- a/tests/app/main/views/test_uploads.py
+++ b/tests/app/main/views/test_uploads.py
@@ -42,6 +42,14 @@ def test_get_upload_hub_page(
         'main.upload_letter', service_id=SERVICE_ONE_ID
     )
 
+    assert page.findAll(
+        'a', {'class': 'file-list-filename'}
+    )[0].attrs['href'] == '/services/{}/jobs/job_id_1'.format(SERVICE_ONE_ID)
+
+    assert page.findAll(
+        'a', {'class': 'file-list-filename'}
+    )[1].attrs['href'] == '/services/{}/notification/letter_id_1'.format(SERVICE_ONE_ID)
+
 
 def test_get_upload_letter(client_request):
     page = client_request.get('main.upload_letter', service_id=SERVICE_ONE_ID)
diff --git a/tests/conftest.py b/tests/conftest.py
index 27b42cc32..d849215ab 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1733,8 +1733,8 @@ def mock_get_uploads(mocker, api_user_active):
                     'created_at': '2016-01-01 11:09:00.061258',
                     'statistics': [{'count': 8, 'status': 'delivered'}, {'count': 2, 'status': 'temporary-failure'}],
                     'upload_type': 'job'},
-                   {'id': 'job_id_1',
-                    'original_file_name': 'some.csv',
+                   {'id': 'letter_id_1',
+                    'original_file_name': 'some.pdf',
                     'notification_count': 1,
                     'created_at': '2016-01-01 11:09:00.061258',
                     'statistics': [{'count': 1, 'status': 'delivered'}],

From 9ebd18ea857a6e8fed68662d3341e286deb0145a Mon Sep 17 00:00:00 2001
From: Pea Tyczynska <pea.tyczynska@digital.cabinet-office.gov.uk>
Date: Tue, 4 Feb 2020 15:36:55 +0000
Subject: [PATCH 2/2] Add upload_type property to Job class

---
 app/models/job.py                        | 4 ++++
 app/templates/views/dashboard/_jobs.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/job.py b/app/models/job.py
index f03b045fc..5cd92c3a0 100644
--- a/app/models/job.py
+++ b/app/models/job.py
@@ -52,6 +52,10 @@ class Job(JSONModel):
     def scheduled_for(self):
         return self._dict.get('scheduled_for')
 
+    @property
+    def upload_type(self):
+        return self._dict.get('upload_type')
+
     @property
     def processing_started(self):
         if not self._dict.get('processing_started'):
diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html
index a4066b4a7..9020b926c 100644
--- a/app/templates/views/dashboard/_jobs.html
+++ b/app/templates/views/dashboard/_jobs.html
@@ -19,7 +19,7 @@
   ) %}
     {% call row_heading() %}
       <div class="file-list">
-        {% if item._dict.upload_type == 'letter' %}
+        {% if item.upload_type == 'letter' %}
           <a class="file-list-filename" href="{{ url_for('.view_notification', service_id=current_service.id, notification_id=item.id) }}">{{ item.original_file_name }}</a>
         {% else %}
           <a class="file-list-filename" href="{{ url_for('.view_job', service_id=current_service.id, job_id=item.id) }}">{{ item.original_file_name }}</a>