diff --git a/packages/cli/src/databases/repositories/usageMetrics.repository.ts b/packages/cli/src/databases/repositories/usageMetrics.repository.ts index b0d88fc0a6..01f093c193 100644 --- a/packages/cli/src/databases/repositories/usageMetrics.repository.ts +++ b/packages/cli/src/databases/repositories/usageMetrics.repository.ts @@ -29,6 +29,7 @@ export class UsageMetricsRepository extends Repository { async getLicenseRenewalMetrics() { type Row = { enabled_user_count: string | number; + total_user_count: string | number; active_workflow_count: string | number; total_workflow_count: string | number; total_credentials_count: string | number; @@ -44,6 +45,7 @@ export class UsageMetricsRepository extends Repository { const [ { enabled_user_count: enabledUsers, + total_user_count: totalUsers, active_workflow_count: activeWorkflows, total_workflow_count: totalWorkflows, total_credentials_count: totalCredentials, @@ -53,6 +55,7 @@ export class UsageMetricsRepository extends Repository { ] = (await this.query(` SELECT (SELECT COUNT(*) FROM ${userTable} WHERE disabled = false) AS enabled_user_count, + (SELECT COUNT(*) FROM ${userTable}) AS total_user_count, (SELECT COUNT(*) FROM ${workflowTable} WHERE active = true) AS active_workflow_count, (SELECT COUNT(*) FROM ${workflowTable}) AS total_workflow_count, (SELECT COUNT(*) FROM ${credentialTable}) AS total_credentials_count, @@ -65,6 +68,7 @@ export class UsageMetricsRepository extends Repository { return { enabledUsers: toNumber(enabledUsers), + totalUsers: toNumber(totalUsers), activeWorkflows: toNumber(activeWorkflows), totalWorkflows: toNumber(totalWorkflows), totalCredentials: toNumber(totalCredentials), diff --git a/packages/cli/src/services/usageMetrics.service.ts b/packages/cli/src/services/usageMetrics.service.ts index 4f8b83923b..bf60072f6b 100644 --- a/packages/cli/src/services/usageMetrics.service.ts +++ b/packages/cli/src/services/usageMetrics.service.ts @@ -10,6 +10,7 @@ export class UsageMetricsService { activeWorkflows, totalWorkflows, enabledUsers, + totalUsers, totalCredentials, productionExecutions, manualExecutions, @@ -19,6 +20,7 @@ export class UsageMetricsService { { name: 'activeWorkflows', value: activeWorkflows }, { name: 'totalWorkflows', value: totalWorkflows }, { name: 'enabledUsers', value: enabledUsers }, + { name: 'totalUsers', value: totalUsers }, { name: 'totalCredentials', value: totalCredentials }, { name: 'productionExecutions', value: productionExecutions }, { name: 'manualExecutions', value: manualExecutions }, diff --git a/packages/cli/test/integration/usageMetrics.repository.test.ts b/packages/cli/test/integration/usageMetrics.repository.test.ts index 4ecb53a3fa..780eaecf26 100644 --- a/packages/cli/test/integration/usageMetrics.repository.test.ts +++ b/packages/cli/test/integration/usageMetrics.repository.test.ts @@ -64,6 +64,7 @@ describe('UsageMetricsRepository', () => { expect(metrics).toStrictEqual({ enabledUsers: 4, + totalUsers: 5, totalCredentials: 2, totalWorkflows: 5, activeWorkflows: 3, @@ -79,6 +80,7 @@ describe('UsageMetricsRepository', () => { expect(metrics).toStrictEqual({ enabledUsers: 1, + totalUsers: 1, totalCredentials: 0, totalWorkflows: 3, activeWorkflows: 3,