From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 29 Apr 2023 12:30:19 +0000 (+0000)
Subject: builds: Implement filtering by user
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c07aa62ef70f1491c154f9157829fe520b328b04;p=pbs.git

builds: Implement filtering by user

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

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 12fbdeeb..ea7a91b1 100644
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -138,6 +138,30 @@ class Builds(base.Object):
 
 		return list(builds)
 
+	def get_by_user(self, user, limit=None, offset=None):
+		"""
+			Returns builds by a certain user
+		"""
+		builds = self._get_builds("""
+			SELECT
+				*
+			FROM
+				builds
+			WHERE
+				deleted_at IS NULL
+			AND
+				owner_id = %s
+			ORDER BY
+				created_at DESC
+			LIMIT
+				%s
+			OFFSET
+				%s
+			""", user, limit, offset,
+		)
+
+		return list(builds)
+
 	async def create(self, repo, package, owner=None, group=None):
 		"""
 			Creates a new build based on the given distribution and package
diff --git a/src/templates/base.html b/src/templates/base.html
index 15a9e67b..5edafb16 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -89,10 +89,12 @@
 								</a>
 
 								<div class="navbar-dropdown is-boxed">
-									<a class="navbar-item" href="/profile/builds">
+									<a class="navbar-item" href="/builds?user={{ current_user.name }}">
 										{{ _("My Builds") }}
 									</a>
+
 									<hr class="navbar-divider">
+
 									<a class="navbar-item" href="/logout">
 										{{ _("Logout") }}
 									</a>
diff --git a/src/templates/builds/index.html b/src/templates/builds/index.html
index 44ab6933..95b22af9 100644
--- a/src/templates/builds/index.html
+++ b/src/templates/builds/index.html
@@ -13,7 +13,13 @@
 		</ul>
 	</nav>
 
-	<h1 class="title">{{ _("Recent Builds") }}</h1>
+	<h1 class="title">
+		{% if user %}
+			{{ _("%s's Builds") % user }}
+		{% else %}
+			{{ _("Recent Builds") }}
+		{% end %}
+	</h1>
 
 	{# Render all builds #}
 	{% module BuildsList(builds) %}
diff --git a/src/web/builds.py b/src/web/builds.py
index e3f644b2..0089988c 100644
--- a/src/web/builds.py
+++ b/src/web/builds.py
@@ -58,10 +58,16 @@ class APIv1IndexHandler(base.APIMixin, base.BaseHandler):
 
 class IndexHandler(base.BaseHandler):
 	def get(self):
+		# Filters
+		user = self.get_argument_user("user", None)
+
 		# Fetch the most recent builds
-		builds = self.backend.builds.get_recent(limit=25)
+		if user:
+			builds = self.backend.builds.get_by_user(user, limit=25)
+		else:
+			builds = self.backend.builds.get_recent(limit=25)
 
-		self.render("builds/index.html", builds=builds)
+		self.render("builds/index.html", builds=builds, user=user)
 
 
 class ShowHandler(base.BaseHandler):
diff --git a/src/web/users.py b/src/web/users.py
index 4c770bac..ab2d22fd 100644
--- a/src/web/users.py
+++ b/src/web/users.py
@@ -78,6 +78,15 @@ class EditHandler(base.BaseHandler):
 		self.redirect("/users/%s" % user.name)
 
 
+class BuildsHandler(base.BaseHandler):
+	def get(self, name):
+		user = self.backend.users.get_by_name(name)
+		if not user:
+			raise tornado.web.HTTPError(404, "Could not find user: %s" % name)
+
+		self.render("users/builds.html", user=user, builds=user.builds)
+
+
 class ListModule(ui_modules.UIModule):
 	def render(self, users):
 		return self.render_string("users/modules/list.html", users=users)