darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 09:26:08 -05: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