mirror of
https://github.com/bitwarden/server.git
synced 2025-07-06 10:32:49 -05:00
Resolve the comment regarding abstraction
This commit is contained in:
@ -227,10 +227,28 @@ public class OrganizationUserRepository : Repository<Core.Entities.OrganizationU
|
||||
return await GetCountFromQuery(query);
|
||||
}
|
||||
|
||||
public async Task<int> GetOccupiedSeatCountByOrganizationIdAsync(Guid organizationId)
|
||||
public async Task<OrganizationSeatCounts> GetOccupiedSeatCountByOrganizationIdAsync(Guid organizationId)
|
||||
{
|
||||
var query = new OrganizationUserReadOccupiedSeatCountByOrganizationIdQuery(organizationId);
|
||||
return await GetCountFromQuery(query);
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var users = await dbContext.OrganizationUsers
|
||||
.Where(ou => ou.OrganizationId == organizationId && ou.Status >= 0)
|
||||
.CountAsync();
|
||||
|
||||
var sponsored = await dbContext.OrganizationSponsorships
|
||||
.Where(os => os.SponsoringOrganizationId == organizationId &&
|
||||
os.IsAdminInitiated &&
|
||||
(os.ToDelete == false || (os.ToDelete == true && os.ValidUntil != null && os.ValidUntil > DateTime.UtcNow)) &&
|
||||
(os.SponsoredOrganizationId == null || (os.SponsoredOrganizationId != null && (os.ValidUntil == null || os.ValidUntil > DateTime.UtcNow))))
|
||||
.CountAsync();
|
||||
|
||||
return new OrganizationSeatCounts
|
||||
{
|
||||
Users = users,
|
||||
Sponsored = sponsored
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<int> GetCountByOrganizationIdAsync(Guid organizationId)
|
||||
|
Reference in New Issue
Block a user