codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 10:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: correct duplicate granting

Browse source
This commit is contained in:
Sam 2014-07-05 18:32:06 +10:00
parent d99a9b6735
commit 4a25c86d61
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/services/badge_granter.rb
View file

@ -74,7 +74,7 @@ class BadgeGranter
LEFT JOIN ( #{badge.query} ) q LEFT JOIN ( #{badge.query} ) q
ON q.user_id = ub.user_id ON q.user_id = ub.user_id
#{post_clause} #{post_clause}
WHERE ub.id = :id AND q.user_id IS NULL WHERE ub.badge_id = :id AND q.user_id IS NULL
)" )"
Badge.exec_sql(sql, id: badge.id) Badge.exec_sql(sql, id: badge.id)
@ -83,9 +83,9 @@ class BadgeGranter
SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field} SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field}
FROM ( #{badge.query} ) q FROM ( #{badge.query} ) q
LEFT JOIN user_badges ub ON LEFT JOIN user_badges ub ON
ub.id = :id AND ub.user_id = q.user_id ub.badge_id = :id AND ub.user_id = q.user_id
#{post_clause} #{post_clause}
WHERE ub.id IS NULL" WHERE ub.badge_id IS NULL"
Badge.exec_sql(sql, id: badge.id) Badge.exec_sql(sql, id: badge.id)

11
db/migrate/20140705081453_index_user_badges.rb Normal file
View file

@ -0,0 +1,11 @@
class IndexUserBadges < ActiveRecord::Migration
def change
execute 'DELETE FROM user_badges USING user_badges ub2
WHERE user_badges.badge_id = ub2.badge_id AND
user_badges.user_id = ub2.user_id AND
user_badges.post_id IS NOT NULL AND
user_badges.id < ub2.id
'
add_index :user_badges, [:badge_id, :user_id, :post_id], unique: true, where: 'post_id IS NOT NULL'
end
end

2
spec/services/badge_granter_spec.rb
View file

@ -28,8 +28,10 @@ describe BadgeGranter do
it 'should grant missing badges' do it 'should grant missing badges' do
post = Fabricate(:post, like_count: 30) post = Fabricate(:post, like_count: 30)
2.times {
BadgeGranter.backfill(Badge.find(Badge::NicePost)) BadgeGranter.backfill(Badge.find(Badge::NicePost))
BadgeGranter.backfill(Badge.find(Badge::GoodPost)) BadgeGranter.backfill(Badge.find(Badge::GoodPost))
}
# TODO add welcome # TODO add welcome
post.user.user_badges.pluck(:badge_id).sort.should == [Badge::NicePost,Badge::GoodPost] post.user.user_badges.pluck(:badge_id).sort.should == [Badge::NicePost,Badge::GoodPost]