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/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 11538dde2..b5c89797b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1760,8 +1760,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'}],