Skip to content

Open source CapCut alternative.

TypeScript

refactor(site): credit grants carry one denomination

David Le6d416442c79d
diff --git a/site/prisma/Credits.prisma b/site/prisma/Credits.prisma
index 2d52c90f..45a7fcb9 100644
--- a/site/prisma/Credits.prisma
+++ b/site/prisma/Credits.prisma
@@ -22,10 +22,6 @@ model UserCreditGrant {
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
source String
sourceId String?
- // What the amounts below are denominated in. "credit" = USD micros that feed
- // UserCreditAccount.balanceMicros. Historical rows carry retired units, so
- // balance paths filter on this column.
- unit String @default("credit")
originalAmountMicros BigInt
remainingAmountMicros BigInt
expiresAt DateTime?
@@ -38,9 +34,9 @@ model UserCreditGrant {
updatedAt DateTime @updatedAt
ledgerEntries UserCreditLedgerEntry[]
- @@unique([userId, unit, source, sourceId])
+ @@unique([userId, source, sourceId])
@@index([accountId])
- @@index([userId, unit, status])
+ @@index([userId, status])
@@map("user_credit_grant")
}
diff --git a/site/prisma/migrations/20260907054442/migration.sql b/site/prisma/migrations/20260907054442/migration.sql
new file mode 100644
index 00000000..57edb9da
--- /dev/null
+++ b/site/prisma/migrations/20260907054442/migration.sql
@@ -0,0 +1,21 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `unit` on the `user_credit_grant` table. All the data in the column will be lost.
+ - A unique constraint covering the columns `[userId,source,sourceId]` on the table `user_credit_grant` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- DropIndex
+DROP INDEX "user_credit_grant_userId_unit_source_sourceId_key";
+
+-- DropIndex
+DROP INDEX "user_credit_grant_userId_unit_status_idx";
+
+-- AlterTable
+ALTER TABLE "user_credit_grant" DROP COLUMN "unit";
+
+-- CreateIndex
+CREATE INDEX "user_credit_grant_userId_status_idx" ON "user_credit_grant"("userId", "status");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "user_credit_grant_userId_source_sourceId_key" ON "user_credit_grant"("userId", "source", "sourceId");
diff --git a/site/src/app/api/billing/pro/route.ts b/site/src/app/api/billing/pro/route.ts
index 0340fa70..0ec2b29d 100644
--- a/site/src/app/api/billing/pro/route.ts
+++ b/site/src/app/api/billing/pro/route.ts
@@ -2,7 +2,6 @@ import { NextResponse } from "next/server";
import { getActiveProSubscription } from "@/lib/billing/pro-subscription";
import { creditMicrosToString, zeroCreditMicros } from "@/lib/credits/amounts";
-import { creditGrantUnit } from "@/lib/credits/inference";
import { withDonkeyAuth } from "@/lib/donkey-api-auth";
import { prisma } from "@/lib/prisma";
@@ -21,7 +20,6 @@ export const GET = withDonkeyAuth(async (request) => {
OR: [{ expiresAt: null }, { expiresAt: { gt: now } }],
source: "pro_subscription",
status: "active",
- unit: creditGrantUnit,
userId,
},
}),
diff --git a/site/src/lib/credits/inference.ts b/site/src/lib/credits/inference.ts
index e4425096..53113d34 100644
--- a/site/src/lib/credits/inference.ts
+++ b/site/src/lib/credits/inference.ts
@@ -13,11 +13,6 @@ import {
import { isJsonObject, toJsonValue } from "@/lib/inference/json";
import type { JsonObject, JsonValue } from "@/lib/inference/providers";
-// UserCreditGrant.unit value. Dollar grants ("credit") feed the account
-// balance and pay for hosted inference. Balance queries filter on this unit
-// because historical rows carry retired units.
-export const creditGrantUnit = "credit";
-
export const inferenceUsageRoutes = {
assets: "/api/inference/assets/",
assetsRefresh: "/api/inference/assets/refresh/",
@@ -161,7 +156,6 @@ export async function grantCredits(input: {
where: {
source: input.source,
sourceId: input.sourceId,
- unit: creditGrantUnit,
userId: input.userId,
},
});
@@ -204,7 +198,6 @@ export async function grantCredits(input: {
remainingAmountMicros: input.amountMicros,
source: input.source,
sourceId: input.sourceId,
- unit: creditGrantUnit,
userId: input.userId,
},
});
@@ -240,7 +233,6 @@ export async function grantCredits(input: {
where: {
source: input.source,
sourceId: input.sourceId,
- unit: creditGrantUnit,
userId: input.userId,
},
});
@@ -565,8 +557,6 @@ export async function getCreditBalance(userId: string) {
gt: zeroCreditMicros,
},
status: "active",
- // Dollar grants only; historical rows can carry retired units.
- unit: creditGrantUnit,
userId,
OR: [
{
@@ -768,9 +758,6 @@ async function expireCreditsForAccount(
gt: zeroCreditMicros,
},
status: "active",
- // Dollar grants only — a historical row with a retired unit must never
- // decrement balanceMicros here.
- unit: creditGrantUnit,
},
});
@@ -877,9 +864,6 @@ async function debitGrants(
gt: zeroCreditMicros,
},
status: "active",
- // Dollar inference only spends dollar grants — a historical row with a
- // retired unit must never be debited here.
- unit: creditGrantUnit,
},
});