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.

address coderabbit feedback

Steven Teya24466800df9
diff --git a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
index b94176f7d7..f4adf745ac 100644
--- a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
+++ b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
@@ -112,8 +112,8 @@ export async function POST(req: Request) {
const eventsFilters = {
...parsedParams,
workspaceId: program.workspaceId,
- ...(linkId
- ? { linkId }
+ ...(parsedParams.linkId
+ ? { linkId: parsedParams.linkId }
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId }
: { linkId: parseFilterValue(links.map((link) => link.id)) }),
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
index f4ffff82e7..e8805318d8 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
@@ -39,13 +39,9 @@ export const GET = withPartnerProfile(
// Early return if partner has no links
if (links.length === 0) {
- const zip = new JSZip();
- const zipData = await zip.generateAsync({ type: "nodebuffer" });
- return new Response(zipData as unknown as BodyInit, {
- headers: {
- "Content-Type": "application/zip",
- "Content-Disposition": "attachment; filename=analytics_export.zip",
- },
+ throw new DubApiError({
+ code: "not_found",
+ message: "No links found",
});
}
@@ -70,6 +66,14 @@ export const GET = withPartnerProfile(
.filter((link) => !linkId.values.includes(link.id))
.map((link) => link.id);
+ // early return if no links are left
+ if (finalIncludedLinkIds.length === 0) {
+ throw new DubApiError({
+ code: "not_found",
+ message: "No links found",
+ });
+ }
+
parsedParams.linkId = {
operator: "IS",
sqlOperator: "IN",
@@ -108,8 +112,8 @@ export const GET = withPartnerProfile(
const response = await getAnalytics({
...parsedParams,
workspaceId: program.workspaceId,
- ...(linkId
- ? { linkId }
+ ...(parsedParams.linkId
+ ? { linkId: parsedParams.linkId }
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId: partner.id }
: { linkId: parseFilterValue(links.map((link) => link.id)) }),
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
index d22ba8e813..1f40c8591b 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
@@ -51,6 +51,11 @@ export const GET = withPartnerProfile(
.filter((link) => !linkId.values.includes(link.id))
.map((link) => link.id);
+ // early return if no links are left
+ if (finalIncludedLinkIds.length === 0) {
+ return NextResponse.json([], { status: 200 });
+ }
+
parsedParams.linkId = {
operator: "IS",
sqlOperator: "IN",
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts
index 958c0f0b74..33e1a26bb6 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts
@@ -55,11 +55,9 @@ export const GET = withPartnerProfile(
// early return if partner has no links
if (links.length === 0) {
- return new Response("", {
- headers: {
- "Content-Type": "application/csv",
- "Content-Disposition": `attachment; filename=events_export.csv`,
- },
+ throw new DubApiError({
+ code: "not_found",
+ message: "No links found",
});
}
@@ -113,6 +111,14 @@ export const GET = withPartnerProfile(
.filter((link) => !linkId.values.includes(link.id))
.map((link) => link.id);
+ // early return if no links are left
+ if (finalIncludedLinkIds.length === 0) {
+ throw new DubApiError({
+ code: "not_found",
+ message: "No links found",
+ });
+ }
+
parsedParams.linkId = {
operator: "IS",
sqlOperator: "IN",
@@ -183,8 +189,8 @@ export const GET = withPartnerProfile(
const events = await getEvents({
...parsedParams,
workspaceId: program.workspaceId,
- ...(linkId
- ? { linkId }
+ ...(parsedParams.linkId
+ ? { linkId: parsedParams.linkId }
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId: partner.id }
: { linkId: parseFilterValue(links.map((link) => link.id)) }),
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
index 23ffdcf885..d3d2e7ec07 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
@@ -65,6 +65,11 @@ export const GET = withPartnerProfile(
.filter((link) => !linkId.values.includes(link.id))
.map((link) => link.id);
+ // early return if no links are left
+ if (finalIncludedLinkIds.length === 0) {
+ return NextResponse.json([], { status: 200 });
+ }
+
parsedParams.linkId = {
operator: "IS",
sqlOperator: "IN",
@@ -93,8 +98,8 @@ export const GET = withPartnerProfile(
const events = await getEvents({
...parsedParams,
workspaceId: program.workspaceId,
- ...(linkId
- ? { linkId }
+ ...(parsedParams.linkId
+ ? { linkId: parsedParams.linkId }
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId: partner.id }
: { linkId: parseFilterValue(links.map((link) => link.id)) }),
diff --git a/apps/web/tests/analytics/partner-analytics.test.ts b/apps/web/tests/analytics/partner-analytics.test.ts
index f10e72c038..3b431bbac3 100644
--- a/apps/web/tests/analytics/partner-analytics.test.ts
+++ b/apps/web/tests/analytics/partner-analytics.test.ts
@@ -1,8 +1,8 @@
import { analyticsResponse } from "@/lib/zod/schemas/analytics-response";
-import { IntegrationHarnessOld } from "tests/utils/integration-old";
import { describe, expect, test } from "vitest";
import * as z from "zod/v4";
import { env } from "../utils/env";
+import { IntegrationHarnessOld } from "../utils/integration-old";
import { E2E_PARTNER, E2E_PROGRAM } from "../utils/resource";
describe