regen migrations

Author: icecrasher321

apps/sim/lib/billing/calculations/usage-monitor.ts

@@ -3,6 +3,7 @@ import { member, userStats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { and, eq } from 'drizzle-orm'
+import { defaultBillingPeriod } from '@/lib/billing/core/billing-period'
 import {
   getHighestPrioritySubscription,
   type HighestPrioritySubscription,
@@ -22,13 +23,6 @@ const logger = createLogger('UsageMonitor')
 
 const WARNING_THRESHOLD = 80
 
-function defaultBillingPeriod(): { start: Date; end: Date } {
-  return {
-    start: new Date(0),
-    end: new Date(Date.UTC(9999, 11, 31)),
-  }
-}
-
 interface UsageData {
   percentUsed: number
   isWarning: boolean

apps/sim/lib/billing/core/billing-period.ts

@@ -0,0 +1,9 @@
+const OPEN_BILLING_PERIOD_START = new Date(0)
+const OPEN_BILLING_PERIOD_END = new Date(Date.UTC(9999, 11, 31))
+
+export function defaultBillingPeriod(): { start: Date; end: Date } {
+  return {
+    start: OPEN_BILLING_PERIOD_START,
+    end: OPEN_BILLING_PERIOD_END,
+  }
+}

apps/sim/lib/billing/core/usage-log.ts

@@ -5,15 +5,12 @@ import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
 import { and, desc, eq, gte, lte, sql } from 'drizzle-orm'
+import { defaultBillingPeriod } from '@/lib/billing/core/billing-period'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/plan'
 import { isOrgScopedSubscription } from '@/lib/billing/subscriptions/utils'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
 
 const logger = createLogger('UsageLog')
-const OPEN_BILLING_PERIOD = {
-  start: new Date(0),
-  end: new Date(Date.UTC(9999, 11, 31)),
-} as const
 
 /**
  * Usage log category types
@@ -97,10 +94,6 @@ function stableEventKey(parts: Record<string, unknown>): string {
   return createHash('sha256').update(payload).digest('hex')
 }
 
-function defaultBillingPeriod(): { start: Date; end: Date } {
-  return { ...OPEN_BILLING_PERIOD }
-}
-
 async function resolveBillingContext(
   userId: string,
   billingEntity?: BillingEntity,

apps/sim/lib/billing/core/usage.ts

@@ -10,6 +10,7 @@ import {
   renderUsageThresholdEmail,
 } from '@/components/emails'
 import { getEffectiveBillingStatus } from '@/lib/billing/core/access'
+import { defaultBillingPeriod } from '@/lib/billing/core/billing-period'
 import {
   getHighestPrioritySubscription,
   type HighestPrioritySubscription,
@@ -38,13 +39,6 @@ import { getEmailPreferences } from '@/lib/messaging/email/unsubscribe'
 
 const logger = createLogger('UsageManagement')
 
-function defaultBillingPeriod(): { start: Date; end: Date } {
-  return {
-    start: new Date(0),
-    end: new Date(Date.UTC(9999, 11, 31)),
-  }
-}
-
 export interface OrgUsageLimitResult {
   limit: number
   minimum: number

packages/db/migrations/0218_chubby_zzzax.sql

@@ -0,0 +1,13 @@
+CREATE TYPE "public"."billing_entity_type" AS ENUM('user', 'organization');--> statement-breakpoint
+ALTER TABLE "usage_log" ADD COLUMN "event_key" text;--> statement-breakpoint
+ALTER TABLE "usage_log" ADD COLUMN "billing_entity_type" "billing_entity_type";--> statement-breakpoint
+ALTER TABLE "usage_log" ADD COLUMN "billing_entity_id" text;--> statement-breakpoint
+ALTER TABLE "usage_log" ADD COLUMN "billing_period_start" timestamp;--> statement-breakpoint
+ALTER TABLE "usage_log" ADD COLUMN "billing_period_end" timestamp;--> statement-breakpoint
+CREATE UNIQUE INDEX "usage_log_event_key_unique" ON "usage_log" USING btree ("event_key") WHERE "usage_log"."event_key" IS NOT NULL;--> statement-breakpoint
+CREATE INDEX "usage_log_billing_entity_period_idx" ON "usage_log" USING btree ("billing_entity_type","billing_entity_id","billing_period_start","billing_period_end") WHERE "usage_log"."billing_entity_type" IS NOT NULL;--> statement-breakpoint
+ALTER TABLE "usage_log" ADD CONSTRAINT "usage_log_billing_scope_all_or_none" CHECK ((
+        ("usage_log"."billing_entity_type" IS NULL AND "usage_log"."billing_entity_id" IS NULL AND "usage_log"."billing_period_start" IS NULL AND "usage_log"."billing_period_end" IS NULL)
+        OR
+        ("usage_log"."billing_entity_type" IS NOT NULL AND "usage_log"."billing_entity_id" IS NOT NULL AND "usage_log"."billing_period_start" IS NOT NULL AND "usage_log"."billing_period_end" IS NOT NULL AND "usage_log"."billing_period_start" < "usage_log"."billing_period_end")
+      )) NOT VALID;