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

Simplify activity queries [SCI-11000]

Browse source
This commit is contained in:
Martin Artnik 2024-08-26 10:54:24 +02:00
parent 74e6d5074e
commit a957e2e442
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/services/activities_service.rb
View file

@ -5,9 +5,7 @@ class ActivitiesService
# Create condition for view permissions checking first # Create condition for view permissions checking first
visible_teams = user.teams.where(id: teams) visible_teams = user.teams.where(id: teams)
visible_projects = Project.viewable_by_user(user, visible_teams) visible_projects = Project.viewable_by_user(user, visible_teams)
visible_my_modules = MyModule.joins(:experiment) visible_my_modules = MyModule.viewable_by_user(user, teams)
.where(experiments: { project_id: visible_projects.select(:id) })
.viewable_by_user(user, teams)
# Temporary solution until handling of deleted subjects is fully implemented # Temporary solution until handling of deleted subjects is fully implemented
visible_repository_teams = visible_teams.with_user_permission(user, RepositoryPermissions::READ) visible_repository_teams = visible_teams.with_user_permission(user, RepositoryPermissions::READ)
@ -31,7 +29,7 @@ class ActivitiesService
visible_by_protocol_templates = visible_by_protocol_templates =
Activity.where( Activity.where(
subject_type: Protocol, 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) ).order(created_at: :desc)
query = Activity.from( query = Activity.from(