From e621dddd6d68ef92434fd65d0ada331171e7cc98 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 2 Aug 2016 21:27:23 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20show=20the=20download=20until?=
 =?UTF-8?q?=20the=20job=20is=20complete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The CSV report isn’t very useful until it has all the rows from your
original file. So we shouldn’t show you the link until all notifications
have been created.

Until this point, it’s useful to know how much longer you need to wait,
so this commit adds a percentage count of how much of the file has been
processed.
---
 app/main/views/jobs.py                        |  9 +++++---
 .../partials/jobs/notifications.html          | 18 ++++++++++-----
 tests/app/main/views/test_jobs.py             | 23 +++++++++++++++++++
 tests/conftest.py                             | 12 ++++++++++
 4 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index b623917e9..1fe6d93aa 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -312,6 +312,9 @@ def _get_job_counts(job, help_argument):
 def get_job_partials(job):
     filter_args = _parse_filter_args(request.args)
     _set_status_filters(filter_args)
+    notifications = notification_api_client.get_notifications_for_service(
+        job['service'], job['id'], status=filter_args.get('status')
+    )
     return {
         'counts': render_template(
             'partials/jobs/count.html',
@@ -321,9 +324,9 @@ def get_job_partials(job):
         ),
         'notifications': render_template(
             'partials/jobs/notifications.html',
-            notifications=notification_api_client.get_notifications_for_service(
-                job['service'], job['id'], status=filter_args.get('status')
-            )['notifications'],
+            notifications=notifications['notifications'],
+            more_than_one_page=bool(notifications.get('links', {}).get('next')),
+            percentage_complete=(job['notifications_sent'] / job['notification_count'] * 100),
             download_link=url_for(
                 '.view_job_csv',
                 service_id=current_service['id'],
diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html
index 27243bfbb..20dca0c4f 100644
--- a/app/templates/partials/jobs/notifications.html
+++ b/app/templates/partials/jobs/notifications.html
@@ -4,12 +4,18 @@
   <div class="dashboard-table">
 {% endif %}
 
-  {% if notifications and not help %}
-    <p class="bottom-gutter">
-      <a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
-      &emsp;
-      <span id="time-left">{{ time_left }}</span>
-    </p>
+  {% if not help %}
+    {% if percentage_complete < 100 %}
+      <p class="bottom-gutter hint">
+        Report is {{ "{:.0f}%".format(percentage_complete) }} complete…
+      </p>
+    {% elif notifications %}
+      <p class="bottom-gutter">
+        <a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
+        &emsp;
+        <span id="time-left">{{ time_left }}</span>
+      </p>
+    {% endif %}
   {% endif %}
 
   {% call(item, row_number) list_table(
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index c13a42519..d33c85511 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -102,6 +102,29 @@ def test_should_show_page_for_one_job(
         )
 
 
+def test_should_show_job_in_progress(
+    app_,
+    service_one,
+    active_user_with_permissions,
+    mock_get_service_template,
+    mock_get_job_in_progress,
+    mocker,
+    mock_get_notifications,
+    fake_uuid
+):
+    with app_.test_request_context(), app_.test_client() as client:
+        client.login(active_user_with_permissions, mocker, service_one)
+        response = client.get(url_for(
+            'main.view_job',
+            service_id=service_one['id'],
+            job_id=fake_uuid
+        ))
+
+        assert response.status_code == 200
+        page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+        assert page.find('p', {'class': 'hint'}).text.strip() == 'Report is 50% complete…'
+
+
 def test_should_show_not_show_csv_download_in_tour(
     app_,
     service_one,
diff --git a/tests/conftest.py b/tests/conftest.py
index 2ace067a9..47fd6e1b7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -858,6 +858,18 @@ def mock_get_job(mocker, api_user_active):
     return mocker.patch('app.job_api_client.get_job', side_effect=_get_job)
 
 
+@pytest.fixture(scope='function')
+def mock_get_job_in_progress(mocker, api_user_active):
+    def _get_job(service_id, job_id):
+        return {"data": job_json(
+            service_id, api_user_active, job_id=job_id,
+            notification_count=10,
+            notifications_sent=5
+        )}
+
+    return mocker.patch('app.job_api_client.get_job', side_effect=_get_job)
+
+
 @pytest.fixture(scope='function')
 def mock_get_jobs(mocker, api_user_active):
     def _get_jobs(service_id, limit_days=None):