Move to RoleService and add tests

packages/cli/src/services/role.service.ts

@@ -100,4 +100,22 @@ export class RoleService {
 			})
 			.then((shared) => shared?.role);
 	}
+
+	/**
+	 * Counts the number of users in each role, e.g. `{ admin: 2, member: 6, owner: 1 }`
+	 */
+	async countUsersByRole() {
+		const result: Array<{ role_name: string; count: number }> = await this.roleRepository
+			.createQueryBuilder('role')
+			.select('role.name')
+			.addSelect('COUNT(user.id)', 'count')
+			.innerJoin('user', 'user', 'role.id = user.globalRoleId')
+			.groupBy('role.name')
+			.getRawMany();
+
+		return result.reduce<Record<string, number>>((acc, item) => {
+			acc[item.role_name] = item.count;
+			return acc;
+		}, {});
+	}
 }

packages/cli/src/services/user.service.ts

@@ -308,22 +308,4 @@ export class UserService {
 
 		return { usersInvited, usersCreated: toCreateUsers.map(({ email }) => email) };
 	}
-
-	/**
-	 * Counts the number of users in each role, e.g. `{ admin: 2, member: 6, owner: 1 }`
-	 */
-	async countUsersByRole() {
-		const result: Array<{ role_name: string; count: number }> = await Container.get(RoleRepository)
-			.createQueryBuilder('role')
-			.select('role.name')
-			.addSelect('COUNT(user.id)', 'count')
-			.innerJoin('user', 'user', 'role.id = user.globalRoleId')
-			.groupBy('role.name')
-			.getRawMany();
-
-		return result.reduce<Record<string, number>>((acc, item) => {
-			acc[item.role_name] = item.count;
-			return acc;
-		}, {});
-	}
 }

packages/cli/src/telemetry/index.ts

@@ -10,7 +10,7 @@ import { LicenseService } from '@/license/License.service';
 import { N8N_VERSION } from '@/constants';
 import { SourceControlPreferencesService } from '../environments/sourceControl/sourceControlPreferences.service.ee';
 import { InstanceSettings } from 'n8n-core';
-import { UserService } from '@/services/user.service';
+import { RoleService } from '@/services/role.service';
 
 type ExecutionTrackDataKey = 'manual_error' | 'manual_success' | 'prod_error' | 'prod_success';
 
@@ -109,7 +109,7 @@ export class Telemetry {
 			plan_name_current: this.license.getPlanName(),
 			quota: this.license.getTriggerLimit(),
 			usage: await LicenseService.getActiveTriggerCount(),
-			role_count: await Container.get(UserService).countUsersByRole(),
+			role_count: await Container.get(RoleService).countUsersByRole(),
 			source_control_set_up: Container.get(SourceControlPreferencesService).isSourceControlSetup(),
 			branchName: sourceControlPreferences.branchName,
 			read_only_instance: sourceControlPreferences.branchReadOnly,

packages/cli/test/integration/role.service.test.ts

@@ -0,0 +1,48 @@
+import { RoleService } from '@/services/role.service';
+import { createAdmin, createMember, createOwner } from './shared/db/users';
+import * as testDb from './shared/testDb';
+import { mock } from 'jest-mock-extended';
+import { RoleRepository } from '@/databases/repositories/role.repository';
+import Container from 'typedi';
+import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
+
+describe('RoleService', () => {
+	let roleService: RoleService;
+
+	beforeAll(async () => {
+		await testDb.init();
+
+		roleService = new RoleService(
+			Container.get(RoleRepository),
+			Container.get(SharedWorkflowRepository),
+			mock(),
+		);
+
+		testDb.truncate(['User']);
+	});
+
+	afterEach(async () => {
+		await testDb.truncate(['SharedWorkflow']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('countUsersByRole()', () => {
+		test('should return the number of users in each role', async () => {
+			await Promise.all([
+				createOwner(),
+				createAdmin(),
+				createAdmin(),
+				createMember(),
+				createMember(),
+				createMember(),
+			]);
+
+			const usersByRole = await roleService.countUsersByRole();
+
+			expect(usersByRole).toStrictEqual({ admin: 2, member: 3, owner: 1 });
+		});
+	});
+});