Optimize and unit test Issue_ReplaceLabels (#1080)
This commit is contained in:
parent
a201977590
commit
cf80e19157
3 changed files with 57 additions and 30 deletions
|
@ -476,31 +476,24 @@ func (issue *Issue) ReplaceLabels(labels []*Label, doer *User) (err error) {
|
|||
sort.Sort(labelSorter(issue.Labels))
|
||||
|
||||
var toAdd, toRemove []*Label
|
||||
for _, l := range labels {
|
||||
var exist bool
|
||||
for _, oriLabel := range issue.Labels {
|
||||
if oriLabel.ID == l.ID {
|
||||
exist = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !exist {
|
||||
toAdd = append(toAdd, l)
|
||||
}
|
||||
}
|
||||
|
||||
for _, oriLabel := range issue.Labels {
|
||||
var exist bool
|
||||
for _, l := range labels {
|
||||
if oriLabel.ID == l.ID {
|
||||
exist = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !exist {
|
||||
toRemove = append(toRemove, oriLabel)
|
||||
addIndex, removeIndex := 0, 0
|
||||
for addIndex < len(labels) && removeIndex < len(issue.Labels) {
|
||||
addLabel := labels[addIndex]
|
||||
removeLabel := issue.Labels[removeIndex]
|
||||
if addLabel.ID == removeLabel.ID {
|
||||
addIndex++
|
||||
removeIndex++
|
||||
} else if addLabel.ID < removeLabel.ID {
|
||||
toAdd = append(toAdd, addLabel)
|
||||
addIndex++
|
||||
} else {
|
||||
toRemove = append(toRemove, removeLabel)
|
||||
removeIndex++
|
||||
}
|
||||
}
|
||||
toAdd = append(toAdd, labels[addIndex:]...)
|
||||
toRemove = append(toRemove, issue.Labels[removeIndex:]...)
|
||||
|
||||
if len(toAdd) > 0 {
|
||||
if err = issue.addLabels(sess, toAdd, doer); err != nil {
|
||||
|
@ -508,11 +501,9 @@ func (issue *Issue) ReplaceLabels(labels []*Label, doer *User) (err error) {
|
|||
}
|
||||
}
|
||||
|
||||
if len(toRemove) > 0 {
|
||||
for _, l := range toRemove {
|
||||
if err = issue.removeLabel(sess, doer, l); err != nil {
|
||||
return fmt.Errorf("removeLabel: %v", err)
|
||||
}
|
||||
for _, l := range toRemove {
|
||||
if err = issue.removeLabel(sess, doer, l); err != nil {
|
||||
return fmt.Errorf("removeLabel: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
35
models/issue_test.go
Normal file
35
models/issue_test.go
Normal file
|
@ -0,0 +1,35 @@
|
|||
// 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 models
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestIssue_ReplaceLabels(t *testing.T) {
|
||||
assert.NoError(t, PrepareTestDatabase())
|
||||
|
||||
testSuccess := func(issueID int64, labelIDs []int64) {
|
||||
issue := AssertExistsAndLoadBean(t, &Issue{ID: issueID}).(*Issue)
|
||||
repo := AssertExistsAndLoadBean(t, &Repository{ID: issue.RepoID}).(*Repository)
|
||||
doer := AssertExistsAndLoadBean(t, &User{ID: repo.OwnerID}).(*User)
|
||||
|
||||
labels := make([]*Label, len(labelIDs))
|
||||
for i, labelID := range labelIDs {
|
||||
labels[i] = AssertExistsAndLoadBean(t, &Label{ID: labelID, RepoID: repo.ID}).(*Label)
|
||||
}
|
||||
assert.NoError(t, issue.ReplaceLabels(labels, doer))
|
||||
AssertCount(t, &IssueLabel{IssueID: issueID}, len(labelIDs))
|
||||
for _, labelID := range labelIDs {
|
||||
AssertExistsAndLoadBean(t, &IssueLabel{IssueID: issueID, LabelID: labelID})
|
||||
}
|
||||
}
|
||||
|
||||
testSuccess(1, []int64{2})
|
||||
testSuccess(1, []int64{1, 2})
|
||||
testSuccess(1, []int64{})
|
||||
}
|
|
@ -107,8 +107,9 @@ func AssertSuccessfulInsert(t *testing.T, beans ...interface{}) {
|
|||
assert.NoError(t, err)
|
||||
}
|
||||
|
||||
// AssertSuccessfulUpdate assert that bean is successfully updated
|
||||
func AssertSuccessfulUpdate(t *testing.T, bean interface{}, conditions ...interface{}) {
|
||||
_, err := x.Update(bean, conditions...)
|
||||
// AssertCount assert the count of a bean
|
||||
func AssertCount(t *testing.T, bean interface{}, expected interface{}) {
|
||||
actual, err := x.Count(bean)
|
||||
assert.NoError(t, err)
|
||||
assert.EqualValues(t, expected, actual)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue