mirror of
https://github.com/go-gitea/gitea.git
synced 2025-01-04 09:17:43 +03:00
Merge 9d0a599960
into d45456b1b5
This commit is contained in:
commit
d5a0d3ca24
@ -225,6 +225,18 @@ func GetColumn(ctx context.Context, columnID int64) (*Column, error) {
|
|||||||
return column, nil
|
return column, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetColumnByProjectIDAndColumnName(ctx context.Context, projectID int64, columnName string) (*Column, error) {
|
||||||
|
board := new(Column)
|
||||||
|
has, err := db.GetEngine(ctx).Where("project_id=? AND title=?", projectID, columnName).Get(board)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
} else if !has {
|
||||||
|
return nil, ErrProjectColumnNotExist{ProjectID: projectID, Name: columnName}
|
||||||
|
}
|
||||||
|
|
||||||
|
return board, nil
|
||||||
|
}
|
||||||
|
|
||||||
// UpdateColumn updates a project column
|
// UpdateColumn updates a project column
|
||||||
func UpdateColumn(ctx context.Context, column *Column) error {
|
func UpdateColumn(ctx context.Context, column *Column) error {
|
||||||
var fieldToUpdate []string
|
var fieldToUpdate []string
|
||||||
|
@ -76,6 +76,19 @@ func (p *Project) NumOpenIssues(ctx context.Context) int {
|
|||||||
return int(c)
|
return int(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func AddIssueToColumn(ctx context.Context, issueID int64, newColumn *Column) error {
|
||||||
|
return db.Insert(ctx, &ProjectIssue{
|
||||||
|
IssueID: issueID,
|
||||||
|
ProjectID: newColumn.ProjectID,
|
||||||
|
ProjectColumnID: newColumn.ID,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func MoveIssueToAnotherColumn(ctx context.Context, issueID int64, newColumn *Column) error {
|
||||||
|
_, err := db.GetEngine(ctx).Exec("UPDATE `project_issue` SET project_board_id=? WHERE issue_id=?", newColumn.ID, issueID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
func (c *Column) moveIssuesToAnotherColumn(ctx context.Context, newColumn *Column) error {
|
func (c *Column) moveIssuesToAnotherColumn(ctx context.Context, newColumn *Column) error {
|
||||||
if c.ProjectID != newColumn.ProjectID {
|
if c.ProjectID != newColumn.ProjectID {
|
||||||
return fmt.Errorf("columns have to be in the same project")
|
return fmt.Errorf("columns have to be in the same project")
|
||||||
|
@ -46,6 +46,7 @@ const (
|
|||||||
type ErrProjectNotExist struct {
|
type ErrProjectNotExist struct {
|
||||||
ID int64
|
ID int64
|
||||||
RepoID int64
|
RepoID int64
|
||||||
|
Name string
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsErrProjectNotExist checks if an error is a ErrProjectNotExist
|
// IsErrProjectNotExist checks if an error is a ErrProjectNotExist
|
||||||
@ -55,6 +56,9 @@ func IsErrProjectNotExist(err error) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (err ErrProjectNotExist) Error() string {
|
func (err ErrProjectNotExist) Error() string {
|
||||||
|
if err.RepoID > 0 && len(err.Name) > 0 {
|
||||||
|
return fmt.Sprintf("projects does not exist [repo_id: %d, name: %s]", err.RepoID, err.Name)
|
||||||
|
}
|
||||||
return fmt.Sprintf("projects does not exist [id: %d]", err.ID)
|
return fmt.Sprintf("projects does not exist [id: %d]", err.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -64,7 +68,9 @@ func (err ErrProjectNotExist) Unwrap() error {
|
|||||||
|
|
||||||
// ErrProjectColumnNotExist represents a "ErrProjectColumnNotExist" kind of error.
|
// ErrProjectColumnNotExist represents a "ErrProjectColumnNotExist" kind of error.
|
||||||
type ErrProjectColumnNotExist struct {
|
type ErrProjectColumnNotExist struct {
|
||||||
ColumnID int64
|
ColumnID int64
|
||||||
|
ProjectID int64
|
||||||
|
Name string
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsErrProjectColumnNotExist checks if an error is a ErrProjectColumnNotExist
|
// IsErrProjectColumnNotExist checks if an error is a ErrProjectColumnNotExist
|
||||||
@ -74,6 +80,9 @@ func IsErrProjectColumnNotExist(err error) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (err ErrProjectColumnNotExist) Error() string {
|
func (err ErrProjectColumnNotExist) Error() string {
|
||||||
|
if err.ProjectID > 0 && len(err.Name) > 0 {
|
||||||
|
return fmt.Sprintf("project column does not exist [project_id: %d, name: %s]", err.ProjectID, err.Name)
|
||||||
|
}
|
||||||
return fmt.Sprintf("project column does not exist [id: %d]", err.ColumnID)
|
return fmt.Sprintf("project column does not exist [id: %d]", err.ColumnID)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -287,6 +296,19 @@ func GetProjectByID(ctx context.Context, id int64) (*Project, error) {
|
|||||||
return p, nil
|
return p, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetProjectByName returns the projects in a repository
|
||||||
|
func GetProjectByName(ctx context.Context, repoID int64, name string) (*Project, error) {
|
||||||
|
p := new(Project)
|
||||||
|
has, err := db.GetEngine(ctx).Where("repo_id=? AND title=?", repoID, name).Get(p)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
} else if !has {
|
||||||
|
return nil, ErrProjectNotExist{RepoID: repoID, Name: name}
|
||||||
|
}
|
||||||
|
|
||||||
|
return p, nil
|
||||||
|
}
|
||||||
|
|
||||||
// GetProjectForRepoByID returns the projects in a repository
|
// GetProjectForRepoByID returns the projects in a repository
|
||||||
func GetProjectForRepoByID(ctx context.Context, repoID, id int64) (*Project, error) {
|
func GetProjectForRepoByID(ctx context.Context, repoID, id int64) (*Project, error) {
|
||||||
p := new(Project)
|
p := new(Project)
|
||||||
|
47
modules/projects/workflow.go
Normal file
47
modules/projects/workflow.go
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package projects
|
||||||
|
|
||||||
|
// Action represents an action that can be taken in a workflow
|
||||||
|
type Action struct {
|
||||||
|
SetValue string
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
// Project workflow event names
|
||||||
|
EventItemAddedToProject = "item_added_to_project"
|
||||||
|
EventItemClosed = "item_closed"
|
||||||
|
EventItem
|
||||||
|
)
|
||||||
|
|
||||||
|
type Event struct {
|
||||||
|
Name string
|
||||||
|
Types []string
|
||||||
|
Actions []Action
|
||||||
|
}
|
||||||
|
|
||||||
|
type Workflow struct {
|
||||||
|
Name string
|
||||||
|
Events []Event
|
||||||
|
ProjectID int64
|
||||||
|
}
|
||||||
|
|
||||||
|
func ParseWorkflow(content string) (*Workflow, error) {
|
||||||
|
return &Workflow{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *Workflow) FireAction(evtName string, f func(action Action) error) error {
|
||||||
|
for _, evt := range w.Events {
|
||||||
|
if evt.Name == evtName {
|
||||||
|
for _, action := range evt.Actions {
|
||||||
|
// Do something with action
|
||||||
|
if err := f(action); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
46
modules/projects/workflow_test.go
Normal file
46
modules/projects/workflow_test.go
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package projects
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestParseWorkflow(t *testing.T) {
|
||||||
|
workflowFile := `
|
||||||
|
name: Test Workflow
|
||||||
|
on:
|
||||||
|
item_added_to_project:
|
||||||
|
types: [issue, pull_request]
|
||||||
|
action:
|
||||||
|
- set_value: "status=Todo"
|
||||||
|
|
||||||
|
item_closed:
|
||||||
|
types: [issue, pull_request]
|
||||||
|
action:
|
||||||
|
- remove_label: ""
|
||||||
|
|
||||||
|
item_reopened:
|
||||||
|
action:
|
||||||
|
|
||||||
|
code_changes_requested:
|
||||||
|
action:
|
||||||
|
|
||||||
|
code_review_approved:
|
||||||
|
action:
|
||||||
|
|
||||||
|
pull_request_merged:
|
||||||
|
action:
|
||||||
|
|
||||||
|
auto_add_to_project:
|
||||||
|
action:
|
||||||
|
`
|
||||||
|
|
||||||
|
wf, err := ParseWorkflow(workflowFile)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, "Test Workflow", wf.Name)
|
||||||
|
}
|
@ -1,7 +1,7 @@
|
|||||||
// Copyright 2024 The Gitea Authors. All rights reserved.
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
package project
|
package projects
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
154
services/projects/workflow_notifier.go
Normal file
154
services/projects/workflow_notifier.go
Normal file
@ -0,0 +1,154 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package projects
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
issues_model "code.gitea.io/gitea/models/issues"
|
||||||
|
project_model "code.gitea.io/gitea/models/project"
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/git"
|
||||||
|
"code.gitea.io/gitea/modules/gitrepo"
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
project_module "code.gitea.io/gitea/modules/projects"
|
||||||
|
notify_service "code.gitea.io/gitea/services/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
notify_service.RegisterNotifier(&workflowNotifier{})
|
||||||
|
}
|
||||||
|
|
||||||
|
type workflowNotifier struct {
|
||||||
|
notify_service.NullNotifier
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ notify_service.Notifier = &workflowNotifier{}
|
||||||
|
|
||||||
|
// NewNotifier create a new workflowNotifier notifier
|
||||||
|
func NewNotifier() notify_service.Notifier {
|
||||||
|
return &workflowNotifier{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func findRepoProjectsWorkflows(ctx context.Context, repo *repo_model.Repository) ([]*project_module.Workflow, error) {
|
||||||
|
gitRepo, err := gitrepo.OpenRepository(ctx, repo)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("IssueChangeStatus: OpenRepository: %v", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer gitRepo.Close()
|
||||||
|
|
||||||
|
// Get the commit object for the ref
|
||||||
|
commit, err := gitRepo.GetCommit(repo.DefaultBranch)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("gitRepo.GetCommit: %w", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
tree, err := commit.SubTree(".gitea/projects")
|
||||||
|
if _, ok := err.(git.ErrNotExist); ok {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
log.Error("commit.SubTree: %w", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
entries, err := tree.ListEntriesRecursiveFast()
|
||||||
|
if err != nil {
|
||||||
|
log.Error("tree.ListEntriesRecursiveFast: %w", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
ret := make(git.Entries, 0, len(entries))
|
||||||
|
for _, entry := range entries {
|
||||||
|
if strings.HasSuffix(entry.Name(), ".yml") || strings.HasSuffix(entry.Name(), ".yaml") {
|
||||||
|
ret = append(ret, entry)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(ret) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
wfs := make([]*project_module.Workflow, 0, len(ret))
|
||||||
|
for _, entry := range ret {
|
||||||
|
workflowContent, err := commit.GetFileContent(".gitea/projects/"+entry.Name(), 1024*1024)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("gitRepo.GetCommit: %w", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
wf, err := project_module.ParseWorkflow(workflowContent)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("IssueChangeStatus: OpenRepository: %v", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
projectName := strings.TrimSuffix(strings.TrimSuffix(entry.Name(), ".yml"), ".yaml")
|
||||||
|
project, err := project_model.GetProjectByName(ctx, repo.ID, projectName)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("IssueChangeStatus: GetProjectByName: %v", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
wf.ProjectID = project.ID
|
||||||
|
|
||||||
|
wfs = append(wfs, wf)
|
||||||
|
}
|
||||||
|
return wfs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *workflowNotifier) NewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User) {
|
||||||
|
if err := issue.LoadRepo(ctx); err != nil {
|
||||||
|
log.Error("NewIssue: LoadRepo: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
wfs, err := findRepoProjectsWorkflows(ctx, issue.Repo)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("NewIssue: findRepoProjectsWorkflows: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, wf := range wfs {
|
||||||
|
if err := wf.FireAction(project_module.EventItemClosed, func(action project_module.Action) error {
|
||||||
|
board, err := project_model.GetColumnByProjectIDAndColumnName(ctx, wf.ProjectID, action.SetValue)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("NewIssue: GetBoardByProjectIDAndBoardName: %v", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return project_model.AddIssueToColumn(ctx, issue.ID, board)
|
||||||
|
}); err != nil {
|
||||||
|
log.Error("NewIssue: FireAction: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *workflowNotifier) IssueChangeStatus(ctx context.Context, doer *user_model.User, commitID string, issue *issues_model.Issue, actionComment *issues_model.Comment, isClosed bool) {
|
||||||
|
if isClosed {
|
||||||
|
if err := issue.LoadRepo(ctx); err != nil {
|
||||||
|
log.Error("IssueChangeStatus: LoadRepo: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
wfs, err := findRepoProjectsWorkflows(ctx, issue.Repo)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("IssueChangeStatus: findRepoProjectsWorkflows: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, wf := range wfs {
|
||||||
|
if err := wf.FireAction(project_module.EventItemClosed, func(action project_module.Action) error {
|
||||||
|
board, err := project_model.GetColumnByProjectIDAndColumnName(ctx, wf.ProjectID, action.SetValue)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("IssueChangeStatus: GetBoardByProjectIDAndBoardName: %v", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return project_model.MoveIssueToAnotherColumn(ctx, issue.ID, board)
|
||||||
|
}); err != nil {
|
||||||
|
log.Error("IssueChangeStatus: FireAction: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user