The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
improve revenue dashboard
Steven Teybc3df1cf340d
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/revenue/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/revenue/page.tsxindex 7eed0344d9..84d09a611a 100644--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/revenue/page.tsx+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/revenue/page.tsx@@ -3,7 +3,7 @@import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";import { AnalyticsLoadingSpinner } from "@/ui/analytics/analytics-loading-spinner";import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";-import { useRouterStuff } from "@dub/ui";+import { Badge, useRouterStuff } from "@dub/ui";import { Areas, TimeSeriesChart, XAxis, YAxis } from "@dub/ui/charts";import { cn, currencyFormatter, fetcher } from "@dub/utils";import NumberFlow from "@number-flow/react";@@ -46,9 +46,6 @@ function RevenuePageClient() {const { getQueryString, queryParams, searchParamsObj } = useRouterStuff();const { interval, start, end, tab } = searchParamsObj;const selectedTab = isRevenueTab(tab) ? tab : "totalRevenue";- const selectedTabConfig =- revenueTabs.find((revenueTab) => revenueTab.id === selectedTab) ??- revenueTabs[0];const { data: { timeseries } = {}, isLoading } = useSWR<{timeseries: {@@ -67,28 +64,45 @@ function RevenuePageClient() {values,})) ?? null;- const totals = useMemo(- () => ({- totalRevenue:- timeseries?.reduce(- (acc, { totalRevenue }) => acc + (totalRevenue || 0),- 0,- ) ?? 0,- mrr: timeseries?.reduce((acc, { mrr }) => acc + (mrr || 0), 0) ?? 0,- payoutFees:- timeseries?.reduce(- (acc, { payoutFees }) => acc + (payoutFees || 0),- 0,- ) ?? 0,- }),- [timeseries],- );+ const totals = useMemo(() => {+ const finalMrr = timeseries?.[timeseries.length - 1]?.mrr ?? 0;+ const finalPayoutFees =+ timeseries?.[timeseries.length - 1]?.payoutFees ?? 0;+ return {+ totalRevenue: finalMrr + finalPayoutFees,+ mrr: finalMrr,+ payoutFees: finalPayoutFees,+ };+ }, [timeseries]);++ const percentChanges = useMemo(() => {+ const getPercentChange = (key: RevenueTab) => {+ if (!timeseries || timeseries.length === 0) {+ return null;+ }++ const first = timeseries[0]?.[key] ?? 0;+ const last = timeseries[timeseries.length - 1]?.[key] ?? 0;++ if (first === 0) {+ return last === 0 ? 0 : null;+ }++ return (last / first - 1) * 100;+ };++ return {+ totalRevenue: getPercentChange("totalRevenue"),+ mrr: getPercentChange("mrr"),+ payoutFees: getPercentChange("payoutFees"),+ };+ }, [timeseries]);return (<div className="mx-auto flex w-full max-w-screen-xl flex-col space-y-6 p-6"><SimpleDateRangePicker- defaultInterval="mtd"- presets={["30d", "90d", "mtd", "qtd", "ytd", "1y", "all"]}+ defaultInterval="30d"+ presets={["30d", "mtd", "qtd", "ytd", "1y", "all"]}className="w-fit"/><div className="flex flex-col divide-y divide-neutral-200 rounded-lg border border-neutral-200 bg-white">@@ -121,16 +135,34 @@ function RevenuePageClient() {</div><div className="mt-1 flex h-12 items-center">{(totals[id] || totals[id] === 0) && !isLoading ? (- <NumberFlow- value={(totals[id] ?? 0) / 100}- className="text-xl font-medium sm:text-3xl"- format={{- style: "currency",- currency: "USD",- // @ts-ignore – trailingZeroDisplay is a valid option but TS is outdated- trailingZeroDisplay: "stripIfInteger",- }}- />+ <div className="flex items-center gap-2">+ <NumberFlow+ value={(totals[id] ?? 0) / 100}+ className="text-xl font-medium sm:text-3xl"+ format={{+ style: "currency",+ currency: "USD",+ // @ts-ignore – trailingZeroDisplay is a valid option but TS is outdated+ trailingZeroDisplay: "stripIfInteger",+ }}+ />+ {percentChanges[id] !== null ? (+ <Badge+ variant={+ (percentChanges[id] ?? 0) >= 0 ? "green" : "gray"+ }+ className={cn(+ "rounded-md px-2 py-1 text-xs",+ (percentChanges[id] ?? 0) >= 0+ ? "text-green-700"+ : "text-red-700",+ )}+ >+ {(percentChanges[id] ?? 0) >= 0 ? "+" : ""}+ {(percentChanges[id] ?? 0).toFixed(1)}%+ </Badge>+ ) : null}+ </div>) : (<div className="h-10 w-24 animate-pulse rounded-md bg-neutral-200" />)}@@ -154,16 +186,13 @@ function RevenuePageClient() {{id: "mrr",valueAccessor: (d) => d.values.mrr,- isActive:- selectedTab === "mrr" || selectedTab === "totalRevenue",+ isActive: selectedTab === "mrr",colorClassName: revenueTabs[1].colorClassName,},{id: "payoutFees",valueAccessor: (d) => d.values.payoutFees,- isActive:- selectedTab === "payoutFees" ||- selectedTab === "totalRevenue",+ isActive: selectedTab === "payoutFees",colorClassName: revenueTabs[2].colorClassName,},]}diff --git a/apps/web/app/(ee)/api/admin/payouts/get-payouts-timeseries.ts b/apps/web/app/(ee)/api/admin/payouts/get-payouts-timeseries.tsindex f881623140..5d6d2c1372 100644--- a/apps/web/app/(ee)/api/admin/payouts/get-payouts-timeseries.ts+++ b/apps/web/app/(ee)/api/admin/payouts/get-payouts-timeseries.ts@@ -1,6 +1,6 @@import { sqlGranularityMap } from "@/lib/planetscale/granularity";-import { prisma } from "@dub/prisma";-import { InvoiceStatus, Prisma } from "@dub/prisma/client";+import { conn } from "@/lib/planetscale/connection";+import { InvoiceStatus } from "@dub/prisma/client";import { ACME_PROGRAM_ID } from "@dub/utils";import { format } from "date-fns";@@ -14,6 +14,9 @@ export interface FormattedPayoutsTimeseriesPoint extends TimeseriesPoint {date: Date;}+const toSqlDateTime = (date: Date) =>+ date.toISOString().slice(0, 19).replace("T", " ");+export async function getPayoutsTimeseries({programId,status,@@ -32,23 +35,47 @@ export async function getPayoutsTimeseries({const { dateFormat, dateIncrement, startFunction, formatString } =sqlGranularityMap[granularity];- const timeseriesData = await prisma.$queryRaw<- { date: Date; payouts: number; fees: number; total: number }[]- >`- SELECT- DATE_FORMAT(CONVERT_TZ(createdAt, "UTC", ${timezone}), ${dateFormat}) as date,+ const whereClauses: string[] = ["createdAt >= ?", "createdAt <= ?"];+ const queryParams: string[] = [+ toSqlDateTime(startDate),+ toSqlDateTime(endDate),+ ];++ if (programId) {+ whereClauses.unshift("programId = ?");+ queryParams.unshift(programId);+ } else {+ whereClauses.unshift("programId != ?");+ queryParams.unshift(ACME_PROGRAM_ID);+ }++ if (status) {+ whereClauses.push("status = ?");+ queryParams.push(status);+ } else {+ whereClauses.push("status != ?");+ queryParams.push("failed");+ }++ const { rows } = await conn.execute<{+ date: string;+ payouts: number;+ fees: number;+ total: number;+ }>(+ `SELECT+ DATE_FORMAT(CONVERT_TZ(createdAt, "UTC", ?), ?) as date,SUM(amount) as payouts,SUM(fee) as fees,SUM(total) as totalFROM Invoice- WHERE- ${programId ? Prisma.sql`programId = ${programId}` : Prisma.sql`programId != ${ACME_PROGRAM_ID}`}- AND ${status ? Prisma.sql`status = ${status}` : Prisma.sql`status != 'failed'`}- AND createdAt >= ${startDate}- AND createdAt <= ${endDate}- GROUP BY DATE_FORMAT(CONVERT_TZ(createdAt, "UTC", ${timezone}), ${dateFormat})- ORDER BY date ASC;- `;+ WHERE ${whereClauses.join(" AND ")}+ GROUP BY DATE_FORMAT(CONVERT_TZ(createdAt, "UTC", ?), ?)+ ORDER BY date ASC`,+ [timezone, dateFormat, ...queryParams, timezone, dateFormat],+ );++ const timeseriesData = rows ?? [];const timeseriesLookup: Record<string, TimeseriesPoint> = Object.fromEntries(timeseriesData.map((item) => [diff --git a/apps/web/app/(ee)/api/admin/revenue/get-mrr-timeseries.ts b/apps/web/app/(ee)/api/admin/revenue/get-mrr-timeseries.tsindex 24fb3182fd..bf8020ec49 100644--- a/apps/web/app/(ee)/api/admin/revenue/get-mrr-timeseries.ts+++ b/apps/web/app/(ee)/api/admin/revenue/get-mrr-timeseries.ts@@ -1,4 +1,4 @@-import { differenceInDays } from "date-fns";+import { differenceInDays, min } from "date-fns";type RevenueGranularity = "day" | "month";@@ -7,7 +7,7 @@ type StripeMetricQueryResponse = {timestamp: string;results: {name?: string;- value: number;+ value: string;}[];}[];};@@ -58,7 +58,7 @@ export async function getMrrByBucket({granularity: RevenueGranularity;}) {if (!process.env.STRIPE_SECRET_KEY) {- return new Map<string, number>();+ throw new Error("Missing STRIPE_SECRET_KEY.");}const response = await fetch(@@ -72,8 +72,9 @@ export async function getMrrByBucket({},body: JSON.stringify({metrics: [{ name: "revenue.mrr" }],- starts_at: startDate.toISOString(),- ends_at: endDate.toISOString(),+ starts_at: startDate,+ // make sure end date is not in the future+ ends_at: min([endDate, new Date()]),granularity: getStripeGranularity({ granularity, startDate, endDate }),currency: "usd",}),@@ -88,11 +89,20 @@ export async function getMrrByBucket({const lookup = new Map<string, number>();(responseBody as StripeMetricQueryResponse).data?.forEach((row) => {const key = getBucketKey(row.timestamp, granularity);- const mrr =- row.results.find((result) => result.name === "revenue.mrr")?.value ?? 0;+ const mrr = parseInt(+ row.results.find((result) => result.name === "revenue.mrr")?.value ??+ "0",+ );lookup.set(key, (lookup.get(key) ?? 0) + mrr);});return lookup;}- return new Map<string, number>();++ const stripeError = (responseBody as StripeErrorResponse).error;+ const stripeMessage =+ stripeError?.message ??+ `Stripe MRR metric query failed with status ${response.status}.`;+ const stripeCode = stripeError?.code ? ` [${stripeError.code}]` : "";++ throw new Error(`${stripeMessage}${stripeCode}`);}diff --git a/apps/web/app/(ee)/api/admin/revenue/route.ts b/apps/web/app/(ee)/api/admin/revenue/route.tsindex ddbaac674e..fc9bf9a5d9 100644--- a/apps/web/app/(ee)/api/admin/revenue/route.ts+++ b/apps/web/app/(ee)/api/admin/revenue/route.ts@@ -2,7 +2,7 @@ import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";import { withAdmin } from "@/lib/auth";import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";import { DUB_FOUNDING_DATE } from "@dub/utils";-import { endOfDay, startOfDay } from "date-fns";+import { differenceInDays, endOfDay, startOfDay } from "date-fns";import { NextResponse } from "next/server";import * as z from "zod/v4";import { getPayoutsTimeseries } from "../payouts/get-payouts-timeseries";@@ -16,7 +16,7 @@ const adminRevenueQuerySchema = zexport const GET = withAdmin(async ({ searchParams }) => {const {- interval = "mtd",+ interval = "30d",start,end,} = adminRevenueQuerySchema.parse(searchParams);@@ -31,6 +31,8 @@ export const GET = withAdmin(async ({ searchParams }) => {});const revenueGranularity = granularity === "month" ? "month" : "day";+ const shouldUseCumulativePayoutFees =+ differenceInDays(endDate, startDate) <= 30;const [mrrLookup, payoutTimeseries] = await Promise.all([getMrrByBucket({@@ -49,20 +51,21 @@ export const GET = withAdmin(async ({ searchParams }) => {}),]);- console.log({ payoutTimeseries });-+ let cumulativePayoutFees = 0;const timeseries = payoutTimeseries.map(({ date, fees }) => {+ cumulativePayoutFees += fees;const mrr = mrrLookup.get(getBucketKey(date, revenueGranularity)) ?? 0;+ const payoutFees = shouldUseCumulativePayoutFees+ ? cumulativePayoutFees+ : fees;return {date,mrr,- payoutFees: fees,- totalRevenue: mrr + fees,+ payoutFees,+ totalRevenue: mrr + payoutFees,};});- console.log({ timeseries });-return NextResponse.json({timeseries,});