fix bug where job reports showed before jobs finished

for a job to be finished there are two requirements:

* the status to be "finished"
* the percentage complete to be 100%

The job status is set to finished when the process_job task finishes
(even though not all process_row may have finished). The
percentage_complete is calculated by comparing the number of
notifications in the database with the number of rows in the
spreadsheet.

This was inadvertently changed from an "and" to an "or" clause two years
ago. This meant that people could download a report when the status was
finished but not all notifications were present in the database. Lets
change it back.

7d52ac97f1 (diff-44b012cad205379c481bed244ddb2294bae5ee85dcd01f4aee932a2bd85b67b2L86-R100)
This commit is contained in:
Leo Hemsted
2022-01-14 12:41:01 +00:00
committed by Leo Hemsted
parent 8d337bdd03
commit a602ffceb9
2 changed files with 32 additions and 1 deletions

View File

@@ -107,7 +107,7 @@ class Job(JSONModel):
@property
def still_processing(self):
return (
self.percentage_complete < 100 and self.status != 'finished'
self.status != 'finished' or self.percentage_complete < 100
)
@cached_property

View File

@@ -0,0 +1,31 @@
import pytest
from app.models.job import Job
from tests import job_json, user_json
from tests.conftest import SERVICE_ONE_ID
@pytest.mark.parametrize(
'job_status, num_notifications_created, expected_still_processing',
[
('scheduled', 0, True),
('cancelled', 10, True),
('finished', 5, True),
('finished', 10, False),
]
)
def test_still_processing(
notify_admin,
job_status,
num_notifications_created,
expected_still_processing
):
json = job_json(
service_id=SERVICE_ONE_ID,
created_by=user_json(),
notification_count=10,
notifications_requested=num_notifications_created,
job_status=job_status
)
job = Job(json)
assert job.still_processing == expected_still_processing