darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-24 00:06:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Kenneth Kehl
2024-11-19 09:04:33 -08:00
parent bfcc8ac708
commit 67aa1e66a6
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/celery/scheduled_tasks.py
View File

@@ -108,42 +108,28 @@ def check_job_status():
Job.job_status == JobStatus.IN_PROGRESS, Job.job_status == JobStatus.IN_PROGRESS,
between(Job.processing_started, thirty_five_minutes_ago, thirty_minutes_ago), between(Job.processing_started, thirty_five_minutes_ago, thirty_minutes_ago),
) )
print(f"QUERY 1 {incomplete_in_progress_jobs}")
incomplete_pending_jobs = select(Job).filter( incomplete_pending_jobs = select(Job).filter(
Job.job_status == JobStatus.PENDING, Job.job_status == JobStatus.PENDING,
Job.scheduled_for.isnot(None), Job.scheduled_for.isnot(None),
between(Job.scheduled_for, thirty_five_minutes_ago, thirty_minutes_ago), between(Job.scheduled_for, thirty_five_minutes_ago, thirty_minutes_ago),
) )
print(f"QUERY 2 {incomplete_pending_jobs}") jobs_not_complete_after_30_minutes = db.session.execute(
union(incomplete_in_progress_jobs, incomplete_pending_jobs).order_by(
jobs_not_complete_after_30_minutes = ( Job.processing_started, Job.scheduled_for
db.session.execute(
union(incomplete_in_progress_jobs, incomplete_pending_jobs).order_by(
Job.processing_started, Job.scheduled_for
)
) )
.all() ).all()
)
print(f"HERE IS JOBS {jobs_not_complete_after_30_minutes}")
# temporarily mark them as ERROR so that they don't get picked up by future check_job_status tasks # temporarily mark them as ERROR so that they don't get picked up by future check_job_status tasks
# if they haven't been re-processed in time. # if they haven't been re-processed in time.
job_ids = [] job_ids = []
for job in jobs_not_complete_after_30_minutes: for job in jobs_not_complete_after_30_minutes:
print(f"HERE IS A JOB {job}")
# job.job_status = JobStatus.ERROR
# print("CHANGED JOB STATUS TO ERROR")
# dao_update_job(job)
db.session.execute( db.session.execute(
update(Job).where(Job.id == job.id).values(job_status=JobStatus.ERROR) update(Job).where(Job.id == job.id).values(job_status=JobStatus.ERROR)
) )
db.session.commit() db.session.commit()
job_ids.append(str(job.id)) job_ids.append(str(job.id))
print(f"APPENDED NEW JOB ID TO LIST WHICH IS {job_ids}")
if job_ids: if job_ids:
current_app.logger.info("Job(s) {} have not completed.".format(job_ids)) current_app.logger.info("Job(s) {} have not completed.".format(job_ids))
process_incomplete_jobs.apply_async([job_ids], queue=QueueNames.JOBS) process_incomplete_jobs.apply_async([job_ids], queue=QueueNames.JOBS)

15
app/dao/notifications_dao.py
View File

@@ -10,6 +10,7 @@ from werkzeug.datastructures import MultiDict
from app import create_uuid, db from app import create_uuid, db
from app.dao.dao_utils import autocommit from app.dao.dao_utils import autocommit
from app.dao.inbound_sms_dao import Pagination
from app.enums import KeyType, NotificationStatus, NotificationType from app.enums import KeyType, NotificationStatus, NotificationType
from app.models import FactNotificationStatus, Notification, NotificationHistory from app.models import FactNotificationStatus, Notification, NotificationHistory
from app.utils import ( from app.utils import (
@@ -193,11 +194,17 @@ def get_notifications_for_job(
if page_size is None: if page_size is None:
page_size = current_app.config["PAGE_SIZE"] page_size = current_app.config["PAGE_SIZE"]
query = Notification.query.filter_by(service_id=service_id, job_id=job_id) query = select(Notification).filter_by(service_id=service_id, job_id=job_id)
query = _filter_query(query, filter_dict) query = _filter_query(query, filter_dict)
return query.order_by(asc(Notification.job_row_number)).paginate( query = query.order_by(asc(Notification.job_row_number))
page=page, per_page=page_size
) results = db.session.execute(query).scalars().all()
page_size = current_app.config["PAGE_SIZE"]
offset = (page - 1) * page_size
paginated_results = results[offset : offset + page_size]
pagination = Pagination(paginated_results, page, page_size, len(results))
return pagination
def dao_get_notification_count_for_job_id(*, job_id): def dao_get_notification_count_for_job_id(*, job_id):