From a957e2e4422858a80f3194a4ad48123d0088761d Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Mon, 26 Aug 2024 10:54:24 +0200 Subject: [PATCH] Simplify activity queries [SCI-11000] --- app/services/activities_service.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/services/activities_service.rb b/app/services/activities_service.rb index bae2dc325..f0f7a720a 100644 --- a/app/services/activities_service.rb +++ b/app/services/activities_service.rb @@ -5,9 +5,7 @@ class ActivitiesService # Create condition for view permissions checking first visible_teams = user.teams.where(id: teams) visible_projects = Project.viewable_by_user(user, visible_teams) - visible_my_modules = MyModule.joins(:experiment) - .where(experiments: { project_id: visible_projects.select(:id) }) - .viewable_by_user(user, teams) + visible_my_modules = MyModule.viewable_by_user(user, teams) # Temporary solution until handling of deleted subjects is fully implemented visible_repository_teams = visible_teams.with_user_permission(user, RepositoryPermissions::READ) @@ -31,7 +29,7 @@ class ActivitiesService visible_by_protocol_templates = Activity.where( subject_type: Protocol, - subject_id: Protocol.where(team_id: visible_teams.select(:id)).viewable_by_user(user, teams) + subject_id: Protocol.viewable_by_user(user, teams).select(:id) ).order(created_at: :desc) query = Activity.from(