convert pullrequest object to a generic one

this is in preparation to codeberg prs support

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

Author: arthurzam

pkg/app/handler/categories/show.go

@@ -94,12 +94,12 @@ func ShowPullRequests(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var pullRequests []*models.GithubPullRequest
+	var pullRequests []*models.PullRequest
 	err = database.DBCon.Model(&pullRequests).
-		Join("JOIN package_to_github_pull_requests ON package_to_github_pull_requests.github_pull_request_id = github_pull_request.id").
-		Where("package_to_github_pull_requests.package_atom LIKE ?", categoryName+"/%").
-		Group("github_pull_request.id").
-		Order("github_pull_request.created_at DESC").
+		Join("JOIN package_to_pull_requests ON package_to_pull_requests.pull_request_id = pull_request.id").
+		Where("package_to_pull_requests.package_atom LIKE ?", categoryName+"/%").
+		Group("pull_request.id").
+		Order("pull_request.created_at DESC").
 		Select()
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)

pkg/app/handler/maintainer/show.go

@@ -159,11 +159,11 @@ func ShowPullRequests(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		return
 	}
-	var pullRequests []*models.GithubPullRequest
+	var pullRequests []*models.PullRequest
 	err = database.DBCon.Model(&pullRequests).
-		DistinctOn("github_pull_request.id").
-		OrderExpr("github_pull_request.id DESC").
-		Join("JOIN package_to_github_pull_requests").JoinOn("github_pull_request.id = package_to_github_pull_requests.github_pull_request_id").
+		DistinctOn("pull_request.id").
+		OrderExpr("pull_request.id DESC").
+		Join("JOIN package_to_pull_requests").JoinOn("pull_request.id = package_to_pull_requests.pull_request_id").
 		Where("package_atom IN (?)", query).
 		Select()
 	if err != nil {

pkg/app/handler/packages/components/pullrequests.templ

@@ -4,6 +4,7 @@ package components
 import (
 	"soko/pkg/models"
 	"strconv"
+	"strings"
 )
 
 css badgeColor(color string) {
@@ -15,7 +16,11 @@ func isDarkBadgeColor(color string) bool {
 	return color == "5319e7" || color == "0052cc" || color == "b60205"
 }
 
-templ PullRequests(pullRequests []*models.GithubPullRequest) {
+var prTypeToURL = map[string]string{
+	"github": "https://github.com/gentoo/gentoo/pull/",
+}
+
+templ PullRequests(pullRequests []*models.PullRequest) {
 	<div class="row">
 		<div class="col-md-9">
 			if len(pullRequests) > 0 {
@@ -26,7 +31,8 @@ templ PullRequests(pullRequests []*models.GithubPullRequest) {
 							<div class="row">
 								<div class="col-md-11">
 									<span class="octicon octicon-git-pull-request opticon-resource-icon ml-1" style="color:SeaGreen;"></span>
-									<a href={ templ.URL("https://github.com/gentoo/gentoo/pull/" + pr.Id) } class="text-dark">
+									{{ prType, id, _ := strings.Cut(pr.Id, "/") }}
+									<a href={ templ.URL(prTypeToURL[prType] + id) } class="text-dark">
 										<b>{ pr.Title }</b>
 									</a>
 									<a href={ templ.URL(pr.CiStateLink) }>
@@ -50,14 +56,14 @@ templ PullRequests(pullRequests []*models.GithubPullRequest) {
 									}
 								</div>
 								<div class="col-md-1 text-right">
-									<a href={ templ.URL("https://github.com/gentoo/gentoo/pull/" + pr.Id) } class="text-muted">
+									<a href={ templ.URL(prTypeToURL[prType] + id) } class="text-muted">
 										<i class="fa fa-comment-o" aria-hidden="true"></i>
 										{ strconv.Itoa(pr.Comments) }
 									</a>
 								</div>
 								<div class="col-md-12 text-muted">
 									<span style="font-size: 90%;">
-										#{ pr.Id } opened { pr.CreatedAt } by { pr.Author }
+										#{ id } opened { pr.CreatedAt } by { pr.Author }
 									</span>
 								</div>
 							</div>

pkg/database/connection.go

@@ -31,7 +31,7 @@ func CreateSchema() error {
 		(*models.CommitToVersion)(nil),
 		(*models.PackageToBug)(nil),
 		(*models.VersionToBug)(nil),
-		(*models.PackageToGithubPullRequest)(nil),
+		(*models.PackageToPullRequest)(nil),
 		(*models.MaskToVersion)(nil),
 		(*models.DeprecatedToVersion)(nil),
 		(*models.Package)(nil),
@@ -48,7 +48,7 @@ func CreateSchema() error {
 		(*models.Project)(nil),
 		(*models.MaintainerToProject)(nil),
 		(*models.PkgCheckResult)(nil),
-		(*models.GithubPullRequest)(nil),
+		(*models.PullRequest)(nil),
 		(*models.Bug)(nil),
 		(*models.ReverseDependency)(nil),
 		(*models.Maintainer)(nil),

pkg/models/package.go

@@ -23,7 +23,7 @@ type Package struct {
 	PkgCheckResults     []*PkgCheckResult    `pg:",fk:atom,rel:has-many"`
 	Outdated            []*OutdatedPackages  `pg:",fk:atom,rel:has-many"`
 	Bugs                []*Bug               `pg:"many2many:package_to_bugs,join_fk:bug_id"`
-	PullRequests        []*GithubPullRequest `pg:"many2many:package_to_github_pull_requests,join_fk:github_pull_request_id"`
+	PullRequests        []*PullRequest       `pg:"many2many:package_to_pull_requests,join_fk:pull_request_id"`
 	ReverseDependencies []*ReverseDependency `pg:",fk:atom,rel:has-many"`
 }
 

pkg/models/github.go pkg/models/pullrequest.gopkg/models/github.go renamed to pkg/models/pullrequest.go

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 package models
 
-type GithubPullRequest struct {
+import "iter"
+
+type PullRequest struct {
 	Id          string `pg:",pk"`
 	Closed      bool
 	Url         string
@@ -10,18 +12,23 @@ type GithubPullRequest struct {
 	UpdatedAt   string
 	CiState     string
 	CiStateLink string
-	Labels      []GitHubPullRequestLabelNode
+	Labels      []PullRequestLabel
 	Comments    int
 	Author      string
 }
 
-type PackageToGithubPullRequest struct {
-	Id                  string `pg:",pk"`
-	PackageAtom         string
-	GithubPullRequestId string
+type PackageToPullRequest struct {
+	Id            string `pg:",pk"`
+	PackageAtom   string
+	PullRequestId string
 }
 
-type GitHubPullRequestLabelNode struct {
+type PullRequestLabel struct {
 	Name  string `json:"name"`
 	Color string `json:"color"`
 }
+
+type PullRequestProvider interface {
+	ToPullRequest() *PullRequest
+	GetFiles() iter.Seq[string]
+}