From 95cecbb2943723990aa772c5de97d8b339e17ac8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 5 Apr 2024 14:18:51 +0800 Subject: [PATCH] Add NewIssue events --- models/project/issue.go | 8 ++ modules/projects/workflow.go | 6 +- services/projects/workflow_notifier.go | 152 ++++++++++++++++--------- 3 files changed, 110 insertions(+), 56 deletions(-) diff --git a/models/project/issue.go b/models/project/issue.go index c98544b0a4..313cfd7a4f 100644 --- a/models/project/issue.go +++ b/models/project/issue.go @@ -75,6 +75,14 @@ func (p *Project) NumOpenIssues(ctx context.Context) int { return int(c) } +func AddIssueToBoard(ctx context.Context, issueID int64, newBoard *Board) error { + return db.Insert(ctx, &ProjectIssue{ + IssueID: issueID, + ProjectID: newBoard.ProjectID, + ProjectBoardID: newBoard.ID, + }) +} + func MoveIssueToAnotherBoard(ctx context.Context, issueID int64, newBoard *Board) error { _, err := db.GetEngine(ctx).Exec("UPDATE `project_issue` SET project_board_id=? WHERE issue_id=?", newBoard.ID, issueID) return err diff --git a/modules/projects/workflow.go b/modules/projects/workflow.go index 751c611801..0127b12959 100644 --- a/modules/projects/workflow.go +++ b/modules/projects/workflow.go @@ -12,6 +12,7 @@ const ( // Project workflow event names EventItemAddedToProject = "item_added_to_project" EventItemClosed = "item_closed" + EventItem ) type Event struct { @@ -21,8 +22,9 @@ type Event struct { } type Workflow struct { - Name string - Events []Event + Name string + Events []Event + ProjectID int64 } func ParseWorkflow(content string) (*Workflow, error) { diff --git a/services/projects/workflow_notifier.go b/services/projects/workflow_notifier.go index 1b778fdedb..77aac20dd8 100644 --- a/services/projects/workflow_notifier.go +++ b/services/projects/workflow_notifier.go @@ -9,6 +9,7 @@ import ( 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" @@ -32,71 +33,114 @@ 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.GetBoardByProjectIDAndBoardName(ctx, wf.ProjectID, action.SetValue) + if err != nil { + log.Error("NewIssue: GetBoardByProjectIDAndBoardName: %v", err) + return err + } + return project_model.AddIssueToBoard(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 } - gitRepo, err := gitrepo.OpenRepository(ctx, issue.Repo) + wfs, err := findRepoProjectsWorkflows(ctx, issue.Repo) if err != nil { - log.Error("IssueChangeStatus: OpenRepository: %v", err) - return - } - defer gitRepo.Close() - - // Get the commit object for the ref - commit, err := gitRepo.GetCommit(issue.Repo.DefaultBranch) - if err != nil { - log.Error("gitRepo.GetCommit: %w", err) + log.Error("IssueChangeStatus: findRepoProjectsWorkflows: %v", err) return } - tree, err := commit.SubTree(".gitea/projects") - if _, ok := err.(git.ErrNotExist); ok { - return - } - if err != nil { - log.Error("commit.SubTree: %w", err) - return - } - - entries, err := tree.ListEntriesRecursiveFast() - if err != nil { - log.Error("tree.ListEntriesRecursiveFast: %w", err) - return - } - - 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 - } - - for _, entry := range ret { - workflowContent, err := commit.GetFileContent(".gitea/projects/"+entry.Name(), 1024*1024) - if err != nil { - log.Error("gitRepo.GetCommit: %w", err) - return - } - - wf, err := project_module.ParseWorkflow(workflowContent) - if err != nil { - log.Error("IssueChangeStatus: OpenRepository: %v", err) - return - } - projectName := strings.TrimSuffix(strings.TrimSuffix(entry.Name(), ".yml"), ".yaml") - project, err := project_model.GetProjectByName(ctx, issue.RepoID, projectName) - if err != nil { - log.Error("IssueChangeStatus: GetProjectByName: %v", err) - return - } + for _, wf := range wfs { if err := wf.FireAction(project_module.EventItemClosed, func(action project_module.Action) error { - board, err := project_model.GetBoardByProjectIDAndBoardName(ctx, project.ID, action.SetValue) + board, err := project_model.GetBoardByProjectIDAndBoardName(ctx, wf.ProjectID, action.SetValue) if err != nil { log.Error("IssueChangeStatus: GetBoardByProjectIDAndBoardName: %v", err) return err