The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
formatUTCDateTimeClickhouse
Steven Tey29eac0346e0e
diff --git a/apps/web/app/(ee)/api/admin/revenue/get-top-programs-by-sales.ts b/apps/web/app/(ee)/api/admin/revenue/get-top-programs-by-sales.tsindex 1ff715845b..7ebe392fed 100644--- a/apps/web/app/(ee)/api/admin/revenue/get-top-programs-by-sales.ts+++ b/apps/web/app/(ee)/api/admin/revenue/get-top-programs-by-sales.ts@@ -1,3 +1,4 @@+import { formatUTCDateTimeClickhouse } from "@/lib/analytics/utils/format-utc-datetime-clickhouse";import { tb } from "@/lib/tinybird";import { prisma } from "@dub/prisma";import { ACME_PROGRAM_ID } from "@dub/utils";@@ -18,8 +19,8 @@ export async function getTopProgramsBySales({const response = await pipe({eventType: "sales",- start: startDate.toISOString().replace("T", " ").replace("Z", ""),- end: endDate.toISOString().replace("T", " ").replace("Z", ""),+ start: formatUTCDateTimeClickhouse(startDate),+ end: formatUTCDateTimeClickhouse(endDate),});const topProgramsData = response.data as {diff --git a/apps/web/app/api/og/analytics/route.tsx b/apps/web/app/api/og/analytics/route.tsxindex 494b1319f8..0190e44178 100644--- a/apps/web/app/api/og/analytics/route.tsx+++ b/apps/web/app/api/og/analytics/route.tsx@@ -1,3 +1,4 @@+import { formatUTCDateTimeClickhouse } from "@/lib/analytics/utils/format-utc-datetime-clickhouse";import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";import { Folder, Link } from "@dub/prisma/client";import { prismaEdge } from "@dub/prisma/edge";@@ -81,8 +82,8 @@ export async function GET(req: NextRequest) {...(workspaceId ? { workspaceId } : {}),...(folderId ? { folderId } : {}),...(linkId ? { linkId } : {}),- start: startDate.toISOString().replace("T", " ").replace("Z", ""),- end: endDate.toISOString().replace("T", " ").replace("Z", ""),+ start: formatUTCDateTimeClickhouse(startDate),+ end: formatUTCDateTimeClickhouse(endDate),granularity,},)}`,diff --git a/apps/web/app/api/workspaces/[idOrSlug]/billing/usage/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/billing/usage/route.tsindex dbb57fc726..a165f3d698 100644--- a/apps/web/app/api/workspaces/[idOrSlug]/billing/usage/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/billing/usage/route.ts@@ -1,3 +1,4 @@+import { formatUTCDateTimeClickhouse } from "@/lib/analytics/utils/format-utc-datetime-clickhouse";import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";import { withWorkspace } from "@/lib/auth";import { tb } from "@/lib/tinybird";@@ -40,8 +41,8 @@ export const GET = withWorkspace(async ({ searchParams, workspace }) => {const response = await pipe({resource,workspaceId: workspace.id,- start: startDate.toISOString().replace("T", " ").replace("Z", ""),- end: endDate.toISOString().replace("T", " ").replace("Z", ""),+ start: formatUTCDateTimeClickhouse(startDate),+ end: formatUTCDateTimeClickhouse(endDate),timezone,...(folderId && { folderId }),...(domain && { domain }),diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.tsindex 063d148d0c..4f1636133c 100644--- a/apps/web/lib/analytics/get-analytics.ts+++ b/apps/web/lib/analytics/get-analytics.ts@@ -14,6 +14,7 @@ import {} from "./constants";import { queryParser } from "./query-parser";import { AnalyticsFilters } from "./types";+import { formatUTCDateTimeClickhouse } from "./utils/format-utc-datetime-clickhouse";import { getStartEndDates } from "./utils/get-start-end-dates";// Fetch data for /api/analytics@@ -148,8 +149,8 @@ export const getAnalytics = async (params: AnalyticsFilters) => {workspaceId,tagIds,trigger,- start: startDate.toISOString().replace("T", " ").replace("Z", ""),- end: endDate.toISOString().replace("T", " ").replace("Z", ""),+ start: formatUTCDateTimeClickhouse(startDate),+ end: formatUTCDateTimeClickhouse(endDate),granularity,timezone,country,diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.tsindex f3df675f62..6f1afae2a7 100644--- a/apps/web/lib/analytics/get-events.ts+++ b/apps/web/lib/analytics/get-events.ts@@ -23,6 +23,7 @@ import {} from "../zod/schemas/sales";import { queryParser } from "./query-parser";import { EventsFilters } from "./types";+import { formatUTCDateTimeClickhouse } from "./utils/format-utc-datetime-clickhouse";import { getStartEndDates } from "./utils/get-start-end-dates";// Fetch data for /api/events@@ -33,7 +34,7 @@ export const getEvents = async (params: EventsFilters) => {interval,start,end,- timezone,+ timezone = "UTC",qr,trigger,region,@@ -89,8 +90,8 @@ export const getEvents = async (params: EventsFilters) => {region,order: sortOrder,offset: (params.page - 1) * params.limit,- start: startDate.toISOString().replace("T", " ").replace("Z", ""),- end: endDate.toISOString().replace("T", " ").replace("Z", ""),+ start: formatUTCDateTimeClickhouse(startDate),+ end: formatUTCDateTimeClickhouse(endDate),filters: filters ? JSON.stringify(filters) : undefined,});diff --git a/apps/web/lib/analytics/utils/format-utc-datetime-clickhouse.ts b/apps/web/lib/analytics/utils/format-utc-datetime-clickhouse.tsnew file mode 100644index 0000000000..a0ceb7f30e--- /dev/null+++ b/apps/web/lib/analytics/utils/format-utc-datetime-clickhouse.ts@@ -0,0 +1,8 @@+import { TZDate } from "@date-fns/tz";++export const formatUTCDateTimeClickhouse = (date: Date | TZDate) => {+ return new Date(date.getTime())+ .toISOString()+ .replace("T", " ")+ .replace("Z", "");+};diff --git a/apps/web/lib/analytics/utils/get-interval-data.ts b/apps/web/lib/analytics/utils/get-interval-data.tsindex adc51631ca..fe099cc5d2 100644--- a/apps/web/lib/analytics/utils/get-interval-data.ts+++ b/apps/web/lib/analytics/utils/get-interval-data.ts@@ -1,59 +1,57 @@+import { TZDate } from "@date-fns/tz";import { DUB_FOUNDING_DATE } from "@dub/utils";-import { DateTime } from "luxon";+import {+ startOfMonth,+ startOfQuarter,+ startOfYear,+ subDays,+ subHours,+ subMonths,+} from "date-fns";-export const INTERVAL_DATA: Record<+const INTERVAL_DATA: Record<string,({ timezone }: { timezone?: string }) => {- startDate: Date;+ startDate: TZDate;granularity: "minute" | "hour" | "day" | "month";}> = {- "24h": () => ({- startDate: new Date(Date.now() - 86400000),+ "24h": ({ timezone }) => ({+ startDate: subHours(new TZDate(Date.now(), timezone), 24),granularity: "hour",}),- "7d": () => ({- startDate: new Date(Date.now() - 604800000),+ "7d": ({ timezone }) => ({+ startDate: subDays(new TZDate(Date.now(), timezone), 7),granularity: "day",}),- "30d": () => ({- startDate: new Date(Date.now() - 2592000000),+ "30d": ({ timezone }) => ({+ startDate: subDays(new TZDate(Date.now(), timezone), 30),granularity: "day",}),- "90d": () => ({- startDate: new Date(Date.now() - 7776000000),+ "90d": ({ timezone }) => ({+ startDate: subDays(new TZDate(Date.now(), timezone), 90),granularity: "day",}),- "1y": () => ({- startDate: new Date(Date.now() - 31556952000),+ "1y": ({ timezone }) => ({+ startDate: subMonths(new TZDate(Date.now(), timezone), 12),granularity: "month",}),mtd: ({ timezone }) => {return {- startDate: timezone- ? DateTime.now().setZone(timezone).startOf("month").toJSDate()- : new Date(new Date().getFullYear(), new Date().getMonth(), 1),+ startDate: startOfMonth(new TZDate(Date.now(), timezone)),granularity: "day",};},qtd: ({ timezone }) => ({- startDate: timezone- ? DateTime.now().setZone(timezone).startOf("quarter").toJSDate()- : new Date(- new Date().getFullYear(),- Math.floor(new Date().getMonth() / 3) * 3,- 1,- ),+ startDate: startOfQuarter(new TZDate(Date.now(), timezone)),granularity: "day",}),ytd: ({ timezone }) => ({- startDate: timezone- ? DateTime.now().setZone(timezone).startOf("year").toJSDate()- : new Date(new Date().getFullYear(), 0, 1),+ startDate: startOfYear(new TZDate(Date.now(), timezone)),granularity: "month",}),- all: () => ({- startDate: DUB_FOUNDING_DATE,+ all: ({ timezone }) => ({+ startDate: new TZDate(DUB_FOUNDING_DATE, timezone),granularity: "month",}),};diff --git a/apps/web/lib/analytics/utils/get-start-end-dates.ts b/apps/web/lib/analytics/utils/get-start-end-dates.tsindex 4fcc2b28e3..a6f66a190b 100644--- a/apps/web/lib/analytics/utils/get-start-end-dates.ts+++ b/apps/web/lib/analytics/utils/get-start-end-dates.ts@@ -1,5 +1,5 @@-import { tz } from "@date-fns/tz";-import { differenceInDays, endOfDay } from "date-fns";+import { tz, TZDate } from "@date-fns/tz";+import { differenceInDays, endOfDay, startOfDay } from "date-fns";import { getIntervalData } from "./get-interval-data";export const getStartEndDates = ({@@ -15,15 +15,16 @@ export const getStartEndDates = ({dataAvailableFrom?: Date;timezone?: string;}) => {- let startDate: Date;- let endDate: Date;+ let startDate: TZDate;+ let endDate: TZDate;let granularity: "minute" | "hour" | "day" | "month" = "day";if (start || (interval === "all" && dataAvailableFrom)) {- startDate = new Date(start ?? dataAvailableFrom ?? Date.now());- endDate = new Date(- endOfDay(end ?? Date.now(), timezone ? { in: tz(timezone) } : undefined),+ startDate = new TZDate(+ startOfDay(start ?? dataAvailableFrom ?? Date.now()),+ timezone,);+ endDate = new TZDate(endOfDay(end ?? Date.now()), timezone);const daysDifference = differenceInDays(endDate,@@ -46,7 +47,7 @@ export const getStartEndDates = ({const intervalData = getIntervalData(interval, { timezone });startDate = intervalData.startDate;granularity = intervalData.granularity;- endDate = new Date(Date.now());+ endDate = new TZDate(endOfDay(Date.now()), timezone);}return { startDate, endDate, granularity };diff --git a/apps/web/lib/api/audit-logs/get-audit-logs.ts b/apps/web/lib/api/audit-logs/get-audit-logs.tsindex 75c11b840a..ca3dadeb18 100644--- a/apps/web/lib/api/audit-logs/get-audit-logs.ts+++ b/apps/web/lib/api/audit-logs/get-audit-logs.ts@@ -1,3 +1,4 @@+import { formatUTCDateTimeClickhouse } from "@/lib/analytics/utils/format-utc-datetime-clickhouse";import { tb } from "@/lib/tinybird";import { z } from "zod";import { prefixWorkspaceId } from "../workspaces/workspace-id";@@ -43,8 +44,8 @@ export const getAuditLogs = async ({const events = await pipe({workspaceId,programId,- start: start.toISOString().replace("T", " ").replace("Z", ""),- end: end.toISOString().replace("T", " ").replace("Z", ""),+ start: formatUTCDateTimeClickhouse(start),+ end: formatUTCDateTimeClickhouse(end),});return events.data;