Address feedback

packages/cli/src/databases/repositories/role.repository.ts

@@ -12,4 +12,23 @@ export class RoleRepository extends Repository<Role> {
 	async findRole(scope: RoleScopes, name: RoleNames) {
 		return this.findOne({ where: { scope, name } });
 	}
+
+	/**
+	 * Counts the number of users in each role, e.g. `{ admin: 2, member: 6, owner: 1 }`
+	 */
+	async countUsersByRole() {
+		type Row = { role_name: string; count: number };
+
+		const rows: Row[] = await this.createQueryBuilder('role')
+			.select('role.name')
+			.addSelect('COUNT(user.id)', 'count')
+			.innerJoin('user', 'user', 'role.id = user.globalRoleId')
+			.groupBy('role.name')
+			.getRawMany();
+
+		return rows.reduce<Record<string, number>>((acc, item) => {
+			acc[item.role_name] = item.count;
+			return acc;
+		}, {});
+	}
 }

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

@@ -100,22 +100,4 @@ 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/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 { RoleService } from '@/services/role.service';
+import { RoleRepository } from '@/databases/repositories/role.repository';
 
 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(RoleService).countUsersByRole(),
+			role_count: await Container.get(RoleRepository).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 → packages/cli/test/integration/role.repository.test.ts

@@ -1,30 +1,19 @@
-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;
+describe('RoleRepository', () => {
+	let roleRepository: RoleRepository;
 
 	beforeAll(async () => {
 		await testDb.init();
 
-		roleService = new RoleService(
-			Container.get(RoleRepository),
-			Container.get(SharedWorkflowRepository),
-			mock(),
-		);
+		roleRepository = Container.get(RoleRepository);
 
 		await testDb.truncate(['User']);
 	});
 
-	afterEach(async () => {
-		await testDb.truncate(['SharedWorkflow']);
-	});
-
 	afterAll(async () => {
 		await testDb.terminate();
 	});
@@ -40,7 +29,7 @@ describe('RoleService', () => {
 				createMember(),
 			]);
 
-			const usersByRole = await roleService.countUsersByRole();
+			const usersByRole = await roleRepository.countUsersByRole();
 
 			expect(usersByRole).toStrictEqual({ admin: 2, member: 3, owner: 1 });
 		});