Skip to content

use relation org.plans instead of method, which works faster and more correct #2726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briri merged 7 commits into from
Dec 8, 2020
Merged

use relation org.plans instead of method, which works faster and more correct #2726

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d17654
use relation org.plans instead of method, which works faster and more…
nicolasfranck Nov 16, 2020
e419c95
Merge branch 'development' into fix_issue_2724
briri Nov 19, 2020
3243a20
Merge branch 'development' into fix_issue_2724
xsrust Nov 24, 2020
d773fc9
Merge branch 'development' into fix_issue_2724
briri Nov 25, 2020
31571bc
Revert "use relation org.plans instead of method, which works faster …
nicolasfranck Dec 3, 2020
09c5095
cache org.plans for now to speed up page load (for now)
nicolasfranck Dec 3, 2020
47c26e3
Merge branch 'development' into fix_issue_2724
briri Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions app/models/org.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,13 @@ def org_admins
end

def plans
plan_ids = Role.administrator
.where(user_id: users.pluck(:id), active: true)
.pluck(:plan_id).uniq
Plan.includes(:template, :phases, :roles, :users)
.where(id: plan_ids)
Rails.cache.fetch("org[#{id}].plans", expires_in: 2.seconds) do
Copy link
Contributor

@briri briri Dec 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I think this approach can be useful elsewhere as well.

plan_ids = Role.administrator
.where(user_id: users.pluck(:id), active: true)
.pluck(:plan_id).uniq
Plan.includes(:template, :phases, :roles, :users)
.where(id: plan_ids)
end
end

def grant_api!(token_permission_type)
Expand Down