ami/tl-vikunja
1
0
Fork 0
Code Activity

fix(subscriptions): cleanup and simplify fetching subscribers for tasks and projects logic

Browse Source 
Vikunja now uses one recursive CTE and a few optimizations to fetch all subscribers for a task or project. This makes the relevant code easier to maintain and more performant.

(cherry picked from commit 4ff8815fe1bfe72e02c10f6a6877c93a630f36a4)
This commit is contained in:
kolaente
2024-09-04 19:54:22 +02:00
parent 7646c7f0c9
commit 8b8ec19bb3
7 changed files with 330 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/models/subscription_test.go
View File

@ -52,7 +52,6 @@ func TestSubscription_Create(t *testing.T) {
sb := &Subscription{
Entity: "task",
EntityID: 1,
UserID: u.ID,
}
can, err := sb.CanCreate(s, u)
@ -61,7 +60,6 @@ func TestSubscription_Create(t *testing.T) {
err = sb.Create(s, u)
require.NoError(t, err)
assert.NotNil(t, sb.User)
db.AssertExists(t, "subscriptions", map[string]interface{}{
"entity_type": 3,
@ -69,6 +67,26 @@ func TestSubscription_Create(t *testing.T) {
"user_id": u.ID,
}, false)
})
t.Run("already exists", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
defer s.Close()
sb := &Subscription{
Entity: "task",
EntityID: 2,
UserID: u.ID,
}
can, err := sb.CanCreate(s, u)
require.NoError(t, err)
assert.True(t, can)
err = sb.Create(s, u)
require.Error(t, err)
terr := &ErrSubscriptionAlreadyExists{}
assert.ErrorAs(t, err, &terr)
})
t.Run("forbidden for link shares", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -86,7 +104,7 @@ func TestSubscription_Create(t *testing.T) {
require.Error(t, err)
assert.False(t, can)
})
t.Run("noneixsting project", func(t *testing.T) {
t.Run("nonexisting project", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
defer s.Close()
@ -240,7 +258,7 @@ func TestSubscriptionGet(t *testing.T) {
s := db.NewSession()
defer s.Close()
sub, err := GetSubscription(s, SubscriptionEntityProject, 12, u)
sub, err := GetSubscriptionForUser(s, SubscriptionEntityProject, 12, u)
require.NoError(t, err)
assert.NotNil(t, sub)
assert.Equal(t, int64(3), sub.ID)
@ -250,7 +268,7 @@ func TestSubscriptionGet(t *testing.T) {
s := db.NewSession()
defer s.Close()
sub, err := GetSubscription(s, SubscriptionEntityTask, 22, u)
sub, err := GetSubscriptionForUser(s, SubscriptionEntityTask, 22, u)
require.NoError(t, err)
assert.NotNil(t, sub)
assert.Equal(t, int64(4), sub.ID)
@ -263,7 +281,7 @@ func TestSubscriptionGet(t *testing.T) {
defer s.Close()
// Project 25 belongs to project 12 where user 6 has subscribed to
sub, err := GetSubscription(s, SubscriptionEntityProject, 25, u)
sub, err := GetSubscriptionForUser(s, SubscriptionEntityProject, 25, u)
require.NoError(t, err)
assert.NotNil(t, sub)
assert.Equal(t, int64(12), sub.EntityID)
@ -275,7 +293,7 @@ func TestSubscriptionGet(t *testing.T) {
defer s.Close()
// Project 26 belongs to project 25 which belongs to project 12 where user 6 has subscribed to
sub, err := GetSubscription(s, SubscriptionEntityProject, 26, u)
sub, err := GetSubscriptionForUser(s, SubscriptionEntityProject, 26, u)
require.NoError(t, err)
assert.NotNil(t, sub)
assert.Equal(t, int64(12), sub.EntityID)
@ -287,7 +305,7 @@ func TestSubscriptionGet(t *testing.T) {
defer s.Close()
// Task 39 belongs to project 25 which belongs to project 12 where the user has subscribed
sub, err := GetSubscription(s, SubscriptionEntityTask, 39, u)
sub, err := GetSubscriptionForUser(s, SubscriptionEntityTask, 39, u)
require.NoError(t, err)
assert.NotNil(t, sub)
// assert.Equal(t, int64(2), sub.ID) TODO
@ -298,7 +316,7 @@ func TestSubscriptionGet(t *testing.T) {
defer s.Close()
// Task 21 belongs to project 32 which the user has subscribed to
sub, err := GetSubscription(s, SubscriptionEntityTask, 21, u)
sub, err := GetSubscriptionForUser(s, SubscriptionEntityTask, 21, u)
require.NoError(t, err)
assert.NotNil(t, sub)
assert.Equal(t, int64(8), sub.ID)
@ -309,7 +327,7 @@ func TestSubscriptionGet(t *testing.T) {
s := db.NewSession()
defer s.Close()
_, err := GetSubscription(s, 2342, 21, u)
_, err := GetSubscriptionForUser(s, 2342, 21, u)
require.Error(t, err)
assert.True(t, IsErrUnknownSubscriptionEntityType(err))
})
@ -318,7 +336,7 @@ func TestSubscriptionGet(t *testing.T) {
s := db.NewSession()
defer s.Close()
sub, err := GetSubscription(s, SubscriptionEntityTask, 18, u)
sub, err := GetSubscriptionForUser(s, SubscriptionEntityTask, 18, u)
require.NoError(t, err)
assert.Equal(t, int64(9), sub.ID)
})