darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 10:21:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

revert pagination for now

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-16 10:16:04 -07:00
parent 9c39de4025
commit 8e3784caee
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/dao/jobs_dao.py
View File

@@ -6,7 +6,8 @@ from flask import current_app
from sqlalchemy import and_, asc, desc, func, select from sqlalchemy import and_, asc, desc, func, select
from app import db from app import db
from app.dao.pagination import Pagination
# from app.dao.pagination import Pagination
from app.enums import JobStatus from app.enums import JobStatus
from app.models import ( from app.models import (
FactNotificationStatus, FactNotificationStatus,
@@ -66,19 +67,25 @@ def dao_get_jobs_by_service_id(
if statuses is not None and statuses != [""]: if statuses is not None and statuses != [""]:
query_filter.append(Job.job_status.in_(statuses)) query_filter.append(Job.job_status.in_(statuses))
total_items = db.session.execute( # total_items = db.session.execute(
select(func.count()).select_from(Job).filter(*query_filter) # select(func.count()).select_from(Job).filter(*query_filter)
).scalar_one() # ).scalar_one()
stmt = ( # stmt = (
select(Job) # select(Job)
.filter(*query_filter) # .filter(*query_filter)
# .order_by(Job.processing_started.desc(), Job.created_at.desc())
# .limit(page_size)
# .offset(page)
# )
# items = db.session.execute(stmt).scalars().all()
# return Pagination(items, page, page_size, total_items)
return (
Job.query.filter(*query_filter)
.order_by(Job.processing_started.desc(), Job.created_at.desc()) .order_by(Job.processing_started.desc(), Job.created_at.desc())
.limit(page_size) .paginate(page=page, per_page=page_size)
.offset(page)
) )
items = db.session.execute(stmt).scalars().all()
return Pagination(items, page, page_size, total_items)
def dao_get_scheduled_job_stats( def dao_get_scheduled_job_stats(