fix: Remove duplicate org users #10198
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
Add a constraint that forbids duplicate organization users. There is no need to have multiple entries as the join/leave events are already captured in OrganizationUserAudit.
When joining an organization, we want to reuse the OrganizationUser and reset all necessary fields.
Dschoordsch
commented
Sep 11, 2024
Comment on lines
+80
to
+89
| .onConflict((oc) => | ||
| oc.constraint('unique_org_user').doUpdateSet({ | ||
| joinedAt: sql`CURRENT_TIMESTAMP`, | ||
| removedAt: null, | ||
| inactive: false, | ||
| role: null, | ||
| suggestedTier: null, | ||
| tier: (eb) => eb.ref('excluded.tier') | ||
| }) | ||
| ) |
There was a problem hiding this comment.
I'm mostly concerned with this part. Previously we just created a new org user when a new user joined, but now we have to reset all the old fields that should be reset.
There was a problem hiding this comment.
LGTM! i don't think we use trialStartDate anymore so we can ignore that column.
Dschoordsch
requested review from
mattkrick
and removed request for
nickoferrall
mattkrick
approved these changes
Sep 12, 2024
24 tasks
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.
Description
Fixes #9302
Add a constraint that forbids duplicate organization users. There is no need to have multiple entries as the join/leave events are already captured in OrganizationUserAudit.
Demo
[If possible, please include a screenshot or gif/video, it'll make it easier for reviewers to understand the scope of the changes and how the change is supposed to work. If you're introducing something new or changing the existing patterns, please share a Loom and explain what decisions you've made and under what circumstances]
Testing scenarios
Final checklist