[BUGFIXED]-Job history filtering query

Author: ndasanayaka

userinfo/db/crud.py

@@ -1,6 +1,6 @@
 import base64
 from sqlalchemy.orm import Session
-from sqlalchemy import inspect, func
+from sqlalchemy import inspect, func, case
 from urllib.parse import quote
 from . import models, schemas
 from typing import List
@@ -411,16 +411,25 @@ def get_jobs(db:Session, username: str, all):
             filter(models.Job.status.notin_(['FAILED', 'COMPLETE', 'CANCELLED'])).\
             all()
 
-def filter_jobs(db: Session, status: str, username: str, start: datetime.date, jobname: str):
+def filter_jobs(db: Session, status: str, username: str, jobname: str, submit: datetime.date):
     q = db.query(models.Job)
     if status:
         q = q.filter(models.Job.status == status)
     if username:
         q = q.filter(models.Job.username == username)
     if jobname:
         q = q.filter(models.Job.jobname == jobname)
-    if start:
-        q = q.filter(func.date(models.Job.start) >= start)
+    """ if start:
+        q = q.filter(func.date(models.Job.start) >= start) """
+    if submit:
+        q = q.filter(func.date(models.Job.submitted) >= submit)
+    
+    q = q.order_by(
+        case(
+            [(models.Job.submitted != None, models.Job.submitted)],
+            else_=models.Job.start
+        ).desc()
+    )
     return q.all()
 
 

userinfo/routers/job.py

@@ -14,8 +14,8 @@
 @router.get("")
 def get_jobs(   status: Optional[str] = None, 
                 username: Optional[str] = None, 
-                start: Optional[datetime.date] = None,
                 jobname: Optional[str] = None,
+                submit: Optional[datetime.date] = None,
                 user: dict = Depends(keycloak.decode), 
                 db: Session = Depends(udb.get_db)):
     logger.debug("Querying jobs")
@@ -24,7 +24,7 @@ def get_jobs(   status: Optional[str] = None,
     admin = config.get('keycloak', 'admin')
     if not realm_access or not admin in realm_access.get('roles'):
         return HTTPException(status_code=401, detail="Only admins can list jobs")
-    return udb.crud.filter_jobs(db, status, username, start, jobname)
+    return udb.crud.filter_jobs(db, status, username, jobname, submit)
 
 
 @router.get("/{jobid}", response_model=udb.schemas.Job)