darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Pull cancellable job statuses from utils and fix tests

Browse Source
This commit is contained in:
Pea Tyczynska
2019-06-21 16:55:38 +01:00
parent da65ba0c91
commit 090769a069
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/dao/jobs_dao.py
View File

@@ -2,7 +2,7 @@ import uuid
from datetime import datetime, timedelta
from flask import current_app
from notifications_utils.letter_timings import letter_can_be_cancelled
from notifications_utils.letter_timings import letter_can_be_cancelled, CANCELLABLE_JOB_LETTER_STATUSES
from notifications_utils.statsd_decorators import statsd
from sqlalchemy import (
asc,
@@ -30,11 +30,6 @@ from app.models import (
)
CANCELLABLE_LETTER_STATUSES = [
'created', 'cancelled', 'virus-scan-failed', 'validation-failed', 'technical-failure', 'pending-virus-check'
]
@statsd(namespace="dao")
def dao_get_notification_outcomes_for_job(service_id, job_id):
return db.session.query(
@@ -176,16 +171,19 @@ def can_letter_job_be_cancelled(job):
template = dao_get_template_by_id(job.template_id)
if template.template_type != LETTER_TYPE:
return "Only letter jobs can be cancelled through this endpoint. This is not a letter job."
if job.job_status != JOB_STATUS_FINISHED:
return "This job is still being processed. Wait a couple of minutes and try again."
count_notifications = Notification.query.filter(
Notification.job_id == job.id,
Notification.status.in_(CANCELLABLE_LETTER_STATUSES)
).count()
if count_notifications != job.notification_count:
notifications = Notification.query.filter(
Notification.job_id == job.id
).all()
count_notifications = len(notifications)
if job.job_status != JOB_STATUS_FINISHED or count_notifications != job.notification_count:
return "This job is still being processed. Wait a couple of minutes and try again."
if letter_can_be_cancelled(NOTIFICATION_CREATED, job.created_at):
return True
else:
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 "Sorry, it's too late, letters have already been sent."
return True