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.

fix sqlGranularityMap

Steven Tey8aebe7da71d8
diff --git a/apps/web/app/(ee)/api/admin/payouts/route.ts b/apps/web/app/(ee)/api/admin/payouts/route.ts
index 93ed2843e6..9d1febd444 100644
--- a/apps/web/app/(ee)/api/admin/payouts/route.ts
+++ b/apps/web/app/(ee)/api/admin/payouts/route.ts
@@ -5,7 +5,7 @@ import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
import { prisma } from "@dub/prisma";
import { InvoiceStatus, Prisma } from "@dub/prisma/client";
import { ACME_PROGRAM_ID } from "@dub/utils";
-import { DateTime } from "luxon";
+import { endOfDay, format, startOfDay } from "date-fns";
import { NextResponse } from "next/server";
import { z } from "zod";
@@ -35,25 +35,17 @@ export const GET = withAdmin(async ({ searchParams }) => {
end,
} = adminPayoutsQuerySchema.parse(searchParams);
+ const timezone = "UTC";
let { startDate, endDate, granularity } = getStartEndDates({
interval,
start,
end,
+ timezone,
});
- const timezone = "UTC";
- // convert to UTC
- startDate = DateTime.fromJSDate(startDate)
- .setZone(timezone)
- .startOf("day")
- .toUTC()
- .toJSDate();
-
- endDate = DateTime.fromJSDate(endDate)
- .setZone(timezone)
- .endOf("day")
- .toUTC()
- .toJSDate();
+ // Ensure start/end of day in UTC
+ startDate = startOfDay(startDate);
+ endDate = endOfDay(endDate);
// Fetch invoices
const invoices = await prisma.invoice.findMany({
@@ -142,17 +134,15 @@ export const GET = withAdmin(async ({ searchParams }) => {
);
// Backfill missing dates with 0 values
- let currentDate = startFunction(
- DateTime.fromJSDate(startDate).setZone(timezone),
- );
+ let currentDate = startFunction(startDate);
const formattedTimeseriesData: FormattedTimeseriesPoint[] = [];
- while (currentDate.toJSDate() < endDate) {
- const periodKey = currentDate.toFormat(formatString);
+ while (currentDate < endDate) {
+ const periodKey = format(currentDate, formatString);
formattedTimeseriesData.push({
- date: currentDate.toJSDate(),
+ date: currentDate,
...(timeseriesLookup[periodKey] || {
payouts: 0,
fees: 0,
diff --git a/apps/web/app/(ee)/api/commissions/timeseries/route.ts b/apps/web/app/(ee)/api/commissions/timeseries/route.ts
index db5bb2d16e..bdab0470c6 100644
--- a/apps/web/app/(ee)/api/commissions/timeseries/route.ts
+++ b/apps/web/app/(ee)/api/commissions/timeseries/route.ts
@@ -5,7 +5,7 @@ import { withWorkspace } from "@/lib/auth";
import { sqlGranularityMap } from "@/lib/planetscale/granularity";
import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
import { prisma } from "@dub/prisma";
-import { DateTime } from "luxon";
+import { format } from "date-fns";
import { NextResponse } from "next/server";
const querySchema = analyticsQuerySchema.pick({
@@ -59,9 +59,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
ORDER BY start ASC;`;
console.timeEnd("getCommissionsTimeseries");
- let currentDate = startFunction(
- DateTime.fromJSDate(startDate).setZone(timezone || "UTC"),
- );
+ let currentDate = startFunction(startDate);
const earningsLookup = Object.fromEntries(
commissions.map((item) => [
@@ -74,11 +72,11 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
const timeseries: Commission[] = [];
- while (currentDate.toJSDate() < endDate) {
- const periodKey = currentDate.toFormat(formatString);
+ while (currentDate < endDate) {
+ const periodKey = format(currentDate, formatString);
timeseries.push({
- start: currentDate.toISO()!,
+ start: currentDate.toISOString(),
...(earningsLookup[periodKey] || {
earnings: 0,
}),
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts
index 078c590f37..d68d4ec589 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts
@@ -5,7 +5,7 @@ import { sqlGranularityMap } from "@/lib/planetscale/granularity";
import { getPartnerEarningsTimeseriesSchema } from "@/lib/zod/schemas/partner-profile";
import { prisma } from "@dub/prisma";
import { Prisma } from "@prisma/client";
-import { DateTime } from "luxon";
+import { format } from "date-fns";
import { NextResponse } from "next/server";
// GET /api/partner-profile/programs/[programId]/earnings/timeseries - get timeseries chart for a partner's earnings
@@ -76,9 +76,7 @@ export const GET = withPartnerProfile(
groupBy?: string;
data?: Record<string, number>;
}[] = [];
- let currentDate = startFunction(
- DateTime.fromJSDate(startDate).setZone(timezone || "UTC"),
- );
+ let currentDate = startFunction(startDate);
const commissionLookup = earnings.reduce((acc, item) => {
if (!(item.start in acc)) acc[item.start] = { earnings: 0 };
@@ -89,12 +87,12 @@ export const GET = withPartnerProfile(
return acc;
}, {});
- while (currentDate.toJSDate() < endDate) {
- const periodKey = currentDate.toFormat(formatString);
+ while (currentDate < endDate) {
+ const periodKey = format(currentDate, formatString);
const { earnings, ...rest } = commissionLookup[periodKey] || {};
timeseries.push({
- start: currentDate.toISO()!,
+ start: currentDate.toISOString(),
earnings: earnings || 0,
groupBy: groupBy || undefined,
data: groupBy
diff --git a/apps/web/lib/planetscale/granularity.ts b/apps/web/lib/planetscale/granularity.ts
index 164720e939..11c4e6367e 100644
--- a/apps/web/lib/planetscale/granularity.ts
+++ b/apps/web/lib/planetscale/granularity.ts
@@ -1,36 +1,45 @@
-import { DateTime } from "luxon";
+import {
+ addDays,
+ addHours,
+ addMinutes,
+ addMonths,
+ startOfDay,
+ startOfHour,
+ startOfMinute,
+ startOfMonth,
+} from "date-fns";
export const sqlGranularityMap: Record<
string,
{
dateFormat: string;
- dateIncrement: (dt: DateTime) => DateTime;
- startFunction: (dt: DateTime) => DateTime;
+ dateIncrement: (dt: Date) => Date;
+ startFunction: (dt: Date) => Date;
formatString: string;
}
> = {
month: {
dateFormat: "%Y-%m",
- dateIncrement: (dt) => dt.plus({ month: 1 }),
- startFunction: (dt) => dt.startOf("month"),
+ dateIncrement: (dt) => addMonths(dt, 1),
+ startFunction: (dt) => startOfMonth(dt),
formatString: "yyyy-MM",
},
day: {
dateFormat: "%Y-%m-%d",
- dateIncrement: (dt) => dt.plus({ day: 1 }),
- startFunction: (dt) => dt.startOf("day"),
+ dateIncrement: (dt) => addDays(dt, 1),
+ startFunction: (dt) => startOfDay(dt),
formatString: "yyyy-MM-dd",
},
hour: {
dateFormat: "%Y-%m-%d %H:00",
- dateIncrement: (dt) => dt.plus({ hour: 1 }),
- startFunction: (dt) => dt.startOf("hour"),
+ dateIncrement: (dt) => addHours(dt, 1),
+ startFunction: (dt) => startOfHour(dt),
formatString: "yyyy-MM-dd HH:00",
},
minute: {
dateFormat: "%Y-%m-%d %H:%i",
- dateIncrement: (dt) => dt.plus({ minute: 1 }),
- startFunction: (dt) => dt.startOf("minute"),
+ dateIncrement: (dt) => addMinutes(dt, 1),
+ startFunction: (dt) => startOfMinute(dt),
formatString: "yyyy-MM-dd HH:mm",
},
} as const;