-
Notifications
You must be signed in to change notification settings - Fork 1.6k
[PM-34147] Add GetManyConfirmedAcceptedDetailsByUserAsync to IOrganizationUserRepository #7399
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.
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
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5f6e6be
[PM-34147] Add GetManyConfirmedAndAcceptedDetailsByUserAsync to IOrgaβ¦
JimmyVo16 7ceb07e
[PM-34147] Add database integration tests.
JimmyVo16 ace1ef4
[PM-34147] Address code reviews.
JimmyVo16 3b86f20
Merge branch 'main' into ac/pm-34147/add-sprocs-for-accepted-users
JimmyVo16 e83678a
[PM-34147] Fix lint issues
JimmyVo16 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
14 changes: 14 additions & 0 deletions
14
...o/Stored Procedures/OrganizationUserOrganizationDetails_ReadAcceptedConfirmedByUserId.sql
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| CREATE PROCEDURE [dbo].[OrganizationUserOrganizationDetails_ReadAcceptedConfirmedByUserId] | ||
| @UserId UNIQUEIDENTIFIER | ||
| AS | ||
| BEGIN | ||
| SET NOCOUNT ON | ||
|
|
||
| SELECT | ||
| * | ||
| FROM | ||
| [dbo].[OrganizationUserOrganizationDetailsView] | ||
| WHERE | ||
| [UserId] = @UserId | ||
| AND [Status] IN (1, 2) -- Accepted = 1, Confirmed = 2 | ||
| END |
157 changes: 157 additions & 0 deletions
157
...epositories/OrganizationUserRepository/GetManyConfirmedAcceptedDetailsByUserAsyncTests.cs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| ο»Ώusing Bit.Core.Enums; | ||
| using Bit.Core.Repositories; | ||
| using Xunit; | ||
|
|
||
| namespace Bit.Infrastructure.IntegrationTest.AdminConsole.Repositories.OrganizationUserRepository; | ||
|
|
||
| public class GetManyConfirmedAcceptedDetailsByUserAsyncTests | ||
| { | ||
| [Theory, DatabaseData] | ||
| public async Task ReturnsDetails_WhenUserIsConfirmed( | ||
| IUserRepository userRepository, | ||
| IOrganizationRepository organizationRepository, | ||
| IOrganizationUserRepository organizationUserRepository) | ||
| { | ||
| // Arrange | ||
| var user = await userRepository.CreateTestUserAsync(); | ||
| var organization = await organizationRepository.CreateTestOrganizationAsync(); | ||
| await organizationUserRepository.CreateConfirmedTestOrganizationUserAsync(organization, user); | ||
|
|
||
| // Act | ||
| var results = await organizationUserRepository.GetManyConfirmedAcceptedDetailsByUserAsync(user.Id); | ||
|
|
||
| // Assert | ||
| Assert.Single(results); | ||
| var result = results.Single(); | ||
| Assert.Equal(organization.Id, result.OrganizationId); | ||
| Assert.Equal(user.Id, result.UserId); | ||
| Assert.Equal(OrganizationUserStatusType.Confirmed, result.Status); | ||
|
|
||
| // Annul | ||
| await organizationRepository.DeleteAsync(organization); | ||
| await userRepository.DeleteAsync(user); | ||
| } | ||
|
|
||
| [Theory, DatabaseData] | ||
| public async Task ReturnsDetails_WhenUserIsAccepted( | ||
| IUserRepository userRepository, | ||
| IOrganizationRepository organizationRepository, | ||
| IOrganizationUserRepository organizationUserRepository) | ||
| { | ||
| // Arrange | ||
| var user = await userRepository.CreateTestUserAsync(); | ||
| var organization = await organizationRepository.CreateTestOrganizationAsync(); | ||
| await organizationUserRepository.CreateAcceptedTestOrganizationUserAsync(organization, user); | ||
|
|
||
| // Act | ||
| var results = await organizationUserRepository.GetManyConfirmedAcceptedDetailsByUserAsync(user.Id); | ||
|
|
||
| // Assert | ||
| Assert.Single(results); | ||
| var result = results.Single(); | ||
| Assert.Equal(organization.Id, result.OrganizationId); | ||
| Assert.Equal(user.Id, result.UserId); | ||
| Assert.Equal(OrganizationUserStatusType.Accepted, result.Status); | ||
|
|
||
| // Annul | ||
| await organizationRepository.DeleteAsync(organization); | ||
| await userRepository.DeleteAsync(user); | ||
| } | ||
|
|
||
| [Theory, DatabaseData] | ||
| public async Task ReturnsDetailsAcrossMultipleOrganizations_WhenUserIsConfirmedOrAccepted( | ||
| IUserRepository userRepository, | ||
| IOrganizationRepository organizationRepository, | ||
| IOrganizationUserRepository organizationUserRepository) | ||
| { | ||
| // Arrange | ||
| var user = await userRepository.CreateTestUserAsync(); | ||
|
|
||
| var confirmedOrg = await organizationRepository.CreateTestOrganizationAsync(); | ||
| await organizationUserRepository.CreateConfirmedTestOrganizationUserAsync(confirmedOrg, user); | ||
|
|
||
| var acceptedOrg = await organizationRepository.CreateTestOrganizationAsync(); | ||
| await organizationUserRepository.CreateAcceptedTestOrganizationUserAsync(acceptedOrg, user); | ||
|
|
||
| // Act | ||
| var results = await organizationUserRepository.GetManyConfirmedAcceptedDetailsByUserAsync(user.Id); | ||
|
|
||
| // Assert | ||
| Assert.Equal(2, results.Count); | ||
| Assert.Contains(results, r => r.OrganizationId == confirmedOrg.Id && r.Status == OrganizationUserStatusType.Confirmed); | ||
| Assert.Contains(results, r => r.OrganizationId == acceptedOrg.Id && r.Status == OrganizationUserStatusType.Accepted); | ||
|
|
||
| // Annul | ||
| await organizationRepository.DeleteAsync(confirmedOrg); | ||
| await organizationRepository.DeleteAsync(acceptedOrg); | ||
| await userRepository.DeleteAsync(user); | ||
| } | ||
|
|
||
| [Theory, DatabaseData] | ||
| public async Task DoesNotReturnDetails_WhenUserIsInvited( | ||
| IUserRepository userRepository, | ||
| IOrganizationRepository organizationRepository, | ||
| IOrganizationUserRepository organizationUserRepository) | ||
| { | ||
| // Arrange | ||
| var user = await userRepository.CreateTestUserAsync(); | ||
| var organization = await organizationRepository.CreateTestOrganizationAsync(); | ||
| await organizationUserRepository.CreateTestOrganizationUserInviteAsync(organization); | ||
|
|
||
| // Act | ||
| var results = await organizationUserRepository.GetManyConfirmedAcceptedDetailsByUserAsync(user.Id); | ||
|
|
||
| // Assert | ||
| Assert.DoesNotContain(results, r => r.OrganizationId == organization.Id); | ||
|
|
||
| // Annul | ||
| await organizationRepository.DeleteAsync(organization); | ||
| await userRepository.DeleteAsync(user); | ||
| } | ||
|
|
||
| [Theory, DatabaseData] | ||
| public async Task DoesNotReturnDetails_WhenUserIsRevoked( | ||
| IUserRepository userRepository, | ||
| IOrganizationRepository organizationRepository, | ||
| IOrganizationUserRepository organizationUserRepository) | ||
| { | ||
| // Arrange | ||
| var user = await userRepository.CreateTestUserAsync(); | ||
| var organization = await organizationRepository.CreateTestOrganizationAsync(); | ||
| await organizationUserRepository.CreateRevokedTestOrganizationUserAsync(organization, user); | ||
|
|
||
| // Act | ||
| var results = await organizationUserRepository.GetManyConfirmedAcceptedDetailsByUserAsync(user.Id); | ||
|
|
||
| // Assert | ||
| Assert.DoesNotContain(results, r => r.OrganizationId == organization.Id); | ||
|
|
||
| // Annul | ||
| await organizationRepository.DeleteAsync(organization); | ||
| await userRepository.DeleteAsync(user); | ||
| } | ||
|
|
||
| [Theory, DatabaseData] | ||
| public async Task DoesNotReturnDetails_ForOtherUsers( | ||
| IUserRepository userRepository, | ||
| IOrganizationRepository organizationRepository, | ||
| IOrganizationUserRepository organizationUserRepository) | ||
| { | ||
| // Arrange | ||
| var targetUser = await userRepository.CreateTestUserAsync(); | ||
| var otherUser = await userRepository.CreateTestUserAsync(); | ||
|
|
||
| var organization = await organizationRepository.CreateTestOrganizationAsync(); | ||
| await organizationUserRepository.CreateConfirmedTestOrganizationUserAsync(organization, otherUser); | ||
|
|
||
| // Act | ||
| var results = await organizationUserRepository.GetManyConfirmedAcceptedDetailsByUserAsync(targetUser.Id); | ||
|
|
||
| // Assert | ||
| Assert.DoesNotContain(results, r => r.OrganizationId == organization.Id); | ||
|
|
||
| // Annul | ||
| await organizationRepository.DeleteAsync(organization); | ||
| await userRepository.DeleteManyAsync([targetUser, otherUser]); | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
...ts/2026-04-06_00_AddOrganizationUserOrganizationDetails_ReadAcceptedConfirmedByUserId.sql
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| CREATE OR ALTER PROCEDURE [dbo].[OrganizationUserOrganizationDetails_ReadAcceptedConfirmedByUserId] | ||
| @UserId UNIQUEIDENTIFIER | ||
| AS | ||
| BEGIN | ||
| SET NOCOUNT ON | ||
|
|
||
| SELECT | ||
| * | ||
| FROM | ||
| [dbo].[OrganizationUserOrganizationDetailsView] | ||
| WHERE | ||
| [UserId] = @UserId | ||
| AND [Status] IN (1,2) -- 1 = Accepted, 2 = Confirmed | ||
| END | ||
| GO |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isnβt related to my PR, but itβs dead code and not being used. It was introduced about five years ago. Since AC owns this code now, I think we should remove it.