Publish doer
This commit is contained in:
parent
c6e3e179a6
commit
1313f4d2a8
|
@ -16,8 +16,11 @@
|
||||||
|
|
||||||
package models
|
package models
|
||||||
|
|
||||||
|
import "code.vikunja.io/api/pkg/user"
|
||||||
|
|
||||||
type TaskCreatedEvent struct {
|
type TaskCreatedEvent struct {
|
||||||
Task *Task
|
Task *Task
|
||||||
|
Doer *user.User
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *TaskCreatedEvent) TopicName() string {
|
func (t *TaskCreatedEvent) TopicName() string {
|
||||||
|
@ -25,5 +28,5 @@ func (t *TaskCreatedEvent) TopicName() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *TaskCreatedEvent) Message() interface{} {
|
func (t *TaskCreatedEvent) Message() interface{} {
|
||||||
return t.Task
|
return t
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,12 +32,12 @@ type SendTaskCreatedNotification struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *SendTaskCreatedNotification) Handle(payload message.Payload) (err error) {
|
func (s *SendTaskCreatedNotification) Handle(payload message.Payload) (err error) {
|
||||||
task := &Task{}
|
event := &TaskCreatedEvent{}
|
||||||
err = json.Unmarshal(payload, task)
|
err = json.Unmarshal(payload, event)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Debugf("task.created: %v", task)
|
log.Debugf("task.created: %v", event)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -829,7 +829,11 @@ func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool) (err
|
||||||
|
|
||||||
t.setIdentifier(l)
|
t.setIdentifier(l)
|
||||||
|
|
||||||
if err := events.Publish(&TaskCreatedEvent{Task: t}); err != nil {
|
err = events.Publish(&TaskCreatedEvent{
|
||||||
|
Task: t,
|
||||||
|
Doer: t.CreatedBy,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue