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

down to line 179

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-16 11:49:30 -07:00
parent 8b38512599
commit 0182affc89
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/dao/jobs_dao.py
View File

@@ -81,12 +81,6 @@ def dao_get_jobs_by_service_id(
items = db.session.execute(stmt).scalars().all() items = db.session.execute(stmt).scalars().all()
return Pagination(items, page, page_size, total_items) return Pagination(items, page, page_size, total_items)
# return (
# Job.query.filter(*query_filter)
# .order_by(Job.processing_started.desc(), Job.created_at.desc())
# .paginate(page=page, per_page=page_size)
# )
def dao_get_scheduled_job_stats( def dao_get_scheduled_job_stats(
service_id, service_id,
@@ -121,15 +115,15 @@ def dao_set_scheduled_jobs_to_pending():
the transaction so that if the task is run more than once concurrently, one task will block the other select the transaction so that if the task is run more than once concurrently, one task will block the other select
from completing until it commits. from completing until it commits.
""" """
jobs = ( stmt = (
Job.query.filter( select(
Job.job_status == JobStatus.SCHEDULED, Job.job_status == JobStatus.SCHEDULED,
Job.scheduled_for < utc_now(), Job.scheduled_for < utc_now(),
) )
.order_by(asc(Job.scheduled_for)) .order_by(asc(Job.scheduled_for))
.with_for_update() .with_for_update()
.all()
) )
jobs = db.session.execute(stmt).all()
for job in jobs: for job in jobs:
job.job_status = JobStatus.PENDING job.job_status = JobStatus.PENDING
@@ -141,12 +135,13 @@ def dao_set_scheduled_jobs_to_pending():
def dao_get_future_scheduled_job_by_id_and_service_id(job_id, service_id): def dao_get_future_scheduled_job_by_id_and_service_id(job_id, service_id):
return Job.query.filter( stmt = select(Job).filter(
Job.service_id == service_id, Job.service_id == service_id,
Job.id == job_id, Job.id == job_id,
Job.job_status == JobStatus.SCHEDULED, Job.job_status == JobStatus.SCHEDULED,
Job.scheduled_for > utc_now(), Job.scheduled_for > utc_now(),
).one() )
return db.session.execute(stmt).scalars().one()
def dao_create_job(job): def dao_create_job(job):