chore: merge organization member db queries #13542
Merged
Conversation
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
c739650 to
b8eb28a
Compare
Merge into 1 that also joins in the user table for username. Required to list organization members on UI/cli
b8eb28a to
4e1d469
Compare
e2b5ca2 to
13ed01d
Compare
13ed01d to
e2b5ca2
Compare
e2b5ca2 to
8b1bc7f
Compare
Emyrk
commented
Jun 12, 2024
Comment on lines
-1479
to
-1485
| func (q *querier) GetOrganizationMemberByUserID(ctx context.Context, arg database.GetOrganizationMemberByUserIDParams) (database.OrganizationMember, error) { | ||
| return fetch(q.log, q.auth, q.db.GetOrganizationMemberByUserID)(ctx, arg) | ||
| } | ||
|
|
||
| func (q *querier) GetOrganizationMembershipsByUserID(ctx context.Context, userID uuid.UUID) ([]database.OrganizationMember, error) { | ||
| return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetOrganizationMembershipsByUserID)(ctx, userID) | ||
| } |
There was a problem hiding this comment.
Removed these, replaced with 1 OrganizationMembers.
Emyrk
commented
Jun 12, 2024
Comment on lines
+320
to
+326
|
|
||
| // Optional override of the default error checks. | ||
| // By default, we search for the expected error strings. | ||
| // If these strings are present, these strings will be searched | ||
| // instead. | ||
| notAuthorizedExpect string | ||
| cancelledCtxExpect string |
There was a problem hiding this comment.
This used to be done with a static list:
coder/coderd/database/dbauthz/setup_test.go
Lines 164 to 167 in e8aa9ac
We should move to this new approach, which is much closer to the actual writing of the tests.
ade54e1 to
b98d06b
Compare
f0ssel
approved these changes
Jun 12, 2024
| AND user_id = $2 | ||
| LIMIT | ||
| 1; | ||
| true |
There was a problem hiding this comment.
just for my understanding, why do we need to do where true and case instead of a where case?
There was a problem hiding this comment.
You are right, we don't need the true and 👍
b98d06b to
2542dcd
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Merge into 1 that also joins in the user table for username.
Required to list organization members on UI/cli