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 getStartEndDates

Steven Tey36107c8aa367
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/count/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/count/route.ts
index 93675c4a08..15289464ce 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/count/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/count/route.ts
@@ -46,8 +46,8 @@ export const GET = withPartnerProfile(
partnerId: partner.id,
...(payoutId && { payoutId }),
createdAt: {
- gte: startDate.toISOString(),
- lte: endDate.toISOString(),
+ gte: startDate,
+ lte: endDate,
},
};
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/route.ts
index ff2a13abbd..d4981bbccb 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/route.ts
@@ -58,8 +58,8 @@ export const GET = withPartnerProfile(
customerId,
payoutId,
createdAt: {
- gte: startDate.toISOString(),
- lte: endDate.toISOString(),
+ gte: startDate,
+ lte: endDate,
},
},
include: {
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/page-client.tsx
index 2ef4721819..a74a5edf79 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/page-client.tsx
@@ -47,11 +47,7 @@ export default function ProgramOverviewPageClient() {
const queryString = new URLSearchParams({
programId: defaultProgramId ?? "",
workspaceId: workspaceId ?? "",
- ...(start &&
- end && {
- start: new Date(start).toISOString(),
- end: new Date(end).toISOString(),
- }),
+ ...(start && end && { start, end }),
...(interval && { interval: interval.toString() }),
timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
}).toString();
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 3e0a94a035..cf0832cbd5 100644
--- a/apps/web/lib/analytics/utils/get-start-end-dates.ts
+++ b/apps/web/lib/analytics/utils/get-start-end-dates.ts
@@ -1,4 +1,4 @@
-import { getDaysDifference } from "@dub/utils";
+import { differenceInDays, endOfDay } from "date-fns";
import { getIntervalData } from "./get-interval-data";
export const getStartEndDates = ({
@@ -20,9 +20,9 @@ export const getStartEndDates = ({
if (start || (interval === "all" && dataAvailableFrom)) {
startDate = new Date(start ?? dataAvailableFrom ?? Date.now());
- endDate = new Date(end ?? Date.now());
+ endDate = new Date(endOfDay(end ?? Date.now()));
- const daysDifference = getDaysDifference(startDate, endDate);
+ const daysDifference = differenceInDays(startDate, endDate);
if (daysDifference <= 2) {
granularity = "hour";
diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.ts
index 6542426cc6..2ca1e32461 100644
--- a/apps/web/lib/api/commissions/get-commissions-count.ts
+++ b/apps/web/lib/api/commissions/get-commissions-count.ts
@@ -51,8 +51,8 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
payoutId,
customerId,
createdAt: {
- gte: startDate.toISOString(),
- lte: endDate.toISOString(),
+ gte: startDate,
+ lte: endDate,
},
...(groupId && {
programEnrollment: {
diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.ts
index 60c8be0e1d..89378c961e 100644
--- a/apps/web/lib/api/commissions/get-commissions.ts
+++ b/apps/web/lib/api/commissions/get-commissions.ts
@@ -1,6 +1,7 @@
import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
import { getCommissionsQuerySchema } from "@/lib/zod/schemas/commissions";
import { prisma } from "@dub/prisma";
+import { CommissionStatus } from "@prisma/client";
import { z } from "zod";
type CommissionsFilters = z.infer<typeof getCommissionsQuerySchema> & {
@@ -46,13 +47,19 @@ export async function getCommissions(filters: CommissionsFilters) {
},
programId,
partnerId,
- status,
+ status: status ?? {
+ notIn: [
+ CommissionStatus.duplicate,
+ CommissionStatus.fraud,
+ CommissionStatus.canceled,
+ ],
+ },
type,
customerId,
payoutId,
createdAt: {
- gte: startDate.toISOString(),
- lte: endDate.toISOString(),
+ gte: startDate,
+ lte: endDate,
},
...(groupId && {
programEnrollment: {