Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-02-25 05:56:21 +01:00
Code Issues Activity

Merge add labels and remove labels as one operation when firing project workflow

Browse Source
This commit is contained in:
Lunny Xiao 2025-11-11 11:00:02 -08:00
parent bf841a831a
commit 8feb5f9b9f
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 71 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
services/issue/label.go
View File

@ -69,3 +69,29 @@ func ReplaceLabels(ctx context.Context, issue *issues_model.Issue, doer *user_mo
notify_service.IssueChangeLabels(ctx, doer, issue, labels, old)
return nil
}
func AddRemoveLabels(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, toAddLabels, toRemoveLabels []*issues_model.Label) error {
if len(toAddLabels) == 0 && len(toRemoveLabels) == 0 {
return nil
}
if err := db.WithTx(ctx, func(ctx context.Context) error {
if len(toAddLabels) > 0 {
if err := issues_model.NewIssueLabels(ctx, issue, toAddLabels, doer); err != nil {
return err
}
}
for _, label := range toRemoveLabels {
if err := issues_model.DeleteIssueLabel(ctx, issue, label, doer); err != nil {
return err
}
}
return nil
}); err != nil {
return err
}
notify_service.IssueChangeLabels(ctx, doer, issue, toAddLabels, toRemoveLabels)
return nil
}

35
services/issue/label_test.go
View File

@ -59,3 +59,38 @@ func TestIssue_AddLabel(t *testing.T) {
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: test.issueID, LabelID: test.labelID})
}
}
func TestIssue_AddRemoveLabels(t *testing.T) {
tests := []struct {
issueID int64
toAddIDs []int64
toRemoveIDs []int64
doerID int64
}{
{1, []int64{2}, []int64{1}, 2}, // now there are both 1 and 2
{1, []int64{}, []int64{1, 2}, 2}, // no label left
{1, []int64{1, 2}, []int64{}, 2}, // add them back
{1, []int64{}, []int64{}, 2}, // no-op
}
for _, test := range tests {
assert.NoError(t, unittest.PrepareTestDatabase())
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: test.issueID})
toAddLabels := make([]*issues_model.Label, len(test.toAddIDs))
for i, labelID := range test.toAddIDs {
toAddLabels[i] = unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: labelID})
}
toRemoveLabels := make([]*issues_model.Label, len(test.toRemoveIDs))
for i, labelID := range test.toRemoveIDs {
toRemoveLabels[i] = unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: labelID})
}
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: test.doerID})
assert.NoError(t, AddRemoveLabels(t.Context(), issue, doer, toAddLabels, toRemoveLabels))
for _, labelID := range test.toAddIDs {
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: test.issueID, LabelID: labelID})
}
for _, labelID := range test.toRemoveIDs {
unittest.AssertNotExistsBean(t, &issues_model.IssueLabel{IssueID: test.issueID, LabelID: labelID})
}
}
}

20
services/projects/workflow_notifier.go
View File

@ -345,6 +345,8 @@ func matchWorkflowsFilters(workflow *project_model.Workflow, issue *issues_model
}
func executeWorkflowActions(ctx context.Context, workflow *project_model.Workflow, issue *issues_model.Issue) {
var toAddedLables, toRemovedLables []*issues_model.Label
for _, action := range workflow.WorkflowActions {
switch action.Type {
case project_model.WorkflowActionTypeColumn:
@ -373,10 +375,7 @@ func executeWorkflowActions(ctx context.Context, workflow *project_model.Workflo
log.Error("GetLabelByID: %v", err)
continue
}
if err := issue_service.AddLabel(ctx, issue, user_model.NewProjectWorkflowsUser(), label); err != nil {
log.Error("AddLabels: %v", err)
continue
}
toAddedLables = append(toAddedLables, label)
case project_model.WorkflowActionTypeRemoveLabels:
labelID, _ := strconv.ParseInt(action.Value, 10, 64)
if labelID == 0 {
@ -388,12 +387,7 @@ func executeWorkflowActions(ctx context.Context, workflow *project_model.Workflo
log.Error("GetLabelByID: %v", err)
continue
}
if err := issue_service.RemoveLabel(ctx, issue, user_model.NewProjectWorkflowsUser(), label); err != nil {
if !issues_model.IsErrRepoLabelNotExist(err) {
log.Error("RemoveLabels: %v", err)
}
continue
}
toRemovedLables = append(toRemovedLables, label)
case project_model.WorkflowActionTypeIssueState:
if strings.EqualFold(action.Value, "reopen") {
if issue.IsClosed {
@ -414,4 +408,10 @@ func executeWorkflowActions(ctx context.Context, workflow *project_model.Workflo
log.Error("Unsupported action type: %s", action.Type)
}
}
if len(toAddedLables)+len(toRemovedLables) > 0 {
if err := issue_service.AddRemoveLabels(ctx, issue, user_model.NewProjectWorkflowsUser(), toAddedLables, toRemovedLables); err != nil {
log.Error("AddRemoveLabels: %v", err)
}
}
}