The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(usage-limit): key quota counters on their limit value (#26996)
Etiennea71d29b0a4c4
diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-quota.service.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-quota.service.spec.tsindex 7da54ece51e..085f3f86a96 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-quota.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-quota.service.spec.ts@@ -70,6 +70,7 @@ const buildLimitCounterScope = (limitKind: 'quota',periodUnit: 'month',meter: 'creditsUsedMicro',+ limitValue: 1_000,...overrides,});@@ -632,6 +633,7 @@ describe('UsageLimitQuotaService', () => {meter: 'creditsUsedMicro',periodUnit: 'month',periodStart: MONTH_PERIOD.periodStart,+ limitValue: 1_000,}),buildQuotaCounterKey({workspaceId: 'workspace-1',@@ -642,6 +644,7 @@ describe('UsageLimitQuotaService', () => {meter: 'creditsUsedMicro',periodUnit: 'week',periodStart: WEEK_PERIOD.periodStart,+ limitValue: 1_000,}),]);});@@ -674,6 +677,7 @@ describe('UsageLimitQuotaService', () => {meter: 'creditsUsedMicro',periodUnit: 'month',periodStart: MONTH_PERIOD.periodStart,+ limitValue: 1_000,}),]);});@@ -700,6 +704,7 @@ describe('UsageLimitQuotaService', () => {meter: 'quantity',periodUnit: 'day',periodStart: DAY_PERIOD.periodStart,+ limitValue: 1_000,}),buildQuotaDefaultCounterKey({workspaceId: 'workspace-1',diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-quota.service.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-quota.service.tsindex 197ccccc1ba..b4a26295992 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-quota.service.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-quota.service.ts@@ -212,6 +212,7 @@ export class UsageLimitQuotaService implements OnModuleInit {meter: usageLimit.meter,periodUnit: usageLimit.periodUnit,periodStart: period.periodStart,+ limitValue: usageLimit.limitValue,}),]: []),diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-counter-scope.type.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-counter-scope.type.tsindex 967c31e1c79..8193316edd5 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-counter-scope.type.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-counter-scope.type.ts@@ -10,4 +10,5 @@ export type UsageLimitCounterScope = Pick<| 'limitKind'| 'periodUnit'| 'meter'+ | 'limitValue'>;diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-intra-workspace-limit-counter-keys.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-intra-workspace-limit-counter-keys.util.spec.tsindex f1e2f6935d6..f7924cda3e6 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-intra-workspace-limit-counter-keys.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-intra-workspace-limit-counter-keys.util.spec.ts@@ -46,8 +46,8 @@ describe('buildIntraWorkspaceLimitCounterKeys', () => {periodByUnit: { month: MONTH_PERIOD, week: WEEK_PERIOD },}),).toEqual([- `{workspace-1}:quota:AI:ALL:userWorkspace:-:creditsUsedMicro:month:${MONTH_PERIOD.periodStart.getTime()}`,- `{workspace-1}:quota:AI:ALL:agent:agent-1:creditsUsedMicro:week:${WEEK_PERIOD.periodStart.getTime()}`,+ `{workspace-1}:quota:AI:ALL:userWorkspace:-:creditsUsedMicro:month:${MONTH_PERIOD.periodStart.getTime()}:1000`,+ `{workspace-1}:quota:AI:ALL:agent:agent-1:creditsUsedMicro:week:${WEEK_PERIOD.periodStart.getTime()}:1000`,]);});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-overridden-quota-default-counter-keys.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-overridden-quota-default-counter-keys.util.spec.tsindex 19824a59085..1419bcd72bc 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-overridden-quota-default-counter-keys.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-overridden-quota-default-counter-keys.util.spec.ts@@ -11,7 +11,7 @@ const DAY_PERIOD = {periodEnd: new Date('2026-08-21T00:00:00.000Z'),};-const DEFAULT_COUNTER_KEY = `{workspace-1}:quota:EMAIL:EMAIL_SEND:workspace:-:quantity:day:${DAY_PERIOD.periodStart.getTime()}:default:1000`;+const DEFAULT_COUNTER_KEY = `{workspace-1}:quota:EMAIL:EMAIL_SEND:workspace:-:quantity:day:${DAY_PERIOD.periodStart.getTime()}:1000:default`;const buildUsageLimit = (overrides: Partial<UsageLimitCounterScope> = {},@@ -24,6 +24,7 @@ const buildUsageLimit = (limitKind: 'quota',periodUnit: 'day',meter: 'quantity',+ limitValue: 500,...overrides,});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counter-key.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counter-key.util.spec.tsnew file mode 100644index 00000000000..440cbe36c3f--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counter-key.util.spec.ts@@ -0,0 +1,44 @@+import { buildQuotaCounterKey } from 'src/engine/core-modules/usage-limit/utils/build-quota-counter-key.util';+import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';++const WORKSPACE_ID = 'workspace-1';+const PERIOD_START = new Date('2026-09-01T00:00:00.000Z');++const buildKey = (+ overrides: Partial<Parameters<typeof buildQuotaCounterKey>[0]> = {},+) =>+ buildQuotaCounterKey({+ workspaceId: WORKSPACE_ID,+ resourceType: UsageResourceType.AI,+ operationType: UsageOperationType.AI_CHAT_TOKEN,+ spenderType: 'workspace',+ spenderId: null,+ meter: 'creditsUsedMicro',+ periodUnit: 'month',+ periodStart: PERIOD_START,+ limitValue: 1000,+ ...overrides,+ });++describe('buildQuotaCounterKey', () => {+ it('hashes on the workspace so every counter of a workspace shares a slot', () => {+ expect(buildKey()).toBe(+ `{${WORKSPACE_ID}}:quota:AI:AI_CHAT_TOKEN:workspace:-:creditsUsedMicro:month:${PERIOD_START.getTime()}:1000`,+ );+ });++ it.each([+ ['operationType', { operationType: UsageOperationType.WEB_SEARCH }],+ ['meter', { meter: 'quantity' as const }],+ ['spenderId', { spenderId: 'user-1' }],+ ['periodUnit', { periodUnit: 'week' as const }],+ ['periodStart', { periodStart: new Date('2026-10-01T00:00:00.000Z') }],+ ['limitValue', { limitValue: 2000 }],+ ])(+ 'gives two limits differing only by %s their own counter',+ (_, differs) => {+ expect(buildKey(differs)).not.toBe(buildKey());+ },+ );+});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counters.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counters.util.spec.tsindex 4d6f5cf09d6..60bc6af98ba 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counters.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counters.util.spec.ts@@ -72,7 +72,7 @@ describe('buildQuotaCounters', () => {{kind: 'limit',isDefault: false,- key: `{workspace-1}:quota:AI:AI_CHAT_TOKEN:workspace:-:creditsUsedMicro:month:${MONTH_PERIOD.periodStart.getTime()}`,+ key: `{workspace-1}:quota:AI:AI_CHAT_TOKEN:workspace:-:creditsUsedMicro:month:${MONTH_PERIOD.periodStart.getTime()}:1000000`,limitValue: 1_000_000,meter: 'creditsUsedMicro',resourceType: UsageResourceType.AI,@@ -167,7 +167,7 @@ describe('buildQuotaCounters', () => {{kind: 'limit',isDefault: true,- key: `{workspace-1}:quota:AI:AI_CHAT_TOKEN:workspace:-:creditsUsedMicro:month:${MONTH_PERIOD.periodStart.getTime()}:default:5000`,+ key: `{workspace-1}:quota:AI:AI_CHAT_TOKEN:workspace:-:creditsUsedMicro:month:${MONTH_PERIOD.periodStart.getTime()}:5000:default`,limitValue: 5_000,meter: 'creditsUsedMicro',resourceType: UsageResourceType.AI,diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-intra-workspace-limit-counter-keys.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-intra-workspace-limit-counter-keys.util.tsindex 5901cbc43de..2c7d9ea78ed 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-intra-workspace-limit-counter-keys.util.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-intra-workspace-limit-counter-keys.util.ts@@ -38,6 +38,7 @@ export const buildIntraWorkspaceLimitCounterKeys = ({meter: limit.meter,periodUnit: limit.periodUnit,periodStart: period.periodStart,+ limitValue: limit.limitValue,}),];});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-limit-quota-counter.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-limit-quota-counter.util.tsindex 1e9ac091fef..f7be928f6a5 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-limit-quota-counter.util.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-limit-quota-counter.util.ts@@ -27,6 +27,7 @@ export const buildLimitQuotaCounter = ({meter: limit.meter,periodUnit: limit.periodUnit,periodStart: period.periodStart,+ limitValue: limit.limitValue,}),limitValue: limit.limitValue,meter: limit.meter,diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-quota-counter-key.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-quota-counter-key.util.tsindex 46bf252da5d..bc1dda7abd7 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-quota-counter-key.util.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-quota-counter-key.util.ts@@ -17,6 +17,7 @@ export const buildQuotaCounterKey = ({meter,periodUnit,periodStart,+ limitValue,}: {workspaceId: string;resourceType: UsageResourceType;@@ -26,5 +27,6 @@ export const buildQuotaCounterKey = ({meter: UsageMeter;periodUnit: PeriodUnit;periodStart: Date;+ limitValue: number;}): string =>- `{${workspaceId}}:quota:${resourceType}:${operationType}:${spenderType}:${isNonEmptyString(spenderId) ? spenderId : ABSENT}:${meter}:${periodUnit}:${periodStart.getTime()}`;+ `{${workspaceId}}:quota:${resourceType}:${operationType}:${spenderType}:${isNonEmptyString(spenderId) ? spenderId : ABSENT}:${meter}:${periodUnit}:${periodStart.getTime()}:${limitValue}`;diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-quota-default-counter-key.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-quota-default-counter-key.util.tsindex a3b943d3218..bb961bcaccf 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-quota-default-counter-key.util.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-quota-default-counter-key.util.ts@@ -1,8 +1,6 @@import { type QuotaDefaultKeyScope } from 'src/engine/core-modules/usage-limit/types/quota-default-key-scope.type';import { buildQuotaCounterKey } from 'src/engine/core-modules/usage-limit/utils/build-quota-counter-key.util';-export const buildQuotaDefaultCounterKey = ({- limitValue,- ...scope-}: QuotaDefaultKeyScope & { limitValue: number }): string =>- `${buildQuotaCounterKey(scope)}:default:${limitValue}`;+export const buildQuotaDefaultCounterKey = (+ scope: QuotaDefaultKeyScope & { limitValue: number },+): string => `${buildQuotaCounterKey(scope)}:default`;