Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix (#12681)

Browse source
This commit is contained in:
Rudhra Deep Biswas 2025-04-23 16:43:47 +05:30 committed by GitHub
parent 7995d967e0
commit 848f43ada0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/src/modules/licensing/services/count.service.ts
View file

@ -91,18 +91,20 @@ export class LicenseCountsService implements ILicenseCountsService {
async getUsersCount(isOnlyActive?: boolean, manager?: EntityManager): Promise<number> {
return await dbTransactionWrap(async (manager: EntityManager) => {
const statusList = [USER_STATUS.INVITED, USER_STATUS.ACTIVE];
const userStatusList = [USER_STATUS.INVITED, USER_STATUS.ACTIVE];
const organizationStatusList = [WORKSPACE_STATUS.ACTIVE];
if (!isOnlyActive) {
statusList.push(USER_STATUS.ARCHIVED);
userStatusList.push(USER_STATUS.ARCHIVED);
organizationStatusList.push(WORKSPACE_STATUS.ARCHIVE);
}
const userIdsWithoutNonActiveSuperadmins = (
await this.userRepository.getUsers(
{
status: In(userStatusList), // Apply status filter directly to users
organizationUsers: {
status: In(statusList),
status: In(userStatusList),
organization: {
status: In(organizationStatusList),
},
@ -114,6 +116,7 @@ export class LicenseCountsService implements ILicenseCountsService {
manager
)
).map((record) => record.id);
const userIdsOfSuperAdmins = await this.#fetchSuperAdminIds(manager);
const ids = [...new Set([...userIdsWithoutNonActiveSuperadmins, ...userIdsOfSuperAdmins])];