π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[space][server] Exclude read poke IDs from notification groups
Anand Baburajan302ba229a579
diff --git a/server/space/repo/notifications.go b/server/space/repo/notifications.goindex 5227fe06e1..bb56abb11a 100644--- a/server/space/repo/notifications.go+++ b/server/space/repo/notifications.go@@ -68,7 +68,9 @@ func (r *NotificationsRepository) List(ctx context.Context, recipientSpaceID, cuquery += ` ORDER BY created_at DESC, notification_id DESC LIMIT $` + strconv.Itoa(len(args)) + `), grouped AS MATERIALIZED (SELECT visible.kind, visible.group_id,- ARRAY_AGG(visible.notification_id) AS notification_ids,+ COALESCE(ARRAY_AGG(visible.notification_id) FILTER (+ WHERE visible.kind <> 'poke' OR visible.read_at IS NULL+ ), '{}') AS notification_ids,CASE WHEN visible.kind = 'post_like' THEN COUNT(*) ELSE 1 END AS actor_count,BOOL_OR(visible.read_at IS NULL) AS unreadFROM visiblediff --git a/server/space/repo/pokes_test.go b/server/space/repo/pokes_test.goindex ef655aa0db..57892ee89e 100644--- a/server/space/repo/pokes_test.go+++ b/server/space/repo/pokes_test.go@@ -121,6 +121,7 @@ func TestPokesCreateNotificationsOnceAndGroupReadState(t *testing.T) {require.Equal(t, bob.SpaceID, page[0].Actors[0].SpaceID)require.Equal(t, int64(1), page[0].ActorCount)require.True(t, page[0].Unread)+ require.Len(t, page[0].NotificationIDs, 2)require.NoError(t, module.Notifications.MarkRead(ctx, bob.SpaceID, page[0].NotificationIDs))unread, err = module.Notifications.HasUnread(ctx, alice.SpaceID)require.NoError(t, err)@@ -131,10 +132,22 @@ func TestPokesCreateNotificationsOnceAndGroupReadState(t *testing.T) {require.Equal(t, int64(1), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE read_at IS NULL`))page, _, err = module.Notifications.List(ctx, alice.SpaceID, "", 20)require.NoError(t, err)+ require.Len(t, page, 1)+ require.True(t, page[0].Unread)+ require.Equal(t, []string{page[0].NotificationID}, page[0].NotificationIDs)+ latest := page[0]require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, page[0].NotificationIDs))unread, err = module.Notifications.HasUnread(ctx, alice.SpaceID)require.NoError(t, err)require.False(t, unread)+ page, _, err = module.Notifications.List(ctx, alice.SpaceID, "", 20)+ require.NoError(t, err)+ require.Len(t, page, 1)+ require.False(t, page[0].Unread)+ require.Equal(t, []string{}, page[0].NotificationIDs)+ require.Equal(t, latest.NotificationID, page[0].NotificationID)+ require.Equal(t, latest.CreatedAt, page[0].CreatedAt)+ require.Equal(t, latest.Actors, page[0].Actors)_, err = module.Pokes.DB.ExecContext(ctx, `DELETE FROM space_pokes WHERE client_request_id = 'third'`)require.NoError(t, err)require.Equal(t, int64(2), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications`))