From 848f43ada05605aa4854859001f11ef939d4a0ed Mon Sep 17 00:00:00 2001
From: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com>
Date: Wed, 23 Apr 2025 16:43:47 +0530
Subject: [PATCH] fix (#12681)

---
 server/src/modules/licensing/services/count.service.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/src/modules/licensing/services/count.service.ts b/server/src/modules/licensing/services/count.service.ts
index 3c1abf4ee5..d41c5f4a2e 100644
--- a/server/src/modules/licensing/services/count.service.ts
+++ b/server/src/modules/licensing/services/count.service.ts
@@ -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])];