ami/tl-vikunja
1
0
Fork 0
Code

fix(webhooks): fire webhooks set on parent projects as well

Browse Source
This commit is contained in:
kolaente 2024-03-13 19:41:34 +01:00
parent 117079bbda
commit 8c826c44d2
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/models/listeners.go
View File

@ -725,24 +725,36 @@ func (wl *WebhookListener) Handle(msg *message.Message) (err error) {
s := db.NewSession() s := db.NewSession()
defer s.Close() defer s.Close()
parents, err := GetAllParentProjects(s, projectID)
if err != nil {
return err
}
projectIDs := make([]int64, 0, len(parents)+1)
projectIDs = append(projectIDs, projectID)
for _, p := range parents {
projectIDs = append(projectIDs, p.ID)
}
ws := []*Webhook{} ws := []*Webhook{}
err = s.Where("project_id = ?", projectID). err = s.In("project_id", projectIDs).
Find(&ws) Find(&ws)
if err != nil { if err != nil {
return err return err
} }
var webhook *Webhook matchingWebhooks := []*Webhook{}
for _, w := range ws { for _, w := range ws {
for _, e := range w.Events { for _, e := range w.Events {
if e == wl.EventName { if e == wl.EventName {
webhook = w matchingWebhooks = append(matchingWebhooks, w)
break break
} }
} }
} }
if webhook == nil { if len(matchingWebhooks) == 0 {
log.Debugf("Did not find any webhook for the %s event for project %d, not sending", wl.EventName, projectID) log.Debugf("Did not find any webhook for the %s event for project %d, not sending", wl.EventName, projectID)
return nil return nil
} }
@ -789,11 +801,17 @@ func (wl *WebhookListener) Handle(msg *message.Message) (err error) {
} }
} }
err = webhook.sendWebhookPayload(&WebhookPayload{ for _, webhook := range matchingWebhooks {
EventName: wl.EventName, err = webhook.sendWebhookPayload(&WebhookPayload{
Time: time.Now(), EventName: wl.EventName,
Data: event, Time: time.Now(),
}) Data: event,
})
if err != nil {
return err
}
}
return return
} }