Merge pull request #4563 from okriuchykhin/ok_SCI_7360_v2

Fix typo in update team assignments service, improve shared inventories migration [SCI-7360]

app/jobs/user_assignments/remove_team_user_assignments_job.rb

@@ -4,9 +4,9 @@ module UserAssignments
   class RemoveTeamUserAssignmentsJob < ApplicationJob
     queue_as :high_priority
 
-    def perform(user, team)
+    def perform(team_user_assignment)
       ActiveRecord::Base.transaction do
-        RemoveTeamUserAssignmentsService.new(user, team).call
+        RemoveTeamUserAssignmentsService.new(team_user_assignment).call
       end
     end
   end

app/jobs/user_assignments/update_team_user_assignments_job.rb

@@ -4,9 +4,9 @@ module UserAssignments
   class UpdateTeamUserAssignmentsJob < ApplicationJob
     queue_as :high_priority
 
-    def perform(user, team, user_role)
+    def perform(team_user_assignment)
       ActiveRecord::Base.transaction do
-        UpdateTeamUserAssignmentsService.new(user, team, user_role).call
+        UpdateTeamUserAssignmentsService.new(team_user_assignment).call
       end
     end
   end

app/services/user_assignments/update_team_user_assignments_service.rb

@@ -5,7 +5,7 @@ module UserAssignments
     def initialize(team_user_assignment)
       @user = team_user_assignment.user
       @team = team_user_assignment.assignable
-      @user_role = user_role
+      @user_role = team_user_assignment.user_role
     end
 
     def call

db/migrate/20220624091046_migrate_shared_repositories_to_user_assignments.rb

@@ -12,6 +12,8 @@ class MigrateSharedRepositoriesToUserAssignments < ActiveRecord::Migration[6.1]
     TeamRepository.where(permission_level: %i(shared_read shared_write))
                   .preload(:team, :repository)
                   .find_each do |team_repository|
+      next if team_repository.repository.blank?
+
       team_repository.team
                      .user_assignments
                      .preload(:user, :user_role)