Move issue label operations to issue service package (#8553)
* Move issue label operations to issue service package * fix test * fix fmt
This commit is contained in:
parent
240f46a422
commit
280f4bebbf
7 changed files with 168 additions and 138 deletions
|
@ -6,9 +6,57 @@ package issue
|
|||
|
||||
import (
|
||||
"code.gitea.io/gitea/models"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/notification"
|
||||
api "code.gitea.io/gitea/modules/structs"
|
||||
)
|
||||
|
||||
func sendLabelUpdatedWebhook(issue *models.Issue, doer *models.User) {
|
||||
var err error
|
||||
|
||||
if err = issue.LoadRepo(); err != nil {
|
||||
log.Error("LoadRepo: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
if err = issue.LoadPoster(); err != nil {
|
||||
log.Error("LoadPoster: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
mode, _ := models.AccessLevel(issue.Poster, issue.Repo)
|
||||
if issue.IsPull {
|
||||
if err = issue.LoadPullRequest(); err != nil {
|
||||
log.Error("loadPullRequest: %v", err)
|
||||
return
|
||||
}
|
||||
if err = issue.PullRequest.LoadIssue(); err != nil {
|
||||
log.Error("LoadIssue: %v", err)
|
||||
return
|
||||
}
|
||||
err = models.PrepareWebhooks(issue.Repo, models.HookEventPullRequest, &api.PullRequestPayload{
|
||||
Action: api.HookIssueLabelUpdated,
|
||||
Index: issue.Index,
|
||||
PullRequest: issue.PullRequest.APIFormat(),
|
||||
Repository: issue.Repo.APIFormat(models.AccessModeNone),
|
||||
Sender: doer.APIFormat(),
|
||||
})
|
||||
} else {
|
||||
err = models.PrepareWebhooks(issue.Repo, models.HookEventIssues, &api.IssuePayload{
|
||||
Action: api.HookIssueLabelUpdated,
|
||||
Index: issue.Index,
|
||||
Issue: issue.APIFormat(),
|
||||
Repository: issue.Repo.APIFormat(mode),
|
||||
Sender: doer.APIFormat(),
|
||||
})
|
||||
}
|
||||
if err != nil {
|
||||
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
|
||||
} else {
|
||||
go models.HookQueue.Add(issue.RepoID)
|
||||
}
|
||||
}
|
||||
|
||||
// ClearLabels clears all of an issue's labels
|
||||
func ClearLabels(issue *models.Issue, doer *models.User) (err error) {
|
||||
if err = issue.ClearLabels(doer); err != nil {
|
||||
|
@ -19,3 +67,45 @@ func ClearLabels(issue *models.Issue, doer *models.User) (err error) {
|
|||
|
||||
return nil
|
||||
}
|
||||
|
||||
// AddLabel adds a new label to the issue.
|
||||
func AddLabel(issue *models.Issue, doer *models.User, label *models.Label) error {
|
||||
if err := models.NewIssueLabel(issue, label, doer); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sendLabelUpdatedWebhook(issue, doer)
|
||||
return nil
|
||||
}
|
||||
|
||||
// AddLabels adds a list of new labels to the issue.
|
||||
func AddLabels(issue *models.Issue, doer *models.User, labels []*models.Label) error {
|
||||
if err := models.NewIssueLabels(issue, labels, doer); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sendLabelUpdatedWebhook(issue, doer)
|
||||
return nil
|
||||
}
|
||||
|
||||
// RemoveLabel removes a label from issue by given ID.
|
||||
func RemoveLabel(issue *models.Issue, doer *models.User, label *models.Label) error {
|
||||
if err := issue.LoadRepo(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
perm, err := models.GetUserRepoPermission(issue.Repo, doer)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !perm.CanWriteIssuesOrPulls(issue.IsPull) {
|
||||
return models.ErrLabelNotExist{}
|
||||
}
|
||||
|
||||
if err := models.DeleteIssueLabel(issue, label, doer); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sendLabelUpdatedWebhook(issue, doer)
|
||||
return nil
|
||||
}
|
||||
|
|
59
services/issue/label_test.go
Normal file
59
services/issue/label_test.go
Normal file
|
@ -0,0 +1,59 @@
|
|||
// Copyright 2017 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package issue
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestIssue_AddLabels(t *testing.T) {
|
||||
var tests = []struct {
|
||||
issueID int64
|
||||
labelIDs []int64
|
||||
doerID int64
|
||||
}{
|
||||
{1, []int64{1, 2}, 2}, // non-pull-request
|
||||
{1, []int64{}, 2}, // non-pull-request, empty
|
||||
{2, []int64{1, 2}, 2}, // pull-request
|
||||
{2, []int64{}, 1}, // pull-request, empty
|
||||
}
|
||||
for _, test := range tests {
|
||||
assert.NoError(t, models.PrepareTestDatabase())
|
||||
issue := models.AssertExistsAndLoadBean(t, &models.Issue{ID: test.issueID}).(*models.Issue)
|
||||
labels := make([]*models.Label, len(test.labelIDs))
|
||||
for i, labelID := range test.labelIDs {
|
||||
labels[i] = models.AssertExistsAndLoadBean(t, &models.Label{ID: labelID}).(*models.Label)
|
||||
}
|
||||
doer := models.AssertExistsAndLoadBean(t, &models.User{ID: test.doerID}).(*models.User)
|
||||
assert.NoError(t, AddLabels(issue, doer, labels))
|
||||
for _, labelID := range test.labelIDs {
|
||||
models.AssertExistsAndLoadBean(t, &models.IssueLabel{IssueID: test.issueID, LabelID: labelID})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestIssue_AddLabel(t *testing.T) {
|
||||
var tests = []struct {
|
||||
issueID int64
|
||||
labelID int64
|
||||
doerID int64
|
||||
}{
|
||||
{1, 2, 2}, // non-pull-request, not-already-added label
|
||||
{1, 1, 2}, // non-pull-request, already-added label
|
||||
{2, 2, 2}, // pull-request, not-already-added label
|
||||
{2, 1, 2}, // pull-request, already-added label
|
||||
}
|
||||
for _, test := range tests {
|
||||
assert.NoError(t, models.PrepareTestDatabase())
|
||||
issue := models.AssertExistsAndLoadBean(t, &models.Issue{ID: test.issueID}).(*models.Issue)
|
||||
label := models.AssertExistsAndLoadBean(t, &models.Label{ID: test.labelID}).(*models.Label)
|
||||
doer := models.AssertExistsAndLoadBean(t, &models.User{ID: test.doerID}).(*models.User)
|
||||
assert.NoError(t, AddLabel(issue, doer, label))
|
||||
models.AssertExistsAndLoadBean(t, &models.IssueLabel{IssueID: test.issueID, LabelID: test.labelID})
|
||||
}
|
||||
}
|
16
services/issue/main_test.go
Normal file
16
services/issue/main_test.go
Normal file
|
@ -0,0 +1,16 @@
|
|||
// Copyright 2019 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package issue
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models"
|
||||
)
|
||||
|
||||
func TestMain(m *testing.M) {
|
||||
models.MainTest(m, filepath.Join("..", ".."))
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue