fix(data): remove redundant user query in FindByOrg#2946
Merged
matiasinsaurralde merged 1 commit intoMar 31, 2026
Merged
Conversation
Memberships were already loaded with .WithUser(), so the subsequent User.Query() call fetched the same data a second time. Remove the dead code and rely on the eager-loaded edges directly. Signed-off-by: Matías Insaurralde <matias@chainloop.dev>
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
jiparis
approved these changes
Mar 30, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
FindByOrgwas issuing a secondUser.Query()to fetch user data that had already been loaded via.WithUser()in the initial membership query. The extra round-trip and manual map-building were dead code —entMembershipToBizalready populatesUserfromm.Edges.User.Removed the redundant query and simplified the function to return
entMembershipsToBiz(memberships)directly.Added explicit
User != nilassertions toTestByOrgto lock in the behavior.