Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Clean up poke history during access reset

Neeraj Gupta89804a2a2856
diff --git a/server/space/repo/account_deletion.go b/server/space/repo/account_deletion.go
index a19267f326..b48ad21a6a 100644
--- a/server/space/repo/account_deletion.go
+++ b/server/space/repo/account_deletion.go
@@ -104,6 +104,9 @@ func resetSpaceAccessTx(ctx context.Context, tx *sql.Tx, userID int64, spaceIDs
if _, err := tx.ExecContext(ctx, `DELETE FROM space_friend_shares WHERE space_id = ANY($1) OR friend_space_id = ANY($1)`, spaceIDArray); err != nil {
return stacktrace.Propagate(err, "failed to delete space friend shares")
}
+ if _, err := tx.ExecContext(ctx, `DELETE FROM space_pokes WHERE sender_space_id = ANY($1) OR recipient_space_id = ANY($1)`, spaceIDArray); err != nil {
+ return stacktrace.Propagate(err, "failed to delete space pokes")
+ }
if _, err := tx.ExecContext(ctx, `DELETE FROM space_friend_requests WHERE requester_space_id = ANY($1) OR target_space_id = ANY($1)`, spaceIDArray); err != nil {
return stacktrace.Propagate(err, "failed to delete space friend requests")
}
diff --git a/server/space/repo/pokes_test.go b/server/space/repo/pokes_test.go
index c1ecaab18c..f40ba6956d 100644
--- a/server/space/repo/pokes_test.go
+++ b/server/space/repo/pokes_test.go
@@ -18,6 +18,12 @@ func TestPokesCreateDuringShareChanges(t *testing.T) {
alice, bob := notificationTestSpaces(t, module)
ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
defer cancel()
+ for _, requestID := range []string{"first", "second"} {
+ _, err := module.Pokes.Create(ctx, bob.SpaceID, alice.SpaceID, requestID)
+ require.NoError(t, err)
+ _, err = module.Pokes.Create(ctx, alice.SpaceID, bob.SpaceID, requestID)
+ require.NoError(t, err)
+ }
space := alice
if operation == "reset-sender-access" {
space = bob
@@ -66,8 +72,8 @@ func TestPokesCreateDuringShareChanges(t *testing.T) {
err = <-result
if operation == "update-recipient-shares" {
require.NoError(t, err)
- require.Equal(t, int64(1), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_pokes`))
- require.Equal(t, int64(1), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE kind = 'poke'`))
+ require.Equal(t, int64(5), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_pokes`))
+ require.Equal(t, int64(2), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE kind = 'poke'`))
} else {
require.ErrorIs(t, err, sql.ErrNoRows)
require.Equal(t, int64(0), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_pokes`))