From b663bf5447924c72ee11ecb7bc5f049e650db60c Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Fri, 12 May 2017 10:46:48 +1000 Subject: [PATCH] remove old jobs for awards --- app/jobs/award_group.rb | 32 -------------------------------- app/jobs/grant_badge.rb | 32 -------------------------------- app/jobs/jobs.rb | 3 --- spec/jobs/award_group_spec.rb | 19 ------------------- spec/jobs/grant_badge_spec.rb | 19 ------------------- 5 files changed, 105 deletions(-) delete mode 100644 app/jobs/award_group.rb delete mode 100644 app/jobs/grant_badge.rb delete mode 100644 spec/jobs/award_group_spec.rb delete mode 100644 spec/jobs/grant_badge_spec.rb diff --git a/app/jobs/award_group.rb b/app/jobs/award_group.rb deleted file mode 100644 index 2400d28..0000000 --- a/app/jobs/award_group.rb +++ /dev/null @@ -1,32 +0,0 @@ - -module Jobs - class AwardGroup < ::Jobs::Scheduled - every 1.minutes - - def execute(_args) - puts "===================== Running add to group ========================" - puts user_queue - user_queue.each do |email| - user = User.find_by_email(email) - next if user.nil? - puts "Added user #{user.email} to #{group_name}" - DiscourseDonations::Rewards.new(user).add_to_group(group_name) - end - user_queue_reset - end - - private - - def user_queue - PluginStore.get('discourse-donations', 'group:add') || [] - end - - def user_queue_reset - PluginStore.set('discourse-donations', 'group:add', []) - end - - def group_name - SiteSetting.discourse_donations_reward_group_name - end - end -end diff --git a/app/jobs/grant_badge.rb b/app/jobs/grant_badge.rb deleted file mode 100644 index 096e4b8..0000000 --- a/app/jobs/grant_badge.rb +++ /dev/null @@ -1,32 +0,0 @@ - -module Jobs - class GrantBadge < ::Jobs::Scheduled - every 5.minutes - - def execute(_args) - puts "===================== Running badge grant ========================" - puts user_queue - user_queue.each do |email| - user = User.find_by_email(email) - next if user.nil? - puts "Granted user #{user.email} with badge: #{badge_name}" - DiscourseDonations::Rewards.new(user).grant_badge(badge_name) - end - user_queue_reset - end - - private - - def user_queue - PluginStore.get('discourse-donations', 'badge:grant') || [] - end - - def user_queue_reset - PluginStore.set('discourse-donations', 'badge:grant', []) - end - - def badge_name - SiteSetting.discourse_donations_reward_badge_name - end - end -end diff --git a/app/jobs/jobs.rb b/app/jobs/jobs.rb index 6145631..e804950 100644 --- a/app/jobs/jobs.rb +++ b/app/jobs/jobs.rb @@ -1,4 +1 @@ -load File.expand_path('../award_group.rb', __FILE__) -load File.expand_path('../grant_badge.rb', __FILE__) - load File.expand_path('../regular/donation_user.rb', __FILE__) diff --git a/spec/jobs/award_group_spec.rb b/spec/jobs/award_group_spec.rb deleted file mode 100644 index c1af29a..0000000 --- a/spec/jobs/award_group_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'rails_helper' - -RSpec.describe Jobs::AwardGroup, type: :job do - let(:users) { [Fabricate(:user), Fabricate(:user)] } - let(:grp) { Fabricate(:group, name: 'chimichanga') } - - before do - SiteSetting.stubs(:discourse_donations_reward_group_name).returns(grp.name) - PluginStore.set('discourse-donations', 'group:add', [users.first.email, users.last.email]) - end - - it 'adds the users to the group' do - Jobs::AwardGroup.new.execute(nil) - aggregate_failures do - expect(users.first.groups).to include(grp) - expect(users.last.groups).to include(grp) - end - end -end diff --git a/spec/jobs/grant_badge_spec.rb b/spec/jobs/grant_badge_spec.rb deleted file mode 100644 index 2e880da..0000000 --- a/spec/jobs/grant_badge_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'rails_helper' - -RSpec.describe Jobs::GrantBadge, type: :job do - let(:users) { [Fabricate(:user), Fabricate(:user)] } - let(:badge) { Fabricate(:badge, name: 'el-grande') } - - before do - SiteSetting.stubs(:discourse_donations_reward_badge_name).returns(badge.name) - PluginStore.set('discourse-donations', 'badge:grant', [users.first.email, users.last.email]) - end - - it 'grants all the users the badge' do - Jobs::GrantBadge.new.execute(nil) - aggregate_failures do - expect(users.first.badges).to include(badge) - expect(users.last.badges).to include(badge) - end - end -end