From a9e7e81e51e4101cddc680fd5ab7e6961f9008da Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 21 Oct 2022 14:04:33 +0200 Subject: [PATCH] Fix typo in update team assignments service, improve shared inventories migration [SCI-7360] --- app/jobs/user_assignments/remove_team_user_assignments_job.rb | 4 ++-- app/jobs/user_assignments/update_team_user_assignments_job.rb | 4 ++-- .../user_assignments/update_team_user_assignments_service.rb | 2 +- ...4091046_migrate_shared_repositories_to_user_assignments.rb | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/jobs/user_assignments/remove_team_user_assignments_job.rb b/app/jobs/user_assignments/remove_team_user_assignments_job.rb index 8aee0a70a..582d6598d 100644 --- a/app/jobs/user_assignments/remove_team_user_assignments_job.rb +++ b/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 diff --git a/app/jobs/user_assignments/update_team_user_assignments_job.rb b/app/jobs/user_assignments/update_team_user_assignments_job.rb index 3c5c0dcb3..431a033b6 100644 --- a/app/jobs/user_assignments/update_team_user_assignments_job.rb +++ b/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 diff --git a/app/services/user_assignments/update_team_user_assignments_service.rb b/app/services/user_assignments/update_team_user_assignments_service.rb index 631110707..63b69fb7a 100644 --- a/app/services/user_assignments/update_team_user_assignments_service.rb +++ b/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 diff --git a/db/migrate/20220624091046_migrate_shared_repositories_to_user_assignments.rb b/db/migrate/20220624091046_migrate_shared_repositories_to_user_assignments.rb index 4ed946f7d..b77649ad6 100644 --- a/db/migrate/20220624091046_migrate_shared_repositories_to_user_assignments.rb +++ b/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)