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.

use trailing 6-months rolling average

Steven Tey86535ff54e40
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.tsx
index 3da96e5c97..22d0689ce7 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 { Badge, useRouterStuff } from "@dub/ui";
+import { Badge, InfoTooltip, 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";
@@ -24,9 +24,11 @@ const revenueTabs = [
{
id: "payoutFees",
label: "Payout Fees",
+ labelTooltip:
+ "Payout fees are computed based on a trailing 6-month rolling average.",
colorClassName: "text-orange-500 bg-orange-500/50 border-orange-500",
},
-] as const;
+];
type RevenueTab = (typeof revenueTabs)[number]["id"];
@@ -145,14 +147,10 @@ function RevenuePageClient() {
return (
<div className="mx-auto flex w-full max-w-screen-xl flex-col space-y-6 p-6">
- <SimpleDateRangePicker
- defaultInterval="30d"
- presets={["30d", "mtd", "qtd", "ytd", "1y", "all"]}
- className="w-fit"
- />
+ <SimpleDateRangePicker defaultInterval="30d" className="w-fit" />
<div className="flex flex-col divide-y divide-neutral-200 rounded-lg border border-neutral-200 bg-white">
<div className="grid w-full grid-cols-1 divide-x sm:grid-cols-3">
- {revenueTabs.map(({ id, label, colorClassName }) => (
+ {revenueTabs.map(({ id, label, colorClassName, labelTooltip }) => (
<button
key={id}
onClick={() =>
@@ -177,6 +175,7 @@ function RevenuePageClient() {
)}
/>
<span>{label}</span>
+ {labelTooltip ? <InfoTooltip content={labelTooltip} /> : null}
</div>
<div className="mt-1 flex h-12 items-center">
{(totals[id] || totals[id] === 0) && !isLoading ? (
diff --git a/apps/web/app/(ee)/api/admin/revenue/get-rolling-payout-fees.ts b/apps/web/app/(ee)/api/admin/revenue/get-rolling-payout-fees.ts
new file mode 100644
index 0000000000..336a6f4e71
--- /dev/null
+++ b/apps/web/app/(ee)/api/admin/revenue/get-rolling-payout-fees.ts
@@ -0,0 +1,26 @@
+import { subMonths } from "date-fns";
+
+export const ROLLING_PAYOUT_FEES_WINDOW_MONTHS = 6;
+
+export function computeRollingAveragePayoutFees(
+ timeseries: { date: Date; fees: number }[],
+ windowMonths = ROLLING_PAYOUT_FEES_WINDOW_MONTHS,
+): number[] {
+ const averages: number[] = [];
+ let windowSum = 0;
+ let windowStartIdx = 0;
+
+ for (let i = 0; i < timeseries.length; i++) {
+ const windowStart = subMonths(timeseries[i].date, windowMonths);
+
+ while (windowStartIdx < i && timeseries[windowStartIdx].date < windowStart) {
+ windowSum -= timeseries[windowStartIdx].fees;
+ windowStartIdx++;
+ }
+
+ windowSum += timeseries[i].fees;
+ averages.push(windowSum / windowMonths);
+ }
+
+ return averages;
+}
diff --git a/apps/web/app/(ee)/api/admin/revenue/route.ts b/apps/web/app/(ee)/api/admin/revenue/route.ts
index b4c46cc6b1..9b45f3ea14 100644
--- a/apps/web/app/(ee)/api/admin/revenue/route.ts
+++ b/apps/web/app/(ee)/api/admin/revenue/route.ts
@@ -2,11 +2,12 @@ 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 { differenceInDays } from "date-fns";
+import { subMonths } from "date-fns";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
import { getPayoutsTimeseries } from "../payouts/get-payouts-timeseries";
import { getBucketKey, getMrrByBucket } from "./get-mrr-timeseries";
+import { computeRollingAveragePayoutFees } from "./get-rolling-payout-fees";
const adminRevenueQuerySchema = z
.object({})
@@ -31,10 +32,9 @@ export const GET = withAdmin(async ({ searchParams }) => {
});
const revenueGranularity = granularity === "month" ? "month" : "day";
- const shouldUseCumulativePayoutFees =
- differenceInDays(endDate, startDate) <= 30;
+ const payoutHistoryStartDate = subMonths(startDate, 6);
- const [mrrLookup, payoutTimeseries] = await Promise.all([
+ const [mrrLookup, payoutTimeseriesWithHistory] = await Promise.all([
getMrrByBucket({
startDate,
endDate,
@@ -44,7 +44,7 @@ export const GET = withAdmin(async ({ searchParams }) => {
return new Map<string, number>();
}),
getPayoutsTimeseries({
- startDate,
+ startDate: payoutHistoryStartDate,
endDate,
granularity: revenueGranularity,
timezone,
@@ -52,20 +52,22 @@ export const GET = withAdmin(async ({ searchParams }) => {
}),
]);
- 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,
- totalRevenue: mrr + payoutFees,
- };
- });
+ const rollingAveragePayoutFees = computeRollingAveragePayoutFees(
+ payoutTimeseriesWithHistory,
+ );
+
+ const timeseries = payoutTimeseriesWithHistory
+ .map(({ date }, index) => {
+ const mrr = mrrLookup.get(getBucketKey(date, revenueGranularity)) ?? 0;
+ const payoutFees = rollingAveragePayoutFees[index];
+ return {
+ date,
+ mrr,
+ payoutFees,
+ totalRevenue: mrr + payoutFees,
+ };
+ })
+ .filter(({ date }) => date >= startDate);
return NextResponse.json({
timeseries,