vikunja
/
vikunja
6
43
Fork 71
Code Issues 150 Pull Requests 15 Packages Releases 32 Activity

Add task assignee created event

This commit is contained in:
kolaente 2021-01-31 21:22:54 +01:00
parent a93aab6024
commit 73bed1ce31
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
5 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/bulk_task.go
View File

@ -85,7 +85,7 @@ func (bt *BulkTask) Update(s *xorm.Session, a web.Auth) (err error) {
updateDone(oldtask, &bt.Task)
// Update the assignees
if err := oldtask.updateTaskAssignees(s, bt.Assignees); err != nil {
if err := oldtask.updateTaskAssignees(s, bt.Assignees, a); err != nil {
return err
}

18
pkg/models/events.go
View File

@ -16,7 +16,9 @@
package models
import "code.vikunja.io/api/pkg/user"
import (
"code.vikunja.io/api/pkg/user"
)
type TaskCreatedEvent struct {
Task *Task
@ -43,3 +45,17 @@ func (t *TaskUpdatedEvent) TopicName() string {
func (t *TaskUpdatedEvent) Message() interface{} {
return t
}
type TaskAssigneeCreatedEvent struct {
Task *Task
Assignee *user.User
Doer *user.User
}
func (t *TaskAssigneeCreatedEvent) TopicName() string {
return "task.assignee.created"
}
func (t *TaskAssigneeCreatedEvent) Message() interface{} {
return t
}

18
pkg/models/list_duplicate.go
View File

@ -67,15 +67,15 @@ func (ld *ListDuplicate) CanCreate(s *xorm.Session, a web.Auth) (canCreate bool,
// @Failure 500 {object} models.Message "Internal error"
// @Router /lists/{listID}/duplicate [put]
//nolint:gocyclo
func (ld *ListDuplicate) Create(s *xorm.Session, a web.Auth) (err error) {
func (ld *ListDuplicate) Create(s *xorm.Session, doer web.Auth) (err error) {
log.Debugf("Duplicating list %d", ld.ListID)
ld.List.ID = 0
ld.List.Identifier = "" // Reset the identifier to trigger regenerating a new one
// Set the owner to the current user
ld.List.OwnerID = a.GetID()
if err := CreateOrUpdateList(s, ld.List, a); err != nil {
ld.List.OwnerID = doer.GetID()
if err := CreateOrUpdateList(s, ld.List, doer); err != nil {
// If there is no available unique list identifier, just reset it.
if IsErrListIdentifierIsNotUnique(err) {
ld.List.Identifier = ""
@ -99,7 +99,7 @@ func (ld *ListDuplicate) Create(s *xorm.Session, a web.Auth) (err error) {
oldID := b.ID
b.ID = 0
b.ListID = ld.List.ID
if err := b.Create(s, a); err != nil {
if err := b.Create(s, doer); err != nil {
return err
}
bucketMap[oldID] = b.ID
@ -108,7 +108,7 @@ func (ld *ListDuplicate) Create(s *xorm.Session, a web.Auth) (err error) {
log.Debugf("Duplicated all buckets from list %d into %d", ld.ListID, ld.List.ID)
// Get all tasks + all task details
tasks, _, _, err := getTasksForLists(s, []*List{{ID: ld.ListID}}, a, &taskOptions{})
tasks, _, _, err := getTasksForLists(s, []*List{{ID: ld.ListID}}, doer, &taskOptions{})
if err != nil {
return err
}
@ -124,7 +124,7 @@ func (ld *ListDuplicate) Create(s *xorm.Session, a web.Auth) (err error) {
t.ListID = ld.List.ID
t.BucketID = bucketMap[t.BucketID]
t.UID = ""
err := createTask(s, t, a, false)
err := createTask(s, t, doer, false)
if err != nil {
return err
}
@ -163,7 +163,7 @@ func (ld *ListDuplicate) Create(s *xorm.Session, a web.Auth) (err error) {
return err
}
err := attachment.NewAttachment(s, attachment.File.File, attachment.File.Name, attachment.File.Size, a)
err := attachment.NewAttachment(s, attachment.File.File, attachment.File.Name, attachment.File.Size, doer)
if err != nil {
return err
}
@ -206,7 +206,7 @@ func (ld *ListDuplicate) Create(s *xorm.Session, a web.Auth) (err error) {
ID: taskMap[a.TaskID],
ListID: ld.List.ID,
}
if err := t.addNewAssigneeByID(s, a.UserID, ld.List); err != nil {
if err := t.addNewAssigneeByID(s, a.UserID, ld.List, doer); err != nil {
if IsErrUserDoesNotHaveAccessToList(err) {
continue
}
@ -269,7 +269,7 @@ func (ld *ListDuplicate) Create(s *xorm.Session, a web.Auth) (err error) {
}
defer f.File.Close()
file, err := files.Create(f.File, f.Name, f.Size, a)
file, err := files.Create(f.File, f.Name, f.Size, doer)
if err != nil {
return err
}

25
pkg/models/task_assignees.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/events"
"time"
"code.vikunja.io/api/pkg/user"
@ -57,7 +58,7 @@ func getRawTaskAssigneesForTasks(s *xorm.Session, taskIDs []int64) (taskAssignee
}
// Create or update a bunch of task assignees
func (t *Task) updateTaskAssignees(s *xorm.Session, assignees []*user.User) (err error) {
func (t *Task) updateTaskAssignees(s *xorm.Session, assignees []*user.User, doer web.Auth) (err error) {
// Load the current assignees
currentAssignees, err := getRawTaskAssigneesForTasks(s, []int64{t.ID})
@ -132,7 +133,7 @@ func (t *Task) updateTaskAssignees(s *xorm.Session, assignees []*user.User) (err
}
// Add the new assignee
err = t.addNewAssigneeByID(s, u.ID, list)
err = t.addNewAssigneeByID(s, u.ID, list, doer)
if err != nil {
return err
}
@ -198,10 +199,10 @@ func (la *TaskAssginee) Create(s *xorm.Session, a web.Auth) (err error) {
}
task := &Task{ID: la.TaskID}
return task.addNewAssigneeByID(s, la.UserID, list)
return task.addNewAssigneeByID(s, la.UserID, list, a)
}
func (t *Task) addNewAssigneeByID(s *xorm.Session, newAssigneeID int64, list *List) (err error) {
func (t *Task) addNewAssigneeByID(s *xorm.Session, newAssigneeID int64, list *List, auth web.Auth) (err error) {
// Check if the user exists and has access to the list
newAssignee, err := user.GetUserByID(s, newAssigneeID)
if err != nil {
@ -223,6 +224,20 @@ func (t *Task) addNewAssigneeByID(s *xorm.Session, newAssigneeID int64, list *Li
return err
}
doer, err := user.GetFromAuth(auth)
if err != nil {
return err
}
err = events.Publish(&TaskAssigneeCreatedEvent{
Task: t,
Assignee: newAssignee,
Doer: doer,
})
if err != nil {
return err
}
err = updateListLastUpdated(s, &List{ID: t.ListID})
return
}
@ -313,6 +328,6 @@ func (ba *BulkAssignees) Create(s *xorm.Session, a web.Auth) (err error) {
task.Assignees = append(task.Assignees, &a.User)
}
err = task.updateTaskAssignees(s, ba.Assignees)
err = task.updateTaskAssignees(s, ba.Assignees, a)
return
}

4
pkg/models/tasks.go
View File

@ -815,7 +815,7 @@ func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool) (err
// Update the assignees
if updateAssignees {
if err := t.updateTaskAssignees(s, t.Assignees); err != nil {
if err := t.updateTaskAssignees(s, t.Assignees, a); err != nil {
return err
}
}
@ -879,7 +879,7 @@ func (t *Task) Update(s *xorm.Session, a web.Auth) (err error) {
updateDone(&ot, t)
// Update the assignees
if err := ot.updateTaskAssignees(s, t.Assignees); err != nil {
if err := ot.updateTaskAssignees(s, t.Assignees, a); err != nil {
return err
}