diff --git a/app/jobs/user_assignments/project_group_un_assignment_job.rb b/app/jobs/user_assignments/project_group_un_assignment_job.rb index d3be08aee..d9fe09e35 100644 --- a/app/jobs/user_assignments/project_group_un_assignment_job.rb +++ b/app/jobs/user_assignments/project_group_un_assignment_job.rb @@ -18,7 +18,7 @@ module UserAssignments def remove_users_from_experiments(project, users) experiments = project.experiments.joins(:user_assignments).where(user_assignments: { user: users }) # rubocop:disable Rails/SkipsModelValidations - UserAssignment.where(assignable_type: 'Experiment', assignable_id: experiments, user: users).delete_all + UserAssignment.where(assignable_type: 'Experiment', assignable_id: experiments.select(:id), user: users).delete_all experiments.update_all(updated_at: Time.current) # rubocop:enable Rails/SkipsModelValidations end @@ -26,10 +26,10 @@ module UserAssignments def remove_users_from_my_modules(project, users) my_modules = MyModule.joins(:user_assignments, experiment: :project) .where(user_assignments: { user: users }) - .where(projects: project) + .where(projects: { id: project.id }) # rubocop:disable Rails/SkipsModelValidations - UserMyModule.where(user: users, my_module: my_modules).delete_all # remove designated users - UserAssignment.where(assignable_type: 'MyModule', assignable_id: my_modules, user: users).delete_all + UserMyModule.where(user: users, my_module_id: my_modules.select(:id)).delete_all # remove designated users + UserAssignment.where(assignable_type: 'MyModule', assignable_id: my_modules.select(:id), user: users).delete_all my_modules.update_all(updated_at: Time.current) # rubocop:enable Rails/SkipsModelValidations end