HomeLab/ForgeBucket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

initial completion

Browse Source
This commit is contained in:
erangel1
2026-05-07 15:51:38 +02:00
parent f211cfc7db
commit 3b1368e16d
36 changed files with 1576 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/handlers/pr_settings.go
+259
View File
@@ -0,0 +1,259 @@
package handlers
import (
"encoding/json"
"net/http"
"github.com/go-chi/chi/v5"
"xorm.io/xorm"
"github.com/forgeo/forgebucket/internal/api/middleware"
"github.com/forgeo/forgebucket/internal/models"
)
type PRSettingsHandler struct{ db *xorm.Engine }
func NewPRSettingsHandler(db *xorm.Engine) *PRSettingsHandler {
return &PRSettingsHandler{db: db}
}
func (h *PRSettingsHandler) resolveRepo(w http.ResponseWriter, r *http.Request) (*models.Repository, bool) {
ownerName := chi.URLParam(r, "owner")
repoName := chi.URLParam(r, "repo")
var owner models.User
if found, _ := h.db.Where("username = ?", ownerName).Get(&owner); !found {
jsonError(w, "repository not found", http.StatusNotFound)
return nil, false
}
var repo models.Repository
if found, _ := h.db.Where("owner_id = ? AND name = ?", owner.ID, repoName).Get(&repo); !found {
jsonError(w, "repository not found", http.StatusNotFound)
return nil, false
}
return &repo, true
}
func (h *PRSettingsHandler) canManage(repo *models.Repository, callerID int64) bool {
if callerID == repo.OwnerID {
return true
}
var m models.RepoMember
found, _ := h.db.Where("repo_id = ? AND user_id = ? AND permission = 'admin'", repo.ID, callerID).Get(&m)
return found
}
// ── Default reviewers ─────────────────────────────────────────────────────────
type defaultReviewerInfo struct {
UserID int64 `json:"userId"`
Username string `json:"username"`
AvatarURL string `json:"avatarUrl"`
}
func (h *PRSettingsHandler) ListDefaultReviewers(w http.ResponseWriter, r *http.Request) {
repo, ok := h.resolveRepo(w, r)
if !ok {
return
}
var rows []models.RepoDefaultReviewer
h.db.Where("repo_id = ?", repo.ID).Find(&rows)
result := make([]defaultReviewerInfo, 0, len(rows))
for _, dr := range rows {
var u models.User
if found, _ := h.db.ID(dr.UserID).Get(&u); found {
result = append(result, defaultReviewerInfo{
UserID: u.ID,
Username: u.Username,
AvatarURL: u.AvatarURL,
})
}
}
jsonOK(w, result)
}
func (h *PRSettingsHandler) AddDefaultReviewer(w http.ResponseWriter, r *http.Request) {
repo, ok := h.resolveRepo(w, r)
if !ok {
return
}
callerID, _ := middleware.UserIDFromContext(r.Context())
if !h.canManage(repo, callerID) {
jsonError(w, "forbidden", http.StatusForbidden)
return
}
var body struct {
Username string `json:"username"`
}
if err := json.NewDecoder(r.Body).Decode(&body); err != nil || body.Username == "" {
jsonError(w, "username is required", http.StatusBadRequest)
return
}
var u models.User
if found, _ := h.db.Where("username = ?", body.Username).Get(&u); !found {
jsonError(w, "user not found", http.StatusNotFound)
return
}
// Idempotent: don't duplicate
var existing models.RepoDefaultReviewer
if found, _ := h.db.Where("repo_id = ? AND user_id = ?", repo.ID, u.ID).Get(&existing); found {
jsonOK(w, defaultReviewerInfo{UserID: u.ID, Username: u.Username, AvatarURL: u.AvatarURL})
return
}
dr := &models.RepoDefaultReviewer{RepoID: repo.ID, UserID: u.ID}
if _, err := h.db.Insert(dr); err != nil {
jsonError(w, "could not add reviewer", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusCreated)
json.NewEncoder(w).Encode(defaultReviewerInfo{UserID: u.ID, Username: u.Username, AvatarURL: u.AvatarURL})
}
func (h *PRSettingsHandler) RemoveDefaultReviewer(w http.ResponseWriter, r *http.Request) {
repo, ok := h.resolveRepo(w, r)
if !ok {
return
}
callerID, _ := middleware.UserIDFromContext(r.Context())
if !h.canManage(repo, callerID) {
jsonError(w, "forbidden", http.StatusForbidden)
return
}
username := chi.URLParam(r, "username")
var u models.User
if found, _ := h.db.Where("username = ?", username).Get(&u); !found {
w.WriteHeader(http.StatusNoContent)
return
}
h.db.Where("repo_id = ? AND user_id = ?", repo.ID, u.ID).Delete(&models.RepoDefaultReviewer{})
w.WriteHeader(http.StatusNoContent)
}
// ── Default description ───────────────────────────────────────────────────────
func (h *PRSettingsHandler) GetDefaultDescription(w http.ResponseWriter, r *http.Request) {
repo, ok := h.resolveRepo(w, r)
if !ok {
return
}
var dd models.RepoDefaultDescription
h.db.Where("repo_id = ?", repo.ID).Get(&dd)
jsonOK(w, map[string]string{"template": dd.Template})
}
func (h *PRSettingsHandler) UpdateDefaultDescription(w http.ResponseWriter, r *http.Request) {
repo, ok := h.resolveRepo(w, r)
if !ok {
return
}
callerID, _ := middleware.UserIDFromContext(r.Context())
if !h.canManage(repo, callerID) {
jsonError(w, "forbidden", http.StatusForbidden)
return
}
var body struct {
Template string `json:"template"`
}
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
jsonError(w, "invalid body", http.StatusBadRequest)
return
}
var dd models.RepoDefaultDescription
found, _ := h.db.Where("repo_id = ?", repo.ID).Get(&dd)
dd.RepoID = repo.ID
dd.Template = body.Template
if found {
h.db.ID(dd.ID).Cols("template").Update(&dd)
} else {
h.db.Insert(&dd)
}
jsonOK(w, map[string]string{"template": dd.Template})
}
// ── Excluded files ────────────────────────────────────────────────────────────
func (h *PRSettingsHandler) GetExcludedFiles(w http.ResponseWriter, r *http.Request) {
repo, ok := h.resolveRepo(w, r)
if !ok {
return
}
var ef models.RepoExcludedFiles
h.db.Where("repo_id = ?", repo.ID).Get(&ef)
jsonOK(w, map[string]string{"patterns": ef.Patterns})
}
func (h *PRSettingsHandler) UpdateExcludedFiles(w http.ResponseWriter, r *http.Request) {
repo, ok := h.resolveRepo(w, r)
if !ok {
return
}
callerID, _ := middleware.UserIDFromContext(r.Context())
if !h.canManage(repo, callerID) {
jsonError(w, "forbidden", http.StatusForbidden)
return
}
var body struct {
Patterns string `json:"patterns"`
}
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
jsonError(w, "invalid body", http.StatusBadRequest)
return
}
var ef models.RepoExcludedFiles
found, _ := h.db.Where("repo_id = ?", repo.ID).Get(&ef)
ef.RepoID = repo.ID
ef.Patterns = body.Patterns
if found {
h.db.ID(ef.ID).Cols("patterns").Update(&ef)
} else {
h.db.Insert(&ef)
}
jsonOK(w, map[string]string{"patterns": ef.Patterns})
}
// ── Helpers used by PR create ─────────────────────────────────────────────────
// AutoAssignReviewers inserts PrReviewer rows for all default reviewers of a repo.
func AutoAssignReviewers(db *xorm.Engine, repoID, prID int64) {
var defaults []models.RepoDefaultReviewer
db.Where("repo_id = ?", repoID).Find(&defaults)
for _, dr := range defaults {
db.Insert(&models.PrReviewer{PRID: prID, UserID: dr.UserID})
}
}
// GetDefaultDescriptionTemplate returns the stored PR body template for a repo.
func GetDefaultDescriptionTemplate(db *xorm.Engine, repoID int64) string {
var dd models.RepoDefaultDescription
db.Where("repo_id = ?", repoID).Get(&dd)
return dd.Template
}
// GetPrReviewers returns reviewer details for a PR.
type ReviewerInfo struct {
UserID int64 `json:"userId"`
Username string `json:"username"`
AvatarURL string `json:"avatarUrl"`
}
func GetPrReviewers(db *xorm.Engine, prID int64) []ReviewerInfo {
var rows []models.PrReviewer
db.Where("pr_id = ?", prID).Find(&rows)
result := make([]ReviewerInfo, 0, len(rows))
for _, rv := range rows {
var u models.User
if found, _ := db.ID(rv.UserID).Get(&u); found {
result = append(result, ReviewerInfo{UserID: u.ID, Username: u.Username, AvatarURL: u.AvatarURL})
}
}
return result
}
internal/api/handlers/prs.go
+23 -2
View File
@@ -83,9 +83,30 @@ func (h *PRHandler) Create(w http.ResponseWriter, r *http.Request) {
return
}
// Auto-assign default reviewers.
AutoAssignReviewers(h.db, repoID, pr.ID)
// Fire webhook.
go FireWebhooks(h.db, repoID, "pull_request", map[string]interface{}{
"action": "opened",
"pullRequest": map[string]interface{}{"id": pr.ID, "title": pr.Title},
})
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusCreated)
json.NewEncoder(w).Encode(pr)
json.NewEncoder(w).Encode(prWithReviewers(h.db, pr))
}
type prResponse struct {
models.PullRequest
Reviewers []ReviewerInfo `json:"reviewers"`
}
func prWithReviewers(db *xorm.Engine, pr *models.PullRequest) prResponse {
return prResponse{
PullRequest: *pr,
Reviewers: GetPrReviewers(db, pr.ID),
}
}
func (h *PRHandler) Get(w http.ResponseWriter, r *http.Request) {
@@ -93,7 +114,7 @@ func (h *PRHandler) Get(w http.ResponseWriter, r *http.Request) {
if !ok {
return
}
jsonOK(w, pr)
jsonOK(w, prWithReviewers(h.db, pr))
}
func (h *PRHandler) Merge(w http.ResponseWriter, r *http.Request) {
internal/api/router.go
+12 -2
View File
@@ -46,8 +46,9 @@ func New(cfg *config.Config, engine *xorm.Engine, store sessions.Store, staticFi
memberH := handlers.NewMemberHandler(engine)
keyH := handlers.NewDeployKeyHandler(engine)
tokenH := handlers.NewAccessTokenHandler(engine)
workflowH := handlers.NewWorkflowHandler(engine)
webhookH := handlers.NewWebhookHandler(engine)
workflowH := handlers.NewWorkflowHandler(engine)
webhookH := handlers.NewWebhookHandler(engine)
prSettingsH := handlers.NewPRSettingsHandler(engine)
// ── Git smart-HTTP transport ───────────────────────────────────────────────
// These routes MUST be registered before the SPA catch-all and outside CSRF.
@@ -172,6 +173,15 @@ func New(cfg *config.Config, engine *xorm.Engine, store sessions.Store, staticFi
r.With(csrf).Delete("/{whID}", webhookH.Delete)
r.With(csrf).Post("/{whID}/test", webhookH.Test)
})
r.Route("/default-reviewers", func(r chi.Router) {
r.Get("/", prSettingsH.ListDefaultReviewers)
r.With(csrf).Post("/", prSettingsH.AddDefaultReviewer)
r.With(csrf).Delete("/{username}", prSettingsH.RemoveDefaultReviewer)
})
r.Get("/default-description", prSettingsH.GetDefaultDescription)
r.With(csrf).Put("/default-description", prSettingsH.UpdateDefaultDescription)
r.Get("/excluded-files", prSettingsH.GetExcludedFiles)
r.With(csrf).Put("/excluded-files", prSettingsH.UpdateExcludedFiles)
})
})
})
internal/models/migrations/001_init.go
+4 -1
View File
@@ -25,5 +25,8 @@ func Run(engine *xorm.Engine) error {
if err := Run004(engine); err != nil {
return err
}
return Run005(engine)
if err := Run005(engine); err != nil {
return err
}
return Run006(engine)
}
internal/models/migrations/006_pr_settings.go
+15
View File
@@ -0,0 +1,15 @@
package migrations
import (
"github.com/forgeo/forgebucket/internal/models"
"xorm.io/xorm"
)
func Run006(engine *xorm.Engine) error {
return engine.Sync2(
&models.RepoDefaultReviewer{},
&models.PrReviewer{},
&models.RepoDefaultDescription{},
&models.RepoExcludedFiles{},
)
}
internal/models/pr_settings.go
+33
View File
@@ -0,0 +1,33 @@
package models
import "time"
// RepoDefaultReviewer: users auto-added as reviewers when a PR is opened.
type RepoDefaultReviewer struct {
ID int64 `xorm:"'id' pk autoincr"`
RepoID int64 `xorm:"'repo_id' notnull index"`
UserID int64 `xorm:"'user_id' notnull"`
CreatedAt time.Time `xorm:"'created_at' created"`
}
// PrReviewer: a user assigned to review a specific pull request.
type PrReviewer struct {
ID int64 `xorm:"'id' pk autoincr"`
PRID int64 `xorm:"'pr_id' notnull index"`
UserID int64 `xorm:"'user_id' notnull"`
AddedAt time.Time `xorm:"'added_at' created"`
}
// RepoDefaultDescription: template pre-filled into new PR bodies.
type RepoDefaultDescription struct {
ID int64 `xorm:"'id' pk autoincr"`
RepoID int64 `xorm:"'repo_id' notnull unique"`
Template string `xorm:"'template' text"`
}
// RepoExcludedFiles: newline-separated glob patterns for files omitted from PR diffs.
type RepoExcludedFiles struct {
ID int64 `xorm:"'id' pk autoincr"`
RepoID int64 `xorm:"'repo_id' notnull unique"`
Patterns string `xorm:"'patterns' text"`
}