From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 3 May 2023 18:44:58 +0000 (+0000)
Subject: builds: Don't show test builds in listings
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10dead28f9fefddcba574adf1c7535bd44849ab3;p=pbs.git

builds: Don't show test builds in listings

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

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 3f687901..16714f60 100644
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -36,6 +36,8 @@ class Builds(base.Object):
 				builds
 			WHERE
 				deleted_at IS NULL
+			AND
+				test IS FALSE
 			""",
 		)
 
@@ -112,6 +114,8 @@ class Builds(base.Object):
 				packages ON builds.pkg_id = packages.id
 			WHERE
 				builds.deleted_at IS NULL
+			AND
+				builds.test IS FALSE
 			AND
 				packages.name = %s
 			ORDER BY
@@ -122,7 +126,7 @@ class Builds(base.Object):
 
 	def get_recent(self, limit=None):
 		"""
-			Returns the most recent builds
+			Returns the most recent (non-test) builds
 		"""
 		builds = self._get_builds("""
 			SELECT
@@ -131,6 +135,8 @@ class Builds(base.Object):
 				builds
 			WHERE
 				deleted_at IS NULL
+			AND
+				test IS FALSE
 			ORDER BY
 				created_at DESC
 			LIMIT %s""",
@@ -150,6 +156,8 @@ class Builds(base.Object):
 				builds
 			WHERE
 				deleted_at IS NULL
+			AND
+				test IS FALSE
 			AND
 				owner_id = %s
 			ORDER BY
diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 4fde892c..40ca2390 100644
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -300,6 +300,8 @@ class Users(base.Object):
 				users
 			LEFT JOIN
 				builds ON users.id = builds.owner_id
+			WHERE
+				builds.test IS FALSE
 			GROUP BY
 				users.id
 			ORDER BY
@@ -526,6 +528,8 @@ class User(base.DataObject):
 			FROM
 				builds
 			WHERE
+				test IS FALSE
+			AND
 				owner_id = %s
 			""", self.id,
 		)