darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 15:31:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return specific error messages if job cannot be cancelled

Browse Source 
Also move checking if job can be cancelled to the endpoint
This commit is contained in:
Pea Tyczynska
2019-06-13 15:55:56 +01:00
parent cc966b1cf0
commit da65ba0c91
4 changed files with 128 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/job/rest.py
View File

@@ -15,7 +15,7 @@ from app.dao.jobs_dao import (
dao_get_future_scheduled_job_by_id_and_service_id,
dao_get_notification_outcomes_for_job,
dao_cancel_letter_job,
can_cancel_letter_job
can_letter_job_be_cancelled
)
from app.dao.fact_notification_status_dao import fetch_notification_statuses_for_job
from app.dao.services_dao import dao_fetch_service_by_id
@@ -63,17 +63,15 @@ def cancel_job(service_id, job_id):
return get_job_by_service_and_job_id(service_id, job_id)
@job_blueprint.route('/<job_id>/cancel-letter-job')
@job_blueprint.route('/<job_id>/cancel-letter-job', methods=['POST'])
def cancel_letter_job(service_id, job_id):
job = dao_get_job_by_service_id_and_job_id(service_id, job_id)
if can_cancel_letter_job(job):
dao_cancel_letter_job(job)
return jsonify(), 201
can_we_cancel = can_letter_job_be_cancelled(job)
if can_we_cancel is True:
data = dao_cancel_letter_job(job)
return jsonify(data), 200
else:
# reasons the letter can't be cancelled:
# letters are not yet saved to db --> can still cancel but later
# it's too late
return jsonify("CHANGE ME: some error to say the job can't be cancelled"), 400
return jsonify(message=can_we_cancel), 400
@job_blueprint.route('/<job_id>/notifications', methods=['GET'])