Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: notifications were sent even without subscription (#627)

Guilherme Oenning6d299f739cd3
diff --git a/app/storage/postgres/post.go b/app/storage/postgres/post.go
index 7e66def52..9656589db 100644
--- a/app/storage/postgres/post.go
+++ b/app/storage/postgres/post.go
@@ -581,11 +581,8 @@ func (s *PostStorage) GetActiveSubscribers(number int, channel models.Notificati
FROM users u
LEFT JOIN post_subscribers sub
ON sub.user_id = u.id
+ AND sub.post_id = (SELECT id FROM posts p WHERE p.tenant_id = $4 and p.number = $1 LIMIT 1)
AND sub.tenant_id = u.tenant_id
- LEFT JOIN posts p
- ON p.id = sub.post_id
- AND p.tenant_id = u.tenant_id
- AND p.number = $1
LEFT JOIN user_settings set
ON set.user_id = u.id
AND set.key = $3
diff --git a/app/storage/postgres/subscription_test.go b/app/storage/postgres/subscription_test.go
index 09f9cbc86..e6f990d66 100644
--- a/app/storage/postgres/subscription_test.go
+++ b/app/storage/postgres/subscription_test.go
@@ -52,7 +52,6 @@ func TestSubscription_NoSettings(t *testing.T) {
subscribed, err = users.HasSubscribedTo(post1.ID)
Expect(err).IsNil()
Expect(subscribed).IsFalse()
-
}
func TestSubscription_RemoveSubscriber(t *testing.T) {
@@ -302,14 +301,24 @@ func TestSubscription_DeletedPost(t *testing.T) {
subscribers, err := posts.GetActiveSubscribers(post1.Number, models.NotificationChannelWeb, models.NotificationEventNewComment)
Expect(err).IsNil()
Expect(subscribers).HasLen(2)
+ Expect(subscribers[0].ID).Equals(jonSnow.ID)
+ Expect(subscribers[1].ID).Equals(aryaStark.ID)
+}
- users.SetCurrentUser(jonSnow)
- subscribed, err := users.HasSubscribedTo(post1.ID)
+func TestSubscription_SubscribedToDifferentPost(t *testing.T) {
+ SetupDatabaseTest(t)
+ defer TeardownDatabaseTest()
+
+ posts.SetCurrentTenant(demoTenant)
+ posts.SetCurrentUser(jonSnow)
+
+ post1, _ := posts.Add("Post #1", "Description #1")
+ post2, _ := posts.Add("Post #2", "Description #2")
+ err := posts.AddSubscriber(post2, aryaStark)
Expect(err).IsNil()
- Expect(subscribed).IsTrue()
- users.SetCurrentUser(aryaStark)
- subscribed, err = users.HasSubscribedTo(post1.ID)
+ subscribers, err := posts.GetActiveSubscribers(post1.Number, models.NotificationChannelWeb, models.NotificationEventNewComment)
Expect(err).IsNil()
- Expect(subscribed).IsTrue()
+ Expect(subscribers).HasLen(1)
+ Expect(subscribers[0].ID).Equals(jonSnow.ID)
}