From f56ea9292b6fcd21338f64aa5b41c6ffd22cf8af Mon Sep 17 00:00:00 2001 From: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com> Date: Wed, 2 Jul 2025 17:42:41 +0530 Subject: [PATCH] migration fix (#13156) --- .../licensing/services/count.service.ts | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/server/src/modules/licensing/services/count.service.ts b/server/src/modules/licensing/services/count.service.ts index e807a38393..9c27505113 100644 --- a/server/src/modules/licensing/services/count.service.ts +++ b/server/src/modules/licensing/services/count.service.ts @@ -274,6 +274,29 @@ export class LicenseCountsService implements ILicenseCountsService { manager ); } + async getUserIdWithEndUserRole(manager: EntityManager): Promise { + const statusList = [WORKSPACE_USER_STATUS.INVITED, WORKSPACE_USER_STATUS.ACTIVE]; + + const users = await manager.find(User, { + select: ['id'], + where: { + status: Not(USER_STATUS.ARCHIVED), + organizationUsers: { + status: In(statusList), + }, + userPermissions: { + name: USER_ROLE.END_USER, + organization: { + status: WORKSPACE_STATUS.ACTIVE, + }, + }, + }, + relations: ['organizationUsers', 'userPermissions', 'userPermissions.organization'], + }); + + // Extract unique user IDs + return [...new Set(users.map((user) => user.id))]; + } async fetchTotalAppCount(organizationId: string, manager: EntityManager): Promise { if (getTooljetEdition() !== TOOLJET_EDITIONS.Cloud) {