Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

add transformLink to admin links too

Steven Teyf4b8d1300fdb
diff --git a/apps/web/app/(ee)/api/admin/links/[linkId]/route.ts b/apps/web/app/(ee)/api/admin/links/[linkId]/route.ts
index 8015a0a997..25e2b3ebe0 100644
--- a/apps/web/app/(ee)/api/admin/links/[linkId]/route.ts
+++ b/apps/web/app/(ee)/api/admin/links/[linkId]/route.ts
@@ -1,5 +1,5 @@
+import { transformLink } from "@/lib/api/links";
import { withAdmin } from "@/lib/auth";
-import { serializeForJson } from "@/lib/utils/serialize-for-json";
import { prisma } from "@dub/prisma";
import { NextResponse } from "next/server";
@@ -17,5 +17,5 @@ export const GET = withAdmin(async ({ params }) => {
return NextResponse.json({ error: "Link not found" }, { status: 404 });
}
- return NextResponse.json(serializeForJson(link));
+ return NextResponse.json(transformLink(link));
});
diff --git a/apps/web/app/(ee)/api/admin/links/route.ts b/apps/web/app/(ee)/api/admin/links/route.ts
index 3cf803aaf3..b88b0af97b 100644
--- a/apps/web/app/(ee)/api/admin/links/route.ts
+++ b/apps/web/app/(ee)/api/admin/links/route.ts
@@ -1,5 +1,5 @@
+import { transformLink } from "@/lib/api/links";
import { withAdmin } from "@/lib/auth";
-import { serializeForJson } from "@/lib/utils/serialize-for-json";
import { prisma } from "@dub/prisma";
import { DUB_DOMAINS_ARRAY, LEGAL_USER_ID } from "@dub/utils";
import { NextResponse } from "next/server";
@@ -81,10 +81,5 @@ export const GET = withAdmin(async ({ searchParams }) => {
}),
});
- const links = response.map((link) => ({
- ...link,
- tags: link.tags.map(({ tag }) => tag),
- }));
-
- return NextResponse.json(serializeForJson(links));
+ return NextResponse.json(response.map((link) => transformLink(link)));
});
diff --git a/apps/web/lib/api/conversions/track-sale.ts b/apps/web/lib/api/conversions/track-sale.ts
index 63eb6508ce..31b4562ab0 100644
--- a/apps/web/lib/api/conversions/track-sale.ts
+++ b/apps/web/lib/api/conversions/track-sale.ts
@@ -505,18 +505,9 @@ const _trackSale = async ({
sales: {
increment: 1,
},
- // temporarily exclude large links from saleAmount updates
- ...([
- "link_1K8ERD8CB84FABDB6XXG10P2C",
- "link_1K7K0RPMWFS0ZA7Z2G2DJQEH9",
- "link_1K75EMEGAP3ACJJ08MY341SYF",
- ].includes(saleData.link_id)
- ? {}
- : {
- saleAmount: {
- increment: amount,
- },
- }),
+ saleAmount: {
+ increment: amount,
+ },
},
include: includeTags,
}),
diff --git a/apps/web/lib/utils/serialize-for-json.ts b/apps/web/lib/utils/serialize-for-json.ts
deleted file mode 100644
index 5a22f15ef8..0000000000
--- a/apps/web/lib/utils/serialize-for-json.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Recursively convert bigint values to number in an object so it can be safely
- * passed to JSON.stringify (which throws on bigint by default).
- * Use before returning API responses that may contain Prisma BigInt fields.
- */
-export function serializeForJson<T>(obj: T): T {
- if (obj === null || obj === undefined) {
- return obj;
- }
- if (typeof obj === "bigint") {
- return Number(obj) as T;
- }
- if (Array.isArray(obj)) {
- return obj.map(serializeForJson) as T;
- }
- if (typeof obj === "object" && obj.constructor === Object) {
- const result: Record<string, unknown> = {};
- for (const [key, value] of Object.entries(obj)) {
- result[key] = serializeForJson(value);
- }
- return result as T;
- }
- return obj;
-}
diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.ts
index 592cbd5f98..760e5a345f 100644
--- a/apps/web/lib/zod/schemas/commissions.ts
+++ b/apps/web/lib/zod/schemas/commissions.ts
@@ -146,7 +146,7 @@ export const createCommissionSchema = z.object({
// Sale
saleEventDate: parseDateSchema.nullish(),
- saleAmount: centsSchema.min(0).nullish(),
+ saleAmount: centsSchema.pipe(z.number().min(0)).nullish(),
invoiceId: z.string().nullish(),
productId: z.string().nullish(),
});
diff --git a/apps/web/lib/zod/schemas/referrals.ts b/apps/web/lib/zod/schemas/referrals.ts
index 54878427b1..ec673389d6 100644
--- a/apps/web/lib/zod/schemas/referrals.ts
+++ b/apps/web/lib/zod/schemas/referrals.ts
@@ -106,9 +106,8 @@ export const updateReferralStatusSchema = z.discriminatedUnion("status", [
updateReferralStatusBaseSchema.extend({
status: z.literal("closedWon"),
- saleAmount: centsSchema.min(
- 0,
- "Sale amount must be greater than or equal to 0",
+ saleAmount: centsSchema.pipe(
+ z.number().min(0, "Sale amount must be greater than or equal to 0"),
),
stripeCustomerId: z.string().optional(),
}),