mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-20 07:21:13 -05:00
notify-api-412 use black to enforce python style standards
This commit is contained in:
174
app/job/rest.py
174
app/job/rest.py
@@ -37,24 +37,26 @@ from app.schemas import (
|
||||
)
|
||||
from app.utils import midnight_n_days_ago, pagination_links
|
||||
|
||||
job_blueprint = Blueprint('job', __name__, url_prefix='/service/<uuid:service_id>/job')
|
||||
job_blueprint = Blueprint("job", __name__, url_prefix="/service/<uuid:service_id>/job")
|
||||
|
||||
|
||||
register_errors(job_blueprint)
|
||||
|
||||
|
||||
@job_blueprint.route('/<job_id>', methods=['GET'])
|
||||
@job_blueprint.route("/<job_id>", methods=["GET"])
|
||||
def get_job_by_service_and_job_id(service_id, job_id):
|
||||
job = dao_get_job_by_service_id_and_job_id(service_id, job_id)
|
||||
statistics = dao_get_notification_outcomes_for_job(service_id, job_id)
|
||||
data = job_schema.dump(job)
|
||||
|
||||
data['statistics'] = [{'status': statistic[1], 'count': statistic[0]} for statistic in statistics]
|
||||
data["statistics"] = [
|
||||
{"status": statistic[1], "count": statistic[0]} for statistic in statistics
|
||||
]
|
||||
|
||||
return jsonify(data=data)
|
||||
|
||||
|
||||
@job_blueprint.route('/<job_id>/cancel', methods=['POST'])
|
||||
@job_blueprint.route("/<job_id>/cancel", methods=["POST"])
|
||||
def cancel_job(service_id, job_id):
|
||||
job = dao_get_future_scheduled_job_by_id_and_service_id(job_id, service_id)
|
||||
job.job_status = JOB_STATUS_CANCELLED
|
||||
@@ -63,92 +65,103 @@ def cancel_job(service_id, job_id):
|
||||
return get_job_by_service_and_job_id(service_id, job_id)
|
||||
|
||||
|
||||
@job_blueprint.route('/<job_id>/notifications', methods=['GET'])
|
||||
@job_blueprint.route("/<job_id>/notifications", methods=["GET"])
|
||||
def get_all_notifications_for_service_job(service_id, job_id):
|
||||
data = notifications_filter_schema.load(request.args)
|
||||
page = data['page'] if 'page' in data else 1
|
||||
page_size = data['page_size'] if 'page_size' in data else current_app.config.get('PAGE_SIZE')
|
||||
page = data["page"] if "page" in data else 1
|
||||
page_size = (
|
||||
data["page_size"]
|
||||
if "page_size" in data
|
||||
else current_app.config.get("PAGE_SIZE")
|
||||
)
|
||||
paginated_notifications = get_notifications_for_job(
|
||||
service_id,
|
||||
job_id,
|
||||
filter_dict=data,
|
||||
page=page,
|
||||
page_size=page_size)
|
||||
service_id, job_id, filter_dict=data, page=page, page_size=page_size
|
||||
)
|
||||
|
||||
kwargs = request.args.to_dict()
|
||||
kwargs['service_id'] = service_id
|
||||
kwargs['job_id'] = job_id
|
||||
kwargs["service_id"] = service_id
|
||||
kwargs["job_id"] = job_id
|
||||
|
||||
notifications = None
|
||||
if data.get('format_for_csv'):
|
||||
notifications = [notification.serialize_for_csv() for notification in paginated_notifications.items]
|
||||
if data.get("format_for_csv"):
|
||||
notifications = [
|
||||
notification.serialize_for_csv()
|
||||
for notification in paginated_notifications.items
|
||||
]
|
||||
else:
|
||||
notifications = notification_with_template_schema.dump(paginated_notifications.items, many=True)
|
||||
|
||||
return jsonify(
|
||||
notifications=notifications,
|
||||
page_size=page_size,
|
||||
total=paginated_notifications.total,
|
||||
links=pagination_links(
|
||||
paginated_notifications,
|
||||
'.get_all_notifications_for_service_job',
|
||||
**kwargs
|
||||
notifications = notification_with_template_schema.dump(
|
||||
paginated_notifications.items, many=True
|
||||
)
|
||||
), 200
|
||||
|
||||
return (
|
||||
jsonify(
|
||||
notifications=notifications,
|
||||
page_size=page_size,
|
||||
total=paginated_notifications.total,
|
||||
links=pagination_links(
|
||||
paginated_notifications,
|
||||
".get_all_notifications_for_service_job",
|
||||
**kwargs,
|
||||
),
|
||||
),
|
||||
200,
|
||||
)
|
||||
|
||||
|
||||
@job_blueprint.route('/<job_id>/notification_count', methods=['GET'])
|
||||
@job_blueprint.route("/<job_id>/notification_count", methods=["GET"])
|
||||
def get_notification_count_for_job_id(service_id, job_id):
|
||||
dao_get_job_by_service_id_and_job_id(service_id, job_id)
|
||||
count = dao_get_notification_count_for_job_id(job_id=job_id)
|
||||
return jsonify(
|
||||
count=count
|
||||
), 200
|
||||
return jsonify(count=count), 200
|
||||
|
||||
|
||||
@job_blueprint.route('', methods=['GET'])
|
||||
@job_blueprint.route("", methods=["GET"])
|
||||
def get_jobs_by_service(service_id):
|
||||
if request.args.get('limit_days'):
|
||||
if request.args.get("limit_days"):
|
||||
try:
|
||||
limit_days = int(request.args['limit_days'])
|
||||
limit_days = int(request.args["limit_days"])
|
||||
except ValueError:
|
||||
errors = {'limit_days': ['{} is not an integer'.format(request.args['limit_days'])]}
|
||||
errors = {
|
||||
"limit_days": [
|
||||
"{} is not an integer".format(request.args["limit_days"])
|
||||
]
|
||||
}
|
||||
raise InvalidRequest(errors, status_code=400)
|
||||
else:
|
||||
limit_days = None
|
||||
|
||||
return jsonify(**get_paginated_jobs(
|
||||
service_id,
|
||||
limit_days=limit_days,
|
||||
statuses=[x.strip() for x in request.args.get('statuses', '').split(',')],
|
||||
page=int(request.args.get('page', 1)),
|
||||
))
|
||||
return jsonify(
|
||||
**get_paginated_jobs(
|
||||
service_id,
|
||||
limit_days=limit_days,
|
||||
statuses=[x.strip() for x in request.args.get("statuses", "").split(",")],
|
||||
page=int(request.args.get("page", 1)),
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@job_blueprint.route('', methods=['POST'])
|
||||
@job_blueprint.route("", methods=["POST"])
|
||||
def create_job(service_id):
|
||||
service = dao_fetch_service_by_id(service_id)
|
||||
if not service.active:
|
||||
raise InvalidRequest("Create job is not allowed: service is inactive ", 403)
|
||||
|
||||
data = request.get_json()
|
||||
data.update({
|
||||
"service": service_id
|
||||
})
|
||||
data.update({"service": service_id})
|
||||
try:
|
||||
data.update(
|
||||
**get_job_metadata_from_s3(service_id, data['id'])
|
||||
)
|
||||
data.update(**get_job_metadata_from_s3(service_id, data["id"]))
|
||||
except KeyError:
|
||||
raise InvalidRequest({'id': ['Missing data for required field.']}, status_code=400)
|
||||
raise InvalidRequest(
|
||||
{"id": ["Missing data for required field."]}, status_code=400
|
||||
)
|
||||
|
||||
data['template'] = data.pop('template_id')
|
||||
template = dao_get_template_by_id(data['template'])
|
||||
data["template"] = data.pop("template_id")
|
||||
template = dao_get_template_by_id(data["template"])
|
||||
|
||||
if data.get('valid') != 'True':
|
||||
if data.get("valid") != "True":
|
||||
raise InvalidRequest("File is not valid, can't create job", 400)
|
||||
|
||||
errors = unarchived_template_schema.validate({'archived': template.archived})
|
||||
errors = unarchived_template_schema.validate({"archived": template.archived})
|
||||
|
||||
if errors:
|
||||
raise InvalidRequest(errors, status_code=400)
|
||||
@@ -162,27 +175,33 @@ def create_job(service_id):
|
||||
|
||||
dao_create_job(job)
|
||||
|
||||
sender_id = data.get('sender_id')
|
||||
sender_id = data.get("sender_id")
|
||||
|
||||
if job.job_status == JOB_STATUS_PENDING:
|
||||
process_job.apply_async([str(job.id)], {'sender_id': sender_id}, queue=QueueNames.JOBS)
|
||||
process_job.apply_async(
|
||||
[str(job.id)], {"sender_id": sender_id}, queue=QueueNames.JOBS
|
||||
)
|
||||
|
||||
job_json = job_schema.dump(job)
|
||||
job_json['statistics'] = []
|
||||
job_json["statistics"] = []
|
||||
|
||||
return jsonify(data=job_json), 201
|
||||
|
||||
|
||||
@job_blueprint.route('/scheduled-job-stats', methods=['GET'])
|
||||
@job_blueprint.route("/scheduled-job-stats", methods=["GET"])
|
||||
def get_scheduled_job_stats(service_id):
|
||||
count, soonest_scheduled_for = dao_get_scheduled_job_stats(service_id)
|
||||
return jsonify(
|
||||
count=count,
|
||||
soonest_scheduled_for=(
|
||||
soonest_scheduled_for.replace(tzinfo=pytz.UTC).isoformat()
|
||||
if soonest_scheduled_for else None
|
||||
return (
|
||||
jsonify(
|
||||
count=count,
|
||||
soonest_scheduled_for=(
|
||||
soonest_scheduled_for.replace(tzinfo=pytz.UTC).isoformat()
|
||||
if soonest_scheduled_for
|
||||
else None
|
||||
),
|
||||
),
|
||||
), 200
|
||||
200,
|
||||
)
|
||||
|
||||
|
||||
def get_paginated_jobs(
|
||||
@@ -196,31 +215,34 @@ def get_paginated_jobs(
|
||||
service_id,
|
||||
limit_days=limit_days,
|
||||
page=page,
|
||||
page_size=current_app.config['PAGE_SIZE'],
|
||||
page_size=current_app.config["PAGE_SIZE"],
|
||||
statuses=statuses,
|
||||
)
|
||||
data = job_schema.dump(pagination.items, many=True)
|
||||
for job_data in data:
|
||||
start = job_data['processing_started']
|
||||
start = job_data["processing_started"]
|
||||
start = dateutil.parser.parse(start).replace(tzinfo=None) if start else None
|
||||
|
||||
if start is None:
|
||||
statistics = []
|
||||
elif start.replace(tzinfo=None) < midnight_n_days_ago(3):
|
||||
# ft_notification_status table
|
||||
statistics = fetch_notification_statuses_for_job(job_data['id'])
|
||||
statistics = fetch_notification_statuses_for_job(job_data["id"])
|
||||
else:
|
||||
# notifications table
|
||||
statistics = dao_get_notification_outcomes_for_job(service_id, job_data['id'])
|
||||
job_data['statistics'] = [{'status': statistic.status, 'count': statistic.count} for statistic in statistics]
|
||||
statistics = dao_get_notification_outcomes_for_job(
|
||||
service_id, job_data["id"]
|
||||
)
|
||||
job_data["statistics"] = [
|
||||
{"status": statistic.status, "count": statistic.count}
|
||||
for statistic in statistics
|
||||
]
|
||||
|
||||
return {
|
||||
'data': data,
|
||||
'page_size': pagination.per_page,
|
||||
'total': pagination.total,
|
||||
'links': pagination_links(
|
||||
pagination,
|
||||
'.get_jobs_by_service',
|
||||
service_id=service_id
|
||||
)
|
||||
"data": data,
|
||||
"page_size": pagination.per_page,
|
||||
"total": pagination.total,
|
||||
"links": pagination_links(
|
||||
pagination, ".get_jobs_by_service", service_id=service_id
|
||||
),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user