mirror of
https://github.com/discourse/discourse.git
synced 2025-02-15 08:42:56 +08:00
fcaefc9f2f
When merging users, polls may error out if the source and target users have both voted on the same poll before. 😢
There is no constraint on the `poll_votes` table either to support this. Ideally a composite primary key can be used `(poll_id, user_id)`, but alas there is no support yet, which is probably why it wasn't created in the first place.
This fix ensures that merging is successful by only keeping the target poll votes if duplicates exist.
This fix also runs a migration on older poll votes where failed merges would have caused a single user to have voted twice on a single poll. e.g. this weird edge case
44 lines
1.5 KiB
Ruby
44 lines
1.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
RSpec.describe UserMerger do
|
|
fab!(:target_user) { Fabricate(:user, username: "galahad", email: "galahad@knights.com") }
|
|
fab!(:source_user) { Fabricate(:user, username: "lancelot", email: "lancelot@knights.com") }
|
|
fab!(:poll) { Fabricate(:poll) }
|
|
|
|
it "deletes source_user vote if target_user already voted" do
|
|
Fabricate(:poll_vote, poll: poll, user: target_user)
|
|
Fabricate(:poll_vote, poll: poll, user: source_user)
|
|
|
|
DiscourseEvent.trigger(:merging_users, source_user, target_user)
|
|
|
|
expect(PollVote.where(user: source_user).count).to eq(0)
|
|
end
|
|
|
|
it "keeps only target_user vote if duplicate" do
|
|
target_vote = Fabricate(:poll_vote, poll: poll, user: target_user)
|
|
Fabricate(:poll_vote, poll: poll, user: source_user)
|
|
|
|
DiscourseEvent.trigger(:merging_users, source_user, target_user)
|
|
|
|
expect(PollVote.where(user: target_user).to_json).to eq([target_vote].to_json)
|
|
end
|
|
|
|
it "reassigns source_user vote to target_user if not duplicate" do
|
|
Fabricate(:poll_vote, poll: poll, user: source_user)
|
|
|
|
expect { DiscourseEvent.trigger(:merging_users, source_user, target_user) }.to change(
|
|
PollVote.where(user: target_user),
|
|
:count,
|
|
).from(0).to(1)
|
|
end
|
|
|
|
it "keeps any existing target_user votes" do
|
|
Fabricate(:poll_vote, poll: poll, user: target_user)
|
|
|
|
expect { DiscourseEvent.trigger(:merging_users, source_user, target_user) }.to not_change(
|
|
PollVote.where(user: target_user),
|
|
:count,
|
|
)
|
|
end
|
|
end
|