From 32b0a2d2fdc4ab4a73bb7a525c6ab211829273ed Mon Sep 17 00:00:00 2001 From: Sven Date: Fri, 23 Jan 2026 12:49:53 -0600 Subject: [PATCH] Update method and parameter names --- .../Controllers/OrganizationUsersController.cs | 2 +- .../Public/Controllers/MembersController.cs | 4 ++-- src/Api/Controllers/CollectionsController.cs | 2 +- .../Repositories/IOrganizationUserRepository.cs | 8 ++++---- src/Core/Repositories/ICollectionRepository.cs | 2 +- .../Repositories/OrganizationUserRepository.cs | 14 +++++++------- .../Repositories/CollectionRepository.cs | 2 +- .../Repositories/OrganizationUserRepository.cs | 12 ++++++------ .../Repositories/CollectionRepository.cs | 2 +- .../OrganizationUsersControllerTests.cs | 2 +- .../Controllers/CollectionsControllerTests.cs | 6 +++--- .../CollectionRepositoryTests.cs | 4 ++-- .../OrganizationUserRepositoryTests.cs | 12 ++++++------ 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs index 90d02a46a1..e52f9b3ba4 100644 --- a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs +++ b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs @@ -155,7 +155,7 @@ public class OrganizationUsersController : BaseAdminConsoleController [Authorize] public async Task Get(Guid orgId, Guid id, bool includeGroups = false) { - var (organizationUser, collections) = await _organizationUserRepository.GetDetailsByIdWithCollectionsAsync(id); + var (organizationUser, collections) = await _organizationUserRepository.GetDetailsByIdWithSharedCollectionsAsync(id); if (organizationUser == null || organizationUser.OrganizationId != orgId) { throw new NotFoundException(); diff --git a/src/Api/AdminConsole/Public/Controllers/MembersController.cs b/src/Api/AdminConsole/Public/Controllers/MembersController.cs index 58e5db18c2..cf4814b406 100644 --- a/src/Api/AdminConsole/Public/Controllers/MembersController.cs +++ b/src/Api/AdminConsole/Public/Controllers/MembersController.cs @@ -70,7 +70,7 @@ public class MembersController : Controller [ProducesResponseType((int)HttpStatusCode.NotFound)] public async Task Get(Guid id) { - var (orgUser, collections) = await _organizationUserRepository.GetDetailsByIdWithCollectionsAsync(id); + var (orgUser, collections) = await _organizationUserRepository.GetDetailsByIdWithSharedCollectionsAsync(id); if (orgUser == null || orgUser.OrganizationId != _currentContext.OrganizationId) { return new NotFoundResult(); @@ -113,7 +113,7 @@ public class MembersController : Controller [ProducesResponseType(typeof(ListResponseModel), (int)HttpStatusCode.OK)] public async Task List() { - var organizationUserUserDetails = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(_currentContext.OrganizationId!.Value, includeCollections: true); + var organizationUserUserDetails = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(_currentContext.OrganizationId!.Value, includeSharedCollections: true); var orgUsersTwoFactorIsEnabled = await _twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(organizationUserUserDetails); var memberResponses = organizationUserUserDetails.Select(u => diff --git a/src/Api/Controllers/CollectionsController.cs b/src/Api/Controllers/CollectionsController.cs index b3542cfde2..a1de65299f 100644 --- a/src/Api/Controllers/CollectionsController.cs +++ b/src/Api/Controllers/CollectionsController.cs @@ -81,7 +81,7 @@ public class CollectionsController : Controller [HttpGet("details")] public async Task> GetManyWithDetails(Guid orgId) { - var allOrgCollections = await _collectionRepository.GetManyByOrganizationIdWithPermissionsAsync( + var allOrgCollections = await _collectionRepository.GetManySharedByOrganizationIdWithPermissionsAsync( orgId, _currentContext.UserId.Value, true); var readAllAuthorized = diff --git a/src/Core/AdminConsole/Repositories/IOrganizationUserRepository.cs b/src/Core/AdminConsole/Repositories/IOrganizationUserRepository.cs index 41622c24b7..583e86ab4d 100644 --- a/src/Core/AdminConsole/Repositories/IOrganizationUserRepository.cs +++ b/src/Core/AdminConsole/Repositories/IOrganizationUserRepository.cs @@ -28,21 +28,21 @@ public interface IOrganizationUserRepository : IRepository /// The id of the OrganizationUser /// A tuple containing the OrganizationUser and its associated collections - Task<(OrganizationUserUserDetails? OrganizationUser, ICollection Collections)> GetDetailsByIdWithCollectionsAsync(Guid id); + Task<(OrganizationUserUserDetails? OrganizationUser, ICollection Collections)> GetDetailsByIdWithSharedCollectionsAsync(Guid id); /// /// Returns the OrganizationUsers and their associated collections (excluding DefaultUserCollections). /// /// The id of the organization /// Whether to include groups - /// Whether to include collections + /// Whether to include shared collections /// A list of OrganizationUserUserDetails - Task> GetManyDetailsByOrganizationAsync(Guid organizationId, bool includeGroups = false, bool includeCollections = false); + Task> GetManyDetailsByOrganizationAsync(Guid organizationId, bool includeGroups = false, bool includeSharedCollections = false); /// /// /// This method is optimized for performance. /// Reduces database round trips by fetching all data in fewer queries. /// - Task> GetManyDetailsByOrganizationAsync_vNext(Guid organizationId, bool includeGroups = false, bool includeCollections = false); + Task> GetManyDetailsByOrganizationAsync_vNext(Guid organizationId, bool includeGroups = false, bool includeSharedCollections = false); Task> GetManyDetailsByUserAsync(Guid userId, OrganizationUserStatusType? status = null); Task GetDetailsByUserAsync(Guid userId, Guid organizationId, diff --git a/src/Core/Repositories/ICollectionRepository.cs b/src/Core/Repositories/ICollectionRepository.cs index 3f3b71d2d5..2db809e3de 100644 --- a/src/Core/Repositories/ICollectionRepository.cs +++ b/src/Core/Repositories/ICollectionRepository.cs @@ -45,7 +45,7 @@ public interface ICollectionRepository : IRepository /// Optionally, you can include access relationships for other Groups/Users and the collections. /// Excludes default collections (My Items collections) - used by Admin Console Collections tab. /// - Task> GetManyByOrganizationIdWithPermissionsAsync(Guid organizationId, Guid userId, bool includeAccessRelationships); + Task> GetManySharedByOrganizationIdWithPermissionsAsync(Guid organizationId, Guid userId, bool includeAccessRelationships); /// /// Returns the collection by Id, including permission info for the specified user. diff --git a/src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs index 09cf6bf680..ff2488d084 100644 --- a/src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs +++ b/src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs @@ -187,7 +187,7 @@ public class OrganizationUserRepository : Repository, IO return results.SingleOrDefault(); } } - public async Task<(OrganizationUserUserDetails? OrganizationUser, ICollection Collections)> GetDetailsByIdWithCollectionsAsync(Guid id) + public async Task<(OrganizationUserUserDetails? OrganizationUser, ICollection Collections)> GetDetailsByIdWithSharedCollectionsAsync(Guid id) { using (var connection = new SqlConnection(ConnectionString)) { @@ -202,7 +202,7 @@ public class OrganizationUserRepository : Repository, IO } } - public async Task> GetManyDetailsByOrganizationAsync(Guid organizationId, bool includeGroups, bool includeCollections) + public async Task> GetManyDetailsByOrganizationAsync(Guid organizationId, bool includeGroups, bool includeSharedCollections) { using (var connection = new SqlConnection(ConnectionString)) { @@ -216,7 +216,7 @@ public class OrganizationUserRepository : Repository, IO var users = results.ToList(); - if (!includeCollections && !includeGroups) + if (!includeSharedCollections && !includeGroups) { return users; } @@ -231,7 +231,7 @@ public class OrganizationUserRepository : Repository, IO commandType: CommandType.StoredProcedure)).GroupBy(u => u.OrganizationUserId).ToList(); } - if (includeCollections) + if (includeSharedCollections) { userCollections = (await connection.QueryAsync( "[dbo].[CollectionUser_ReadSharedCollectionsByOrganizationUserIds]", @@ -267,7 +267,7 @@ public class OrganizationUserRepository : Repository, IO } } - public async Task> GetManyDetailsByOrganizationAsync_vNext(Guid organizationId, bool includeGroups, bool includeCollections) + public async Task> GetManyDetailsByOrganizationAsync_vNext(Guid organizationId, bool includeGroups, bool includeSharedCollections) { using (var connection = new SqlConnection(ConnectionString)) { @@ -278,7 +278,7 @@ public class OrganizationUserRepository : Repository, IO { OrganizationId = organizationId, IncludeGroups = includeGroups, - IncludeCollections = includeCollections + IncludeCollections = includeSharedCollections }, commandType: CommandType.StoredProcedure); @@ -297,7 +297,7 @@ public class OrganizationUserRepository : Repository, IO // Read collection associations (third result set, if requested) Dictionary>? userCollectionMap = null; - if (includeCollections) + if (includeSharedCollections) { var collectionUsers = await results.ReadAsync(); userCollectionMap = collectionUsers diff --git a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs index 5391638aeb..52a590df9e 100644 --- a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs +++ b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs @@ -153,7 +153,7 @@ public class CollectionRepository : Repository, ICollectionRep } } - public async Task> GetManyByOrganizationIdWithPermissionsAsync(Guid organizationId, Guid userId, bool includeAccessRelationships) + public async Task> GetManySharedByOrganizationIdWithPermissionsAsync(Guid organizationId, Guid userId, bool includeAccessRelationships) { using (var connection = new SqlConnection(ConnectionString)) { diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs index ae55099775..56fc72eb57 100644 --- a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs @@ -350,7 +350,7 @@ public class OrganizationUserRepository : Repository Collections)> GetDetailsByIdWithCollectionsAsync(Guid id) + public async Task<(OrganizationUserUserDetails? OrganizationUser, ICollection Collections)> GetDetailsByIdWithSharedCollectionsAsync(Guid id) { var organizationUserUserDetails = await GetDetailsByIdAsync(id); using (var scope = ServiceScopeFactory.CreateScope()) @@ -438,7 +438,7 @@ public class OrganizationUserRepository : Repository> GetManyDetailsByOrganizationAsync(Guid organizationId, bool includeGroups, bool includeCollections) + public async Task> GetManyDetailsByOrganizationAsync(Guid organizationId, bool includeGroups, bool includeSharedCollections) { using (var scope = ServiceScopeFactory.CreateScope()) { @@ -448,7 +448,7 @@ public class OrganizationUserRepository : Repository g.OrganizationUserId).ToList(); } - if (includeCollections) + if (includeSharedCollections) { collections = (await (from cu in dbContext.CollectionUsers join ou in userIdEntities on cu.OrganizationUserId equals ou.Id @@ -506,7 +506,7 @@ public class OrganizationUserRepository : Repository> GetManyDetailsByOrganizationAsync_vNext( - Guid organizationId, bool includeGroups, bool includeCollections) + Guid organizationId, bool includeGroups, bool includeSharedCollections) { using var scope = ServiceScopeFactory.CreateScope(); var dbContext = GetDatabaseContext(scope); @@ -541,7 +541,7 @@ public class OrganizationUserRepository : Repository gu.GroupId).ToList() : new List(), - Collections = includeCollections + Collections = includeSharedCollections ? ou.CollectionUsers .Where(cu => cu.Collection.Type == CollectionType.SharedCollection) .Select(cu => new CollectionAccessSelection diff --git a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs index 74150246b1..141928b78a 100644 --- a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs +++ b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs @@ -303,7 +303,7 @@ public class CollectionRepository : Repository> GetManyByOrganizationIdWithPermissionsAsync( + public async Task> GetManySharedByOrganizationIdWithPermissionsAsync( Guid organizationId, Guid userId, bool includeAccessRelationships) { using (var scope = ServiceScopeFactory.CreateScope()) diff --git a/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs index 43f0123a3f..419a84e94c 100644 --- a/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs +++ b/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs @@ -261,7 +261,7 @@ public class OrganizationUsersControllerTests .Returns(true); sutProvider.GetDependency() - .GetDetailsByIdWithCollectionsAsync(organizationUser.Id) + .GetDetailsByIdWithSharedCollectionsAsync(organizationUser.Id) .Returns((organizationUser, collections)); sutProvider.GetDependency() diff --git a/test/Api.Test/Controllers/CollectionsControllerTests.cs b/test/Api.Test/Controllers/CollectionsControllerTests.cs index 33b7e20327..c345e3602f 100644 --- a/test/Api.Test/Controllers/CollectionsControllerTests.cs +++ b/test/Api.Test/Controllers/CollectionsControllerTests.cs @@ -107,7 +107,7 @@ public class CollectionsControllerTests await sutProvider.Sut.GetManyWithDetails(organization.Id); - await sutProvider.GetDependency().Received(1).GetManyByOrganizationIdWithPermissionsAsync(organization.Id, userId, true); + await sutProvider.GetDependency().Received(1).GetManySharedByOrganizationIdWithPermissionsAsync(organization.Id, userId, true); } [Theory, BitAutoData] @@ -143,12 +143,12 @@ public class CollectionsControllerTests .Returns(AuthorizationResult.Success()); sutProvider.GetDependency() - .GetManyByOrganizationIdWithPermissionsAsync(organization.Id, userId, true) + .GetManySharedByOrganizationIdWithPermissionsAsync(organization.Id, userId, true) .Returns(collections); var response = await sutProvider.Sut.GetManyWithDetails(organization.Id); - await sutProvider.GetDependency().Received(1).GetManyByOrganizationIdWithPermissionsAsync(organization.Id, userId, true); + await sutProvider.GetDependency().Received(1).GetManySharedByOrganizationIdWithPermissionsAsync(organization.Id, userId, true); Assert.Single(response.Data); Assert.All(response.Data, c => Assert.Equal(organization.Id, c.OrganizationId)); Assert.All(response.Data, c => Assert.Equal(managedCollection.Id, c.Id)); diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryTests.cs index 79a96eeaeb..0f8feb4a6a 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryTests.cs @@ -312,7 +312,7 @@ public class CollectionRepositoryTests } }); - var collections = await collectionRepository.GetManyByOrganizationIdWithPermissionsAsync(organization.Id, user.Id, true); + var collections = await collectionRepository.GetManySharedByOrganizationIdWithPermissionsAsync(organization.Id, user.Id, true); Assert.NotNull(collections); @@ -442,7 +442,7 @@ public class CollectionRepositoryTests } }, null); - var collections = await collectionRepository.GetManyByOrganizationIdWithPermissionsAsync(organization.Id, user.Id, true); + var collections = await collectionRepository.GetManySharedByOrganizationIdWithPermissionsAsync(organization.Id, user.Id, true); Assert.NotNull(collections); diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs index b77406abf5..aa98ce2a7a 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs @@ -430,7 +430,7 @@ public class OrganizationUserRepositoryTests // Get organization users with collections included var organizationUsers = await organizationUserRepository.GetManyDetailsByOrganizationAsync( - organization.Id, includeGroups: false, includeCollections: true); + organization.Id, includeGroups: false, includeSharedCollections: true); Assert.NotNull(organizationUsers); Assert.Single(organizationUsers); @@ -835,7 +835,7 @@ public class OrganizationUserRepositoryTests await organizationUserRepository.CreateManyAsync(orgUserCollection); - var orgUser1 = await organizationUserRepository.GetDetailsByIdWithCollectionsAsync(orgUserCollection[0].OrganizationUser.Id); + var orgUser1 = await organizationUserRepository.GetDetailsByIdWithSharedCollectionsAsync(orgUserCollection[0].OrganizationUser.Id); var group1Database = await groupRepository.GetManyIdsByUserIdAsync(orgUserCollection[0].OrganizationUser.Id); Assert.Equal(orgUserCollection[0].OrganizationUser.Id, orgUser1.OrganizationUser.Id); @@ -846,13 +846,13 @@ public class OrganizationUserRepositoryTests Assert.Equal(group1.Id, group1Database.First()); - var orgUser2 = await organizationUserRepository.GetDetailsByIdWithCollectionsAsync(orgUserCollection[1].OrganizationUser.Id); + var orgUser2 = await organizationUserRepository.GetDetailsByIdWithSharedCollectionsAsync(orgUserCollection[1].OrganizationUser.Id); var group2Database = await groupRepository.GetManyIdsByUserIdAsync(orgUserCollection[1].OrganizationUser.Id); Assert.Equal(orgUserCollection[1].OrganizationUser.Id, orgUser2.OrganizationUser.Id); Assert.Equal(collection2.Id, orgUser2.Collections.First().Id); Assert.Equal(group2.Id, group2Database.First()); - var orgUser3 = await organizationUserRepository.GetDetailsByIdWithCollectionsAsync(orgUserCollection[2].OrganizationUser.Id); + var orgUser3 = await organizationUserRepository.GetDetailsByIdWithSharedCollectionsAsync(orgUserCollection[2].OrganizationUser.Id); var group3Database = await groupRepository.GetManyIdsByUserIdAsync(orgUserCollection[2].OrganizationUser.Id); Assert.Equal(orgUserCollection[2].OrganizationUser.Id, orgUser3.OrganizationUser.Id); Assert.Equal(collection3.Id, orgUser3.Collections.First().Id); @@ -928,7 +928,7 @@ public class OrganizationUserRepositoryTests AccessSecretsManager = true }); - var responseModel = await organizationUserRepository.GetManyDetailsByOrganizationAsync_vNext(organization.Id, includeGroups: false, includeCollections: false); + var responseModel = await organizationUserRepository.GetManyDetailsByOrganizationAsync_vNext(organization.Id, includeGroups: false, includeSharedCollections: false); Assert.NotNull(responseModel); Assert.Equal(2, responseModel.Count); @@ -1083,7 +1083,7 @@ public class OrganizationUserRepositoryTests await organizationUserRepository.CreateManyAsync(createOrgUserWithCollections); - var responseModel = await organizationUserRepository.GetManyDetailsByOrganizationAsync_vNext(organization.Id, includeGroups: true, includeCollections: true); + var responseModel = await organizationUserRepository.GetManyDetailsByOrganizationAsync_vNext(organization.Id, includeGroups: true, includeSharedCollections: true); Assert.NotNull(responseModel); Assert.Single(responseModel);