IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 11:20:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: handle badge grant for deleted badge (#11558)

Browse Source
This commit is contained in:
Arpit Jalan 2020-12-22 20:24:51 +05:30 committed by GitHub
parent e113ddc73c
commit c9381beb9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/badge_granter.rb
View File

@ -44,7 +44,7 @@ class BadgeGranter
def grant def grant
return if @granted_by && !Guardian.new(@granted_by).can_grant_badges?(@user) return if @granted_by && !Guardian.new(@granted_by).can_grant_badges?(@user)
return unless @badge.enabled? return unless @badge.present? && @badge.enabled?
return if @badge.badge_grouping_id == BadgeGrouping::GettingStarted && @badge.id != Badge::NewUserOfTheMonth && @user.user_option.skip_new_user_tips return if @badge.badge_grouping_id == BadgeGrouping::GettingStarted && @badge.id != Badge::NewUserOfTheMonth && @user.user_option.skip_new_user_tips
find_by = { badge_id: @badge.id, user_id: @user.id } find_by = { badge_id: @badge.id, user_id: @user.id }

6
spec/services/badge_granter_spec.rb
View File

@ -208,6 +208,12 @@ describe BadgeGranter do
expect(Notification.where(user_id: user.id).count).to eq(0) expect(Notification.where(user_id: user.id).count).to eq(0)
end end
it "handles deleted badge" do
freeze_time
user_badge = BadgeGranter.grant(nil, user, created_at: 1.year.ago)
expect(user_badge).to eq(nil)
end
it "doesn't grant disabled badges" do it "doesn't grant disabled badges" do
freeze_time freeze_time
badge = Fabricate(:badge, badge_type_id: BadgeType::Bronze, enabled: false) badge = Fabricate(:badge, badge_type_id: BadgeType::Bronze, enabled: false)