scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-08 07:21:03 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix queries in group unassignment job after upgrade to Rails 7.2 [SCI-12113]

Browse source
This commit is contained in:
Martin Artnik 2025-07-07 13:02:51 +02:00
parent 9e36f2eeb8
commit 2aa030f6a0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/jobs/user_assignments/project_group_un_assignment_job.rb
View file

@ -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