The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Keep usage-limit reads compatible during rollout (#27694)
Félix Malfait3fbb17615cd1
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791186790123-rename-usage-limit-meter-to-unit.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791186790123-rename-usage-limit-meter-to-unit.tsindex 5d086365969..6aae34c656e 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791186790123-rename-usage-limit-meter-to-unit.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791186790123-rename-usage-limit-meter-to-unit.ts@@ -1,5 +1,6 @@import { QueryRunner } from 'typeorm';+import { ensureUsageLimitMeterCompatibility } from 'src/database/commands/upgrade-version-command/2-46/utils/ensure-usage-limit-meter-compatibility.util';import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';@@ -17,12 +18,6 @@ const QUANTITY_UNIT_BY_OPERATION_SQL = `CASE "operationType"WHEN 'RECORD_WRITE' THEN 'RECORD'END`;-const UNIT_FROM_METER_SQL = `CASE "meter"- WHEN 'creditsUsedMicro' THEN 'CREDIT'- WHEN 'bytes' THEN 'BYTE'- WHEN 'quantity' THEN (${QUANTITY_UNIT_BY_OPERATION_SQL})-END`;-const METER_FROM_UNIT_SQL = `CASE "unit"WHEN 'CREDIT' THEN 'creditsUsedMicro'WHEN 'BYTE' THEN 'bytes'@@ -32,21 +27,19 @@ END`;@RegisteredInstanceCommand('2.46.0', 1791186790123)export class RenameUsageLimitMeterToUnitFastInstanceCommand implements FastInstanceCommand {public async up(queryRunner: QueryRunner): Promise<void> {+ await ensureUsageLimitMeterCompatibility(queryRunner);+ }++ public async down(queryRunner: QueryRunner): Promise<void> {await queryRunner.query(- `ALTER TABLE "core"."usageLimit" DROP CONSTRAINT "UQ_USAGE_LIMIT_SCOPE"`,- );- await queryRunner.query(- `ALTER TABLE "core"."usageLimit" ALTER COLUMN "meter" TYPE character varying USING (${UNIT_FROM_METER_SQL})`,+ `DROP TRIGGER IF EXISTS "syncUsageLimitMeterAndUnit" ON "core"."usageLimit"`,);await queryRunner.query(- `ALTER TABLE "core"."usageLimit" RENAME COLUMN "meter" TO "unit"`,+ `DROP FUNCTION IF EXISTS "core"."syncUsageLimitMeterAndUnit"()`,);await queryRunner.query(- `ALTER TABLE "core"."usageLimit" ADD CONSTRAINT "UQ_USAGE_LIMIT_SCOPE" UNIQUE ("workspaceId", "resourceType", "operationType", "spenderType", "spenderId", "limitKind", "periodCount", "periodUnit", "unit")`,+ `ALTER TABLE "core"."usageLimit" DROP COLUMN IF EXISTS "meter"`,);- }-- public async down(queryRunner: QueryRunner): Promise<void> {await queryRunner.query(`ALTER TABLE "core"."usageLimit" DROP CONSTRAINT "UQ_USAGE_LIMIT_SCOPE"`,);@@ -61,6 +54,9 @@ export class RenameUsageLimitMeterToUnitFastInstanceCommand implements FastInstaawait queryRunner.query(`ALTER TABLE "core"."usageLimit" RENAME COLUMN "unit" TO "meter"`,);+ await queryRunner.query(+ `ALTER TABLE "core"."usageLimit" ALTER COLUMN "meter" SET NOT NULL`,+ );await queryRunner.query(`ALTER TABLE "core"."usageLimit" ADD CONSTRAINT "UQ_USAGE_LIMIT_SCOPE" UNIQUE ("workspaceId", "resourceType", "operationType", "spenderType", "spenderId", "limitKind", "periodCount", "periodUnit", "meter")`,);diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791538680877-restore-usage-limit-meter-compatibility.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791538680877-restore-usage-limit-meter-compatibility.tsnew file mode 100644index 00000000000..d54098438ce--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791538680877-restore-usage-limit-meter-compatibility.ts@@ -0,0 +1,17 @@+import { type QueryRunner } from 'typeorm';++import { ensureUsageLimitMeterCompatibility } from 'src/database/commands/upgrade-version-command/2-46/utils/ensure-usage-limit-meter-compatibility.util';+import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';+import { type FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';++@RegisteredInstanceCommand('2.46.0', 1791538680877)+export class RestoreUsageLimitMeterCompatibilityFastInstanceCommand+ implements FastInstanceCommand+{+ public async up(queryRunner: QueryRunner): Promise<void> {+ await ensureUsageLimitMeterCompatibility(queryRunner);+ }++ // The earlier command's down owns both columns; removing compatibility alone breaks old readers.+ public async down(_queryRunner: QueryRunner): Promise<void> {}+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/utils/ensure-usage-limit-meter-compatibility.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/utils/ensure-usage-limit-meter-compatibility.util.tsnew file mode 100644index 00000000000..b5daba6af9e--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/utils/ensure-usage-limit-meter-compatibility.util.ts@@ -0,0 +1,106 @@+import { type QueryRunner } from 'typeorm';++const unitFromMeterSql = (row = '') => `CASE ${row}"meter"+ WHEN 'creditsUsedMicro' THEN 'CREDIT'+ WHEN 'bytes' THEN 'BYTE'+ WHEN 'quantity' THEN CASE ${row}"operationType"+ WHEN 'AI_CHAT_TOKEN' THEN 'TOKEN'+ WHEN 'AI_WORKFLOW_TOKEN' THEN 'TOKEN'+ WHEN 'WEB_SEARCH' THEN 'INVOCATION'+ WHEN 'WORKFLOW_EXECUTION' THEN 'INVOCATION'+ WHEN 'CODE_EXECUTION' THEN 'INVOCATION'+ WHEN 'EMAIL_SEND' THEN 'INVOCATION'+ WHEN 'MESSAGE_CAMPAIGN_SEND' THEN 'INVOCATION'+ WHEN 'API_REQUEST' THEN 'REQUEST'+ WHEN 'WEBHOOK_CALL' THEN 'REQUEST'+ WHEN 'STORAGE_FILE' THEN 'FILE'+ WHEN 'RECORD_WRITE' THEN 'RECORD'+ END+END`;++const meterFromUnitSql = (row = '') => `CASE ${row}"unit"+ WHEN 'CREDIT' THEN 'creditsUsedMicro'+ WHEN 'BYTE' THEN 'bytes'+ ELSE 'quantity'+END`;++export const ensureUsageLimitMeterCompatibility = async (+ queryRunner: QueryRunner,+): Promise<void> => {+ const columns: { column_name: string }[] = await queryRunner.query(+ `SELECT column_name FROM information_schema.columns+ WHERE table_schema = 'core' AND table_name = 'usageLimit'+ AND column_name IN ('meter', 'unit')`,+ );++ if (columns.length === 2) {+ const triggers: { oid: number }[] = await queryRunner.query(+ `SELECT oid FROM pg_trigger+ WHERE tgrelid = '"core"."usageLimit"'::regclass+ AND tgname = 'syncUsageLimitMeterAndUnit' AND NOT tgisinternal`,+ );++ if (triggers.length > 0) {+ return;+ }+ }++ if (!columns.some(({ column_name }) => column_name === 'unit')) {+ await queryRunner.query(+ `ALTER TABLE "core"."usageLimit" ADD COLUMN "unit" character varying`,+ );+ // A mixed-operation quantity has no equivalent unit; retain its row for reconciliation.+ await queryRunner.query(+ `ALTER TABLE "core"."usageLimit" ALTER COLUMN "unit" TYPE character varying USING (${unitFromMeterSql()})`,+ );+ }++ if (!columns.some(({ column_name }) => column_name === 'meter')) {+ await queryRunner.query(+ `ALTER TABLE "core"."usageLimit" ADD COLUMN "meter" character varying`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."usageLimit" ALTER COLUMN "meter" TYPE character varying USING (${meterFromUnitSql()})`,+ );+ }++ await queryRunner.query(+ `ALTER TABLE "core"."usageLimit" ALTER COLUMN "meter" SET NOT NULL,+ ALTER COLUMN "unit" DROP NOT NULL`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."usageLimit" DROP CONSTRAINT "UQ_USAGE_LIMIT_SCOPE"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."usageLimit" ADD CONSTRAINT "UQ_USAGE_LIMIT_SCOPE"+ UNIQUE ("workspaceId", "resourceType", "operationType", "spenderType", "spenderId", "limitKind", "periodCount", "periodUnit", "unit")`,+ );+ await queryRunner.query(`+ CREATE OR REPLACE FUNCTION "core"."syncUsageLimitMeterAndUnit"()+ RETURNS trigger LANGUAGE plpgsql AS $function$+ BEGIN+ IF TG_OP = 'INSERT' THEN+ IF NEW."unit" IS NOT NULL THEN+ NEW."meter" := ${meterFromUnitSql('NEW.')};+ ELSE+ NEW."unit" := ${unitFromMeterSql('NEW.')};+ END IF;+ ELSIF NEW."unit" IS DISTINCT FROM OLD."unit" THEN+ NEW."meter" := ${meterFromUnitSql('NEW.')};+ ELSIF NEW."meter" IS DISTINCT FROM OLD."meter"+ OR NEW."operationType" IS DISTINCT FROM OLD."operationType" THEN+ NEW."unit" := ${unitFromMeterSql('NEW.')};+ END IF;+ RETURN NEW;+ END;+ $function$;+ `);+ await queryRunner.query(+ `DROP TRIGGER IF EXISTS "syncUsageLimitMeterAndUnit" ON "core"."usageLimit"`,+ );+ await queryRunner.query(+ `CREATE TRIGGER "syncUsageLimitMeterAndUnit"+ BEFORE INSERT OR UPDATE ON "core"."usageLimit"+ FOR EACH ROW EXECUTE FUNCTION "core"."syncUsageLimitMeterAndUnit"()`,+ );+};diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.tsindex 5bfcdbb23e4..c53476f2f49 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts@@ -237,6 +237,7 @@ import { AddPayloadToPendingWakeUpFastInstanceCommand } from 'src/database/commaimport { MoveAgentRunSuspensionsToPendingWakeUpsSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-instance-command-slow-1791438611737-move-agent-run-suspensions-to-pending-wake-ups';import { RestoreAgentEvaluationInputsFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791464994704-restore-agent-evaluation-inputs';import { AddPurchaseToBillingCreditGrantTypeFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791470452911-add-purchase-to-billing-credit-grant-type';+import { RestoreUsageLimitMeterCompatibilityFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791538680877-restore-usage-limit-meter-compatibility';export const INSTANCE_COMMANDS = [AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,@@ -476,4 +477,5 @@ export const INSTANCE_COMMANDS = [MoveAgentRunSuspensionsToPendingWakeUpsSlowInstanceCommand,RestoreAgentEvaluationInputsFastInstanceCommand,AddPurchaseToBillingCreditGrantTypeFastInstanceCommand,+ RestoreUsageLimitMeterCompatibilityFastInstanceCommand,];diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit.service.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit.service.tsindex 34ff87812a3..7e9da72a442 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit.service.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit.service.ts@@ -1,4 +1,5 @@import { Injectable } from '@nestjs/common';+import { IsNull, Not } from 'typeorm';import { isNonEmptyString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';@@ -57,7 +58,10 @@ export class UsageLimitService {) {}async findAll(workspaceId: string): Promise<UsageLimitEntity[]> {- return this.usageLimitRepository.find(workspaceId);+ // Legacy quantity scopes without an equivalent unit stay stored for reconciliation.+ return this.usageLimitRepository.find(workspaceId, {+ where: { unit: Not(IsNull()) },+ });}async create({@@ -109,7 +113,7 @@ export class UsageLimitService {isOperator: boolean;}): Promise<UsageLimitEntity> {const usageLimit = await this.usageLimitRepository.findOne(workspaceId, {- where: { id: input.id },+ where: { id: input.id, unit: Not(IsNull()) },});if (!isDefined(usageLimit)) {@@ -257,7 +261,7 @@ export class UsageLimitService {isOperator: boolean;}): Promise<boolean> {const usageLimit = await this.usageLimitRepository.findOne(workspaceId, {- where: { id: usageLimitId },+ where: { id: usageLimitId, unit: Not(IsNull()) },});if (!isDefined(usageLimit)) {diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limits-cache.service.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limits-cache.service.tsindex bbf136ac2ad..4b8a8180a35 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limits-cache.service.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limits-cache.service.ts@@ -1,4 +1,5 @@import { Injectable } from '@nestjs/common';+import { IsNull, Not } from 'typeorm';import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';@@ -9,7 +10,8 @@ import { type WorkspaceCacheProviderContext } from 'src/engine/workspace-cache/timport { type WorkspaceCacheRowsRequirement } from 'src/engine/workspace-cache/types/workspace-cache-rows-requirement.type';const USAGE_LIMITS_ROWS_REQUIREMENT = {- usageLimit: true,+ // Unmapped legacy quantities must not enter unit-based counters.+ usageLimit: { columns: true, where: { unit: Not(IsNull()) } },} as const satisfies WorkspaceCacheRowsRequirement;@Injectable()diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.tsindex aefb53d5d51..faac36fb2fd 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts@@ -53,7 +53,12 @@ export class UsageLimitEntity extends WorkspaceRelatedEntity {@Column({ type: 'varchar' })periodUnit: PeriodUnit;- @Column({ type: 'varchar' })+ // Old pods still use meter; the compatibility trigger owns it until cleanup.+ @Column({ type: 'varchar', select: false, insert: false, update: false })+ meter: string;++ // Unmapped legacy quotas stay stored but are excluded from unit-based reads.+ @Column({ type: 'varchar', nullable: true })unit: UsageUnit;@Column({ type: 'bigint', transformer: nullableBigintColumnTransformer })diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-46-instance-command-fast-1791186790123-rename-usage-limit-meter-to-unit.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-46-instance-command-fast-1791186790123-rename-usage-limit-meter-to-unit.integration-spec.tsindex 6a2ad5cad47..4db3e122434 100644--- a/packages/twenty-server/test/integration/upgrade/suites/2-46-instance-command-fast-1791186790123-rename-usage-limit-meter-to-unit.integration-spec.ts+++ b/packages/twenty-server/test/integration/upgrade/suites/2-46-instance-command-fast-1791186790123-rename-usage-limit-meter-to-unit.integration-spec.ts@@ -1,10 +1,16 @@import { type QueryRunner } from 'typeorm';import { v4 } from 'uuid';+import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';+import { RenameUsageLimitMeterToUnitFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791186790123-rename-usage-limit-meter-to-unit';+import { RestoreUsageLimitMeterCompatibilityFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-instance-command-fast-1791538680877-restore-usage-limit-meter-compatibility';+import { UsageLimitsCacheService } from 'src/engine/core-modules/usage-limit/services/usage-limits-cache.service';+import { UsageLimitEntity } from 'src/engine/core-modules/usage-limit/usage-limit.entity';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';import { UsageUnit } from 'src/engine/core-modules/usage/enums/usage-unit.enum';+import { WorkspaceCacheRowsBatchLoader } from 'src/engine/workspace-cache/services/workspace-cache-rows-batch-loader';import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';jest.useRealTimers();@@ -14,7 +20,7 @@ type UsageLimitFixture = {operationType: UsageOperationType;limitKind: 'speed' | 'quota' | 'stock';meter: string;- unit: UsageUnit;+ unit: UsageUnit | null;};const PERIOD_BY_LIMIT_KIND = {@@ -24,6 +30,20 @@ const PERIOD_BY_LIMIT_KIND = {} as const;const METER_FIXTURES: UsageLimitFixture[] = [+ {+ resourceType: UsageResourceType.AI,+ operationType: UsageOperationType.ALL,+ limitKind: 'quota',+ meter: 'quantity',+ unit: null,+ },+ {+ resourceType: UsageResourceType.WORKFLOW,+ operationType: UsageOperationType.ALL,+ limitKind: 'quota',+ meter: 'quantity',+ unit: null,+ },{resourceType: UsageResourceType.AI,operationType: UsageOperationType.ALL,@@ -170,13 +190,14 @@ describe('2-46 fast instance command 1791186790123 - RenameUsageLimitMeterToUnitconst findColumnValues = async (column: 'meter' | 'unit',- ): Promise<Record<string, string>> => {- const rows: { id: string; value: string }[] = await queryRunner.query(- `SELECT "id", "${column}" AS "value"+ ): Promise<Record<string, string | null>> => {+ const rows: { id: string; value: string | null }[] =+ await queryRunner.query(+ `SELECT "id", "${column}" AS "value"FROM "core"."usageLimit"WHERE "spenderId" = $1`,- [spenderId],- );+ [spenderId],+ );return Object.fromEntries(rows.map(({ id, value }) => [id, value]));};@@ -195,7 +216,7 @@ describe('2-46 fast instance command 1791186790123 - RenameUsageLimitMeterToUnitFROM information_schema.columnsWHERE table_schema = 'core'AND table_name = 'usageLimit'- AND column_name IN ('meter', 'unit')`,+ AND column_name IN ('meter', 'unit') ORDER BY column_name`,);const findScopeConstraintDefinition = async (): Promise<string> => {@@ -211,7 +232,8 @@ describe('2-46 fast instance command 1791186790123 - RenameUsageLimitMeterToUnitbeforeEach(async () => {spenderId = v4();- queryRunner = global.testDataSource.createQueryRunner();+ queryRunner =+ global.workflowTestServices.coreDataSource.createQueryRunner();await queryRunner.connect();await queryRunner.startTransaction();});@@ -221,10 +243,11 @@ describe('2-46 fast instance command 1791186790123 - RenameUsageLimitMeterToUnitawait queryRunner.release();});- it('maps every meter to the unit it counts', async () => {+ it('retains old meters and leaves unmappable quantities stored without a unit', async () => {await command.down(queryRunner);- const expectedUnitById: Record<string, UsageUnit> = {};+ const expectedUnitById: Record<string, UsageUnit | null> = {};+ const expectedMeterById: Record<string, string> = {};for (const {resourceType,@@ -242,24 +265,166 @@ describe('2-46 fast instance command 1791186790123 - RenameUsageLimitMeterToUnit});expectedUnitById[usageLimitId] = unit;+ expectedMeterById[usageLimitId] = meter;}await command.up(queryRunner);expect(await findColumnValues('unit')).toEqual(expectedUnitById);+ expect(await findColumnValues('meter')).toEqual(expectedMeterById);expect(await findUsageLimitColumns()).toEqual([{- columnName: 'unit',+ columnName: 'meter',dataType: 'character varying',isNullable: 'NO',columnDefault: null,},+ {+ columnName: 'unit',+ dataType: 'character varying',+ isNullable: 'YES',+ columnDefault: null,+ },]);expect(await findScopeConstraintDefinition()).toMatch(/^UNIQUE \("workspaceId", "resourceType", "operationType", "spenderType", "spenderId", "limitKind", "periodCount", "periodUnit", "?unit"?\)$/,);});+ it('accepts writes from both versions throughout the rollout', async () => {+ await command.down(queryRunner);+ await command.up(queryRunner);++ const oldWriterId = await insertUsageLimit({+ resourceType: UsageResourceType.WORKFLOW,+ operationType: UsageOperationType.WORKFLOW_EXECUTION,+ limitKind: 'quota',+ column: 'meter',+ value: 'quantity',+ });+ const newWriterId = await insertUsageLimit({+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ limitKind: 'stock',+ column: 'unit',+ value: UsageUnit.FILE,+ });++ expect(await findColumnValues('unit')).toEqual({+ [oldWriterId]: UsageUnit.INVOCATION,+ [newWriterId]: UsageUnit.FILE,+ });+ expect(await findColumnValues('meter')).toEqual({+ [oldWriterId]: 'quantity',+ [newWriterId]: 'quantity',+ });++ await queryRunner.query(+ `UPDATE "core"."usageLimit" SET "meter" = 'bytes' WHERE id = $1`,+ [newWriterId],+ );+ expect((await findColumnValues('unit'))[newWriterId]).toBe(UsageUnit.BYTE);++ await queryRunner.query(+ `UPDATE "core"."usageLimit" SET "unit" = 'CREDIT' WHERE id = $1`,+ [oldWriterId],+ );+ expect((await findColumnValues('meter'))[oldWriterId]).toBe(+ 'creditsUsedMicro',+ );+ });++ it('keeps an ALL quantity written by an old pod without failing the write', async () => {+ await command.up(queryRunner);++ const id = await insertUsageLimit({+ resourceType: UsageResourceType.AI,+ operationType: UsageOperationType.ALL,+ limitKind: 'quota',+ column: 'meter',+ value: 'quantity',+ });++ expect(await findColumnValues('unit')).toEqual({ [id]: null });+ expect(await findColumnValues('meter')).toEqual({ [id]: 'quantity' });++ await command.down(queryRunner);++ expect(await findColumnValues('meter')).toEqual({ [id]: 'quantity' });+ });++ it('restores old reads on instances that already applied the rename and can run twice', async () => {+ await command.up(queryRunner);++ const id = await insertUsageLimit({+ resourceType: UsageResourceType.WORKFLOW,+ operationType: UsageOperationType.WORKFLOW_EXECUTION,+ limitKind: 'quota',+ column: 'unit',+ value: UsageUnit.INVOCATION,+ });++ await queryRunner.query(+ `DROP TRIGGER "syncUsageLimitMeterAndUnit" ON "core"."usageLimit"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."usageLimit" DROP COLUMN "meter"`,+ );++ const repair = new RestoreUsageLimitMeterCompatibilityFastInstanceCommand();++ await repair.up(queryRunner);+ await repair.up(queryRunner);++ expect(await findColumnValues('meter')).toEqual({ [id]: 'quantity' });+ expect(await findColumnValues('unit')).toEqual({+ [id]: UsageUnit.INVOCATION,+ });+ });++ it('retains unmapped quotas in storage without loading them into enforcement', async () => {+ await command.up(queryRunner);++ const pendingId = await insertUsageLimit({+ resourceType: UsageResourceType.AI,+ operationType: UsageOperationType.ALL,+ limitKind: 'quota',+ column: 'meter',+ value: 'quantity',+ });+ const activeId = await insertUsageLimit({+ resourceType: UsageResourceType.AI,+ operationType: UsageOperationType.AI_CHAT_TOKEN,+ limitKind: 'quota',+ column: 'unit',+ value: UsageUnit.TOKEN,+ });+ const provider = new UsageLimitsCacheService();+ const usageLimitRepository = queryRunner.manager.withRepository(+ getCoreRepository<UsageLimitEntity>(UsageLimitEntity),+ );+ const loader = new WorkspaceCacheRowsBatchLoader(+ { getRepository: () => usageLimitRepository },+ SEED_APPLE_WORKSPACE_ID,+ );++ await loader.loadRows([provider.rowsRequirement]);++ const limits = provider.computeForCache({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ rows: loader.readRows(provider.rowsRequirement),+ });+ const fixtureLimits = (+ limits.byResourceType[UsageResourceType.AI] ?? []+ ).filter((limit) => limit.spenderId === spenderId);++ expect(fixtureLimits.map(({ id }) => id)).toEqual([activeId]);+ expect(await findColumnValues('meter')).toEqual({+ [pendingId]: 'quantity',+ [activeId]: 'quantity',+ });+ });+it('drops the limits no meter can hold and maps the rest back on down', async () => {const insertCodeExecutionUsageLimit = (unit: UsageUnit) =>insertUsageLimit({@@ -313,5 +478,13 @@ describe('2-46 fast instance command 1791186790123 - RenameUsageLimitMeterToUnitexpect(await findScopeConstraintDefinition()).toMatch(/"periodUnit", "?meter"?\)$/,);+ expect(await findUsageLimitColumns()).toEqual([+ {+ columnName: 'meter',+ dataType: 'character varying',+ isNullable: 'NO',+ columnDefault: null,+ },+ ]);});});