Merge pull request #3437 from alphagov/group-uploaded-letters

Group uploaded letters by printing date

tests/app/main/views/test_notifications.py

@@ -117,6 +117,10 @@ def test_notification_status_page_respects_redaction(
         {'from_job': 'job_id'},
         partial(url_for, 'main.view_job', job_id='job_id'),
     ),
+    (
+        {'from_uploaded_letters': '2020-02-02'},
+        partial(url_for, 'main.uploaded_letters', letter_print_day='2020-02-02'),
+    ),
     (
         {'help': '0'},
         None,

tests/app/main/views/test_uploads.py

@@ -91,6 +91,7 @@ def test_get_upload_hub_with_no_uploads(
     assert not page.select('.file-list-filename')
 
 
+@freeze_time('2017-10-10 10:10:10')
 def test_get_upload_hub_page(
     mocker,
     client_request,
@@ -108,32 +109,198 @@ def test_get_upload_hub_page(
 
     uploads = page.select('tbody tr')
 
+    assert len(uploads) == 3
+
     assert normalize_spaces(uploads[0].text.strip()) == (
+        'Uploaded letters '
+        'Printing today at 5:30pm '
+        '33 letters'
+    )
+    assert uploads[0].select_one('a.file-list-filename-large')['href'] == url_for(
+        'main.uploaded_letters',
+        service_id=SERVICE_ONE_ID,
+        letter_print_day='2017-10-10',
+    )
+
+    assert normalize_spaces(uploads[1].text.strip()) == (
         'some.csv '
         'Sent 1 January 2016 at 11:09am '
         '0 sending 8 delivered 2 failed'
     )
-    assert uploads[0].select_one('a.file-list-filename-large')['href'] == (
+    assert uploads[1].select_one('a.file-list-filename-large')['href'] == (
         '/services/{}/jobs/job_id_1'.format(SERVICE_ONE_ID)
     )
 
-    assert normalize_spaces(uploads[1].text.strip()) == (
+    assert normalize_spaces(uploads[2].text.strip()) == (
         'some.pdf '
         'Sent 1 January 2016 at 11:09am '
         'Firstname Lastname '
         '123 Example Street'
     )
-    assert normalize_spaces(str(uploads[1].select_one('.govuk-body'))) == (
+    assert normalize_spaces(str(uploads[2].select_one('.govuk-body'))) == (
         '<p class="govuk-body letter-recipient-summary"> '
         'Firstname Lastname<br/> '
         '123 Example Street<br/> '
         '</p>'
     )
-    assert uploads[1].select_one('a.file-list-filename-large')['href'] == (
+    assert uploads[2].select_one('a.file-list-filename-large')['href'] == (
         '/services/{}/notification/letter_id_1'.format(SERVICE_ONE_ID)
     )
 
 
+@freeze_time('2020-02-02 14:00')
+def test_get_uploaded_letters(
+    mocker,
+    client_request,
+    service_one,
+    mock_get_uploaded_letters,
+):
+    page = client_request.get(
+        'main.uploaded_letters',
+        service_id=SERVICE_ONE_ID,
+        letter_print_day='2020-02-02'
+    )
+    assert page.select_one('.govuk-back-link')['href'] == url_for(
+        'main.uploads',
+        service_id=SERVICE_ONE_ID,
+    )
+    assert normalize_spaces(
+        page.select_one('h1').text
+    ) == (
+        'Uploaded letters'
+    )
+    assert normalize_spaces(
+        page.select('main p')[0].text
+    ) == (
+        '1,234 letters'
+    )
+    assert normalize_spaces(
+        page.select('main p')[1].text
+    ) == (
+        'Printing starts today at 5:30pm'
+    )
+
+    assert [
+        normalize_spaces(row.text)
+        for row in page.select('tbody tr')
+    ] == [
+        (
+            'Homer-Simpson.pdf '
+            '742 Evergreen Terrace '
+            '2 February at 1:59pm'
+        ),
+        (
+            'Kevin-McCallister.pdf '
+            '671 Lincoln Avenue, Winnetka '
+            '2 February at 12:59pm'
+        ),
+    ]
+
+    assert [
+        link['href'] for link in page.select('tbody tr a')
+    ] == [
+        url_for(
+            'main.view_notification',
+            service_id=SERVICE_ONE_ID,
+            notification_id='03e34025-be54-4d43-8e6a-fb1ea0fd1f29',
+            from_uploaded_letters='2020-02-02',
+        ),
+        url_for(
+            'main.view_notification',
+            service_id=SERVICE_ONE_ID,
+            notification_id='fc090d91-e761-4464-9041-9c4594c96a35',
+            from_uploaded_letters='2020-02-02',
+        ),
+    ]
+
+    next_page_link = page.select_one('a[rel=next]')
+    prev_page_link = page.select_one('a[rel=previous]')
+    assert next_page_link['href'] == url_for(
+        'main.uploaded_letters', service_id=SERVICE_ONE_ID, letter_print_day='2020-02-02', page=2
+    )
+    assert normalize_spaces(next_page_link.text) == (
+        'Next page '
+        'page 2'
+    )
+    assert prev_page_link['href'] == url_for(
+        'main.uploaded_letters', service_id=SERVICE_ONE_ID, letter_print_day='2020-02-02', page=0
+    )
+    assert normalize_spaces(prev_page_link.text) == (
+        'Previous page '
+        'page 0'
+    )
+
+    mock_get_uploaded_letters.assert_called_once_with(
+        SERVICE_ONE_ID,
+        letter_print_day='2020-02-02',
+        page=1,
+    )
+
+
+@freeze_time('2020-02-02 14:00')
+def test_get_empty_uploaded_letters_page(
+    mocker,
+    client_request,
+    service_one,
+    mock_get_no_uploaded_letters,
+):
+    page = client_request.get(
+        'main.uploaded_letters',
+        service_id=SERVICE_ONE_ID,
+        letter_print_day='2020-02-02'
+    )
+    page.select_one('main table')
+
+    assert not page.select('tbody tr')
+    assert not page.select_one('a[rel=next]')
+    assert not page.select_one('a[rel=previous]')
+
+
+@freeze_time('2020-02-02')
+def test_get_uploaded_letters_passes_through_page_argument(
+    mocker,
+    client_request,
+    service_one,
+    mock_get_uploaded_letters,
+):
+    client_request.get(
+        'main.uploaded_letters',
+        service_id=SERVICE_ONE_ID,
+        letter_print_day='2020-02-02',
+        page=99,
+    )
+    mock_get_uploaded_letters.assert_called_once_with(
+        SERVICE_ONE_ID,
+        letter_print_day='2020-02-02',
+        page=99,
+    )
+
+
+def test_get_uploaded_letters_404s_for_bad_page_arguments(
+    mocker,
+    client_request,
+):
+    client_request.get(
+        'main.uploaded_letters',
+        service_id=SERVICE_ONE_ID,
+        letter_print_day='2020-02-02',
+        page='one',
+        _expected_status=404,
+    )
+
+
+def test_get_uploaded_letters_404s_for_invalid_date(
+    mocker,
+    client_request,
+):
+    client_request.get(
+        'main.uploaded_letters',
+        service_id=SERVICE_ONE_ID,
+        letter_print_day='1234-56-78',
+        _expected_status=404,
+    )
+
+
 def test_get_upload_letter(client_request):
     page = client_request.get('main.upload_letter', service_id=SERVICE_ONE_ID)