refactor(balances): limit_reached reads the tracked subjects

Author: charlietlamb

server/src/internal/balances/trackWebhooks/checkLimitReached.ts

@@ -3,38 +3,37 @@ import {
 	type ApiEntityV2,
 	apiBalanceToAllowed,
 	type Feature,
-	type FullCustomer,
-	type FullSubject,
 	fullCustomerToTags,
 	WebhookEventType,
 } from "@autumn/shared";
 import { sendSvixEvent } from "@/external/svix/svixHelpers.js";
 import type { AutumnContext } from "@/honoUtils/HonoEnv.js";
 import { findBlockedFilterOnSubject } from "./limitReached/findBlockedFilterOnSubject.js";
 import { findBlockingUsageLimit } from "./limitReached/findBlockingUsageLimit.js";
+import type { TrackedSubjects } from "./types/trackedSubjects.js";
 
 // Subjects must be built via buildEvaluationSubject, or plan-level / percentage
 // caps are invisible here and the allowed -> blocked transition never fires.
 export const checkLimitReached = async ({
 	ctx,
 	oldEvalSubject,
 	newEvalSubject,
-	newFullCus,
-	newFullSubject,
+	tracked,
 	feature,
 	entityId,
 	eventProperties,
 }: {
 	ctx: AutumnContext;
 	oldEvalSubject: ApiCustomerV5 | ApiEntityV2;
 	newEvalSubject: ApiCustomerV5 | ApiEntityV2;
-	newFullCus: FullCustomer;
-	newFullSubject?: FullSubject;
+	tracked: TrackedSubjects;
 	feature: Feature;
 	entityId?: string;
 	eventProperties?: Record<string, unknown> | null;
 }) => {
 	const now = ctx.timestamp;
+	const newFullCus = tracked.after.fullCustomer;
+	const newFullSubject = tracked.after.fullSubject;
 	try {
 		const oldBalance = oldEvalSubject.balances?.[feature.id];
 		const newBalance = newEvalSubject.balances?.[feature.id];

server/src/internal/balances/trackWebhooks/fireTrackWebhooks.ts

@@ -98,8 +98,7 @@ export const fireTrackWebhooks = ({
 				ctx,
 				oldEvalSubject,
 				newEvalSubject,
-				newFullCus: tracked.after.fullCustomer,
-				newFullSubject: tracked.after.fullSubject,
+				tracked,
 				feature: affectedFeature,
 				entityId,
 				eventProperties,

server/tests/integration/balances/track/limit-reached/limit-reached-usage-limit-block.test.ts

@@ -12,7 +12,7 @@
  */
 
 import { afterAll, beforeAll, expect, test } from "bun:test";
-import { ApiVersion, ResetInterval } from "@autumn/shared";
+import { ApiVersion, ms, ResetInterval } from "@autumn/shared";
 import {
 	getTestSvixAppId,
 	setupWebhookTest,
@@ -31,7 +31,6 @@ import { setCustomerUsageLimit } from "../../utils/usage-limit-utils/customerUsa
 import { expectUsageLimitWindowContains } from "../../utils/usage-limit-utils/expectUsageLimitWindowContains.js";
 
 const autumnV2_3 = new AutumnInt({ version: ApiVersion.V2_3 });
-const ONE_DAY_MS = 24 * 60 * 60 * 1000;
 
 type LimitReachedPayload = {
 	type: string;
@@ -128,7 +127,7 @@ test(`${chalk.yellowBright("limit-reached-ul1: a usage_limit block describes the
 	expectUsageLimitWindowContains({
 		usageLimit: result!.payload.data.usage_limit,
 		at: trackedAt,
-		intervalMs: ONE_DAY_MS,
+		intervalMs: ms.days(1),
 	});
 });