ami/tl-vikunja
1
0
Fork 0
Code

fix(subscriptions): ignore task subscription when the user is subscribed to the project

Browse Source 
Resolves https://community.vikunja.io/t/e-mail-notification-twice/2740/12
Resolves https://github.com/go-vikunja/vikunja/issues/316

(cherry picked from commit efde364224cf744c448a5b8e069776f18652d314)
This commit is contained in:
kolaente 2024-08-29 10:35:05 +02:00
parent a253f76060
commit 1a131d79f9
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/models/subscription.go
View File

@ -234,23 +234,12 @@ func GetSubscriptions(s *xorm.Session, entityType SubscriptionEntityType, entity
return nil, err
}
// If the task does not have a subscription directly or from its project, get the one
// from the parent and return it instead.
var taskIDsWithoutSubscription []int64
for _, eID := range entityIDs {
if _, has := subs[eID]; has {
continue
}
taskIDsWithoutSubscription = append(taskIDsWithoutSubscription, eID)
}
projects, err := GetProjectsSimplByTaskIDs(s, taskIDsWithoutSubscription)
projects, err := GetProjectsSimplByTaskIDs(s, entityIDs)
if err != nil {
return nil, err
}
tasks, err := GetTasksSimpleByIDs(s, taskIDsWithoutSubscription)
tasks, err := GetTasksSimpleByIDs(s, entityIDs)
if err != nil {
return nil, err
}
@ -261,9 +250,17 @@ func GetSubscriptions(s *xorm.Session, entityType SubscriptionEntityType, entity
}
for _, task := range tasks {
sub, has := projectSubscriptions[task.ProjectID]
if has {
subs[task.ID] = sub
// If a task is already subscribed through the parent project,
// remove the task subscription since that's a duplicate.
// But if the user is not subscribed to the task but a parent project is, add that to the subscriptions
psub, hasProjectSub := projectSubscriptions[task.ProjectID]
_, hasTaskSub := subs[task.ID]
if hasProjectSub && hasTaskSub {
delete(subs, task.ID)
}
if !hasTaskSub {
subs[task.ID] = psub
}
}