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.

Swap reversed analytics dates before picking the granularity

Rafid9519b154ea0
diff --git a/apps/web/lib/analytics/utils/get-start-end-dates.ts b/apps/web/lib/analytics/utils/get-start-end-dates.ts
index 28de2e9656..f43dc003e7 100644
--- a/apps/web/lib/analytics/utils/get-start-end-dates.ts
+++ b/apps/web/lib/analytics/utils/get-start-end-dates.ts
@@ -23,10 +23,16 @@ export const getStartEndDates = ({
let granularity: "hour" | "day" | "month" = "day";
if (start || (interval === "all" && dataAvailableFrom)) {
- startDate = startOfDay(
- new TZDate(new Date(start ?? dataAvailableFrom ?? Date.now()), timezone),
- );
- endDate = endOfDay(new TZDate(new Date(end ?? Date.now()), timezone));
+ let rangeStart = new Date(start ?? dataAvailableFrom ?? Date.now());
+ let rangeEnd = new Date(end ?? Date.now());
+
+ // Swap start and end if start is greater than end, before the day boundaries and the granularity are set
+ if (rangeStart > rangeEnd) {
+ [rangeStart, rangeEnd] = [rangeEnd, rangeStart];
+ }
+
+ startDate = startOfDay(new TZDate(rangeStart, timezone));
+ endDate = endOfDay(new TZDate(rangeEnd, timezone));
const daysDifference = differenceInDays(endDate, startDate, {
in: tz(timezone),
@@ -37,11 +43,6 @@ export const getStartEndDates = ({
} else if (daysDifference > 90) {
granularity = "month";
}
-
- // Swap start and end if start is greater than end
- if (startDate > endDate) {
- [startDate, endDate] = [endDate, startDate];
- }
} else {
interval = interval ?? "30d";
const intervalData = getIntervalData(interval, { timezone });