darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-26 21:28:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2563 from alphagov/change_content_cancel_letter_job

Browse Source 
Change content of error messages when letter job can't be cancelled.
This commit is contained in:
Pea (Malgorzata Tyczynska)
2019-07-22 13:28:11 +01:00
committed by GitHub
parent 01c4ec3e68 957cf46748
commit c0966ad90d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/jobs_dao.py
View File

@@ -177,13 +177,13 @@ def can_letter_job_be_cancelled(job):
).all()
count_notifications = len(notifications)
if job.job_status != JOB_STATUS_FINISHED or count_notifications != job.notification_count:
return False, "This job is still being processed. Wait a couple of minutes and try again."
return False, "We are still processing these letters, please try again in a minute."
count_cancellable_notifications = len([
n for n in notifications if n.status in CANCELLABLE_JOB_LETTER_STATUSES
])
if count_cancellable_notifications != job.notification_count or not letter_can_be_cancelled(
NOTIFICATION_CREATED, job.created_at
):
return False, "Sorry, it's too late, letters have already been sent."
return False, "It’s too late to cancel sending, these letters have already been sent."
return True, None

8
tests/app/dao/test_jobs_dao.py
View File

@@ -342,7 +342,7 @@ def test_can_letter_job_be_cancelled_returns_false_and_error_message_if_notifica
create_notification(template=job.template, job=job, status='created')
result, errors = can_letter_job_be_cancelled(job)
assert not result
assert errors == "Sorry, it's too late, letters have already been sent."
assert errors == "It’s too late to cancel sending, these letters have already been sent."
def test_can_letter_job_be_cancelled_returns_false_and_error_message_if_letters_already_sent_to_dvla(
@@ -355,7 +355,7 @@ def test_can_letter_job_be_cancelled_returns_false_and_error_message_if_letters_
with freeze_time('2019-06-13 17:32'):
result, errors = can_letter_job_be_cancelled(job)
assert not result
assert errors == "Sorry, it's too late, letters have already been sent."
assert errors == "It’s too late to cancel sending, these letters have already been sent."
assert letter.status == 'created'
assert job.job_status == 'finished'
@@ -379,7 +379,7 @@ def test_can_letter_job_be_cancelled_returns_false_and_error_message_if_job_not_
create_notification(template=job.template, job=job, status='created')
result, errors = can_letter_job_be_cancelled(job)
assert not result
assert errors == "This job is still being processed. Wait a couple of minutes and try again."
assert errors == "We are still processing these letters, please try again in a minute."
@freeze_time('2019-06-13 13:00')
@@ -390,4 +390,4 @@ def test_can_letter_job_be_cancelled_returns_false_and_error_message_if_notifica
create_notification(template=job.template, job=job, status='created')
result, errors = can_letter_job_be_cancelled(job)
assert not result
assert errors == "This job is still being processed. Wait a couple of minutes and try again."
assert errors == "We are still processing these letters, please try again in a minute."