Improve isolation segments performance #2449
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
IsolationSegmentsController.index does the same, i.e. it uses readable_org_guids. This calls org_guids_for_roles with ROLES_FOR_ORG_READING which contains ORG_USER.
Instead of first fetching the isolation segment and then checking permissions, do everything at once, i.e. include readable_org_guids in the where condition.
- Remove a test that only worked due to mocking a response that would not have been returned otherwise. - Add (optional) spaces parameter to stub_readable_org_guids_for; all parent orgs are readable as well.
philippthun
force-pushed
the
improve-isolation-segments-performance
branch
from
1981605
to
6fafaf4
Compare
- Include subquery for readable org guids in where condition instead of list of guids. - Do the same for readable (supporter) space guids. - Revert changes done in UserHelpers (allow_user_read_access_for and stub_readable_org_guids_for). - Don't mock Permissions completely; original _query methods are required. - Use set_current_user_as_role in tests instead of mocking multiple permission checks.
|
LGTM! Thanks for the PR! @tjvman: I did some basic acceptance to ensure reading from roles such as SpaceDeveloper still worked. Also confirmed that this change 09dd987 is not an issue as you cannot add a user as a SpaceDeveloper unless you add them as an OrgUser (or above) and you cannot remove the OrgUser role if the user has Space roles still active. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improve performance of isolation segments endpoints by removing unnecessary calls (
can_read_from_space?) and combining the loading of data with the permissions check.Please also see the commit messages.
I have reviewed the contributing guide
I have viewed, signed, and submitted the Contributor License Agreement
I have made this pull request to the
mainbranchI have run all the unit tests using
bundle exec rakeI have run CF Acceptance Tests