package/QA report: fix shown values and order

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
gentoo · May 30, 2024 · 1966444 · 1966444
1 parent 72ff41c
commit 1966444
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/app/handler/packages/show.go b/pkg/app/handler/packages/show.go
@@ -72,8 +72,12 @@ func Show(w http.ResponseWriter, r *http.Request) {
 	case "qa-report":
 		currentSubTab = "QA report"
 		query = query.
-			Relation("PkgCheckResults").
-			Relation("Versions.PkgCheckResults")
+			Relation("PkgCheckResults", func(q *pg.Query) (*pg.Query, error) {
+				return q.Where("version IS NULL").Order("class", "message"), nil
+			}).
+			Relation("Versions.PkgCheckResults", func(q *pg.Query) (*pg.Query, error) {
+				return q.Order("version", "class", "message"), nil
+			})
 	case "pull-requests":
 		atom = strings.ReplaceAll(atom, "/pull-requests", "")
 		currentSubTab = "Pull requests"