fix: solve sidekiq organization permission issue

Author: Bulletdev

app/modules/matches/jobs/sync_match_job.rb

@@ -10,6 +10,9 @@ class SyncMatchJob < ApplicationJob
     # retry_on RiotApiService::RiotApiError, wait: 1.minute, attempts: 3
 
     def perform(match_id, organization_id, region = 'BR', force_update = false)
+      # Set organization context for multi-tenant scoping
+      Current.organization_id = organization_id
+
       puts "SyncMatchJob: Starting sync for #{match_id} (force_update: #{force_update})"
       $stdout.flush
       organization = Organization.find(organization_id)
@@ -53,6 +56,9 @@ def perform(match_id, organization_id, region = 'BR', force_update = false)
     rescue StandardError => e
       Rails.logger.error("Failed to sync match #{match_id}: #{e.message}")
       raise
+    ensure
+      # Clean up context
+      Current.organization_id = nil
     end
 
     private

app/modules/players/controllers/players_controller.rb

@@ -266,7 +266,7 @@ def bulk_sync
 
         begin
           players.each do |player|
-            SyncPlayerFromRiotJob.perform_later(player.id)
+            SyncPlayerFromRiotJob.perform_later(player.id, current_organization.id)
           end
 
           render_success({

app/modules/players/jobs/sync_player_from_riot_job.rb

@@ -6,14 +6,20 @@ module Players
   class SyncPlayerFromRiotJob < ApplicationJob
     queue_as :default
 
-    def perform(player_id)
+    def perform(player_id, organization_id)
+      # Set organization context for multi-tenant scoping
+      Current.organization_id = organization_id
+
       player = Player.find(player_id)
       riot_api_key = ENV['RIOT_API_KEY']
 
       return mark_error!(player, "Player #{player_id} missing Riot info") unless riot_info_present?(player)
       return mark_error!(player, 'Riot API key not configured') unless riot_api_key.present?
 
       sync_player_from_riot!(player, riot_api_key)
+    ensure
+      # Clean up context
+      Current.organization_id = nil
     end
 
     private

app/modules/players/jobs/sync_player_job.rb

@@ -10,7 +10,10 @@ class SyncPlayerJob < ApplicationJob
     retry_on RiotApiService::RateLimitError, wait: :polynomially_longer, attempts: 5
     retry_on RiotApiService::RiotApiError, wait: 1.minute, attempts: 3
 
-    def perform(player_id, region = 'BR')
+    def perform(player_id, organization_id, region = 'BR')
+      # Set organization context for multi-tenant scoping
+      Current.organization_id = organization_id
+
       player = Player.find(player_id)
       riot_service = RiotApiService.new
 
@@ -32,6 +35,9 @@ def perform(player_id, region = 'BR')
     rescue StandardError => e
       Rails.logger.error("Failed to sync player #{player.id}: #{e.message}")
       raise
+    ensure
+      # Clean up context
+      Current.organization_id = nil
     end
 
     private

app/modules/scouting/jobs/sync_scouting_target_job.rb

@@ -11,7 +11,10 @@ class SyncScoutingTargetJob < ApplicationJob
     retry_on RiotApiService::RateLimitError, wait: :polynomially_longer, attempts: 5
     retry_on RiotApiService::RiotApiError, wait: 1.minute, attempts: 3
 
-    def perform(scouting_target_id)
+    def perform(scouting_target_id, organization_id)
+      # Set organization context for multi-tenant scoping
+      Current.organization_id = organization_id
+
       target = ScoutingTarget.find(scouting_target_id)
       riot_service = RiotApiService.new
 
@@ -27,6 +30,9 @@ def perform(scouting_target_id)
     rescue StandardError => e
       Rails.logger.error("Failed to sync scouting target #{target.id}: #{e.message}")
       raise
+    ensure
+      # Clean up context
+      Current.organization_id = nil
     end
 
     private

lib/tasks/riot.rake

@@ -98,23 +98,23 @@ namespace :riot do
   task sync_all_players: :environment do
     puts '🔄 Syncing all active players from Riot API...'
 
-    Player.active.find_each do |player|
-      puts "  Syncing #{player.summoner_name} (#{player.id})..."
-      SyncPlayerFromRiotJob.perform_later(player.id)
+    Player.unscoped_by_organization.active.find_each do |player|
+      puts "  Syncing #{player.summoner_name} (#{player.id}) from org #{player.organization_id}..."
+      SyncPlayerFromRiotJob.perform_later(player.id, player.organization_id)
     end
 
-    puts "✅ Queued #{Player.active.count} players for sync!"
+    puts "✅ Queued #{Player.unscoped_by_organization.active.count} players for sync!"
   end
 
   desc 'Sync all scouting targets from Riot API'
   task sync_all_scouting_targets: :environment do
     puts '🔄 Syncing all scouting targets from Riot API...'
 
-    ScoutingTarget.find_each do |target|
-      puts "  Syncing #{target.summoner_name} (#{target.id})..."
-      SyncScoutingTargetJob.perform_later(target.id)
+    ScoutingTarget.unscoped_by_organization.find_each do |target|
+      puts "  Syncing #{target.summoner_name} (#{target.id}) from org #{target.organization_id}..."
+      SyncScoutingTargetJob.perform_later(target.id, target.organization_id)
     end
 
-    puts "✅ Queued #{ScoutingTarget.count} scouting targets for sync!"
+    puts "✅ Queued #{ScoutingTarget.unscoped_by_organization.count} scouting targets for sync!"
   end
 end

spec/jobs/sync_player_from_riot_job_spec.rb

@@ -20,7 +20,7 @@
 
         expect(Rails.logger).to receive(:error).with("Player #{player_no_info.id} missing Riot info")
 
-        described_class.new.perform(player_no_info.id)
+        described_class.new.perform(player_no_info.id, organization.id)
 
         player_no_info.reload
         expect(player_no_info.sync_status).to eq('error')
@@ -34,7 +34,7 @@
 
         expect(Rails.logger).to receive(:error).with('Riot API key not configured')
 
-        described_class.new.perform(player.id)
+        described_class.new.perform(player.id, organization.id)
 
         player.reload
         expect(player.sync_status).to eq('error')
@@ -82,7 +82,7 @@
 
         expect(Rails.logger).to receive(:info).with("Successfully synced player #{player.id} from Riot API")
 
-        job.perform(player.id)
+        job.perform(player.id, organization.id)
 
         player.reload
         expect(player.riot_puuid).to eq('test-puuid-123')
@@ -113,7 +113,7 @@
 
         allow(job).to receive(:fetch_ranked_stats).and_return(ranked_data)
 
-        job.perform(player.id)
+        job.perform(player.id, organization.id)
       end
 
       it 'defaults to BR1 when region is not set' do
@@ -128,7 +128,7 @@
 
         allow(job).to receive(:fetch_ranked_stats).and_return(ranked_data)
 
-        job.perform(player.id)
+        job.perform(player.id, organization.id)
       end
     end
 
@@ -144,7 +144,7 @@
         expect(Rails.logger).to receive(:error).with("Failed to sync player #{player.id}: API Error")
         expect(Rails.logger).to receive(:error).with(anything) # backtrace
 
-        job.perform(player.id)
+        job.perform(player.id, organization.id)
 
         player.reload
         expect(player.sync_status).to eq('error')
@@ -181,7 +181,7 @@
 
         allow(job).to receive(:fetch_ranked_stats).and_return([])
 
-        job.perform(player_with_puuid.id)
+        job.perform(player_with_puuid.id, organization.id)
       end
     end
   end