Move more issue assignee code from models to issue service (#8690)
* Move more issue assignee code from models to issue service * fix testtokarchuk/v1.17
parent
018b0e8180
commit
495d5e4329
@ -0,0 +1,53 @@ |
|||||||
|
// 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 ( |
||||||
|
"code.gitea.io/gitea/models" |
||||||
|
"code.gitea.io/gitea/modules/notification" |
||||||
|
) |
||||||
|
|
||||||
|
// DeleteNotPassedAssignee deletes all assignees who aren't passed via the "assignees" array
|
||||||
|
func DeleteNotPassedAssignee(issue *models.Issue, doer *models.User, assignees []*models.User) (err error) { |
||||||
|
var found bool |
||||||
|
|
||||||
|
for _, assignee := range issue.Assignees { |
||||||
|
|
||||||
|
found = false |
||||||
|
for _, alreadyAssignee := range assignees { |
||||||
|
if assignee.ID == alreadyAssignee.ID { |
||||||
|
found = true |
||||||
|
break |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
if !found { |
||||||
|
// This function also does comments and hooks, which is why we call it seperatly instead of directly removing the assignees here
|
||||||
|
if _, _, err := ToggleAssignee(issue, doer, assignee.ID); err != nil { |
||||||
|
return err |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
return nil |
||||||
|
} |
||||||
|
|
||||||
|
// ToggleAssignee changes a user between assigned and not assigned for this issue, and make issue comment for it.
|
||||||
|
func ToggleAssignee(issue *models.Issue, doer *models.User, assigneeID int64) (removed bool, comment *models.Comment, err error) { |
||||||
|
removed, comment, err = issue.ToggleAssignee(doer, assigneeID) |
||||||
|
if err != nil { |
||||||
|
return |
||||||
|
} |
||||||
|
|
||||||
|
assignee, err1 := models.GetUserByID(assigneeID) |
||||||
|
if err1 != nil { |
||||||
|
err = err1 |
||||||
|
return |
||||||
|
} |
||||||
|
|
||||||
|
notification.NotifyIssueChangeAssignee(doer, issue, assignee, removed, comment) |
||||||
|
|
||||||
|
return |
||||||
|
} |
@ -0,0 +1,37 @@ |
|||||||
|
// 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 ( |
||||||
|
"testing" |
||||||
|
|
||||||
|
"code.gitea.io/gitea/models" |
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestDeleteNotPassedAssignee(t *testing.T) { |
||||||
|
assert.NoError(t, models.PrepareTestDatabase()) |
||||||
|
|
||||||
|
// Fake issue with assignees
|
||||||
|
issue, err := models.GetIssueWithAttrsByID(1) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
user1, err := models.GetUserByID(1) // This user is already assigned (see the definition in fixtures), so running UpdateAssignee should unassign him
|
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
// Check if he got removed
|
||||||
|
isAssigned, err := models.IsUserAssignedToIssue(issue, user1) |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.True(t, isAssigned) |
||||||
|
|
||||||
|
// Clean everyone
|
||||||
|
err = DeleteNotPassedAssignee(issue, user1, []*models.User{}) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
// Check they're gone
|
||||||
|
assignees, err := models.GetAssigneesByIssue(issue) |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Equal(t, 0, len(assignees)) |
||||||
|
} |
Loading…
Reference in new issue