jobs: Fix queries that generate the queue

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index 9c0042a5faa928becdbb89316cd07d3bf09706b1..141dbb24e761e363e308cb5c18e94c49c3f21930 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -202,6 +202,7 @@ class Queue(base.Object):
                                        ),
                                ).label("rank"),
                        )
+                       .select_from(Job)
 
                        # Filter out any deleted objects
                        .where(
@@ -236,13 +237,12 @@ class Queue(base.Object):
                """
                stmt = (
                        sqlalchemy
-
                        .select(
                                sqlalchemy.func.count(
                                        self.queue.c.job_id,
                                ).label("jobs")
                        )
-                       #.select_from(self.queue)
+                       .select_from(self.queue)
                )
 
                # Run the query
@@ -258,7 +258,14 @@ class Queue(base.Object):
                        sqlalchemy
 
                        # Select jobs
-                       .select(Job)
+                       .select(
+                               Job,
+                       )
+                       .select_from(Job)
+                       .join(
+                               self.queue,
+                               self.queue.c.job_id == Job.id,
+                       )
 
                        # Order them by their rank
                        .order_by(self.queue.c.rank)