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.

Select partner tags from the enrollment instead of the partner

Rafi76c15de5d5f6
diff --git a/apps/web/lib/api/partners/search/serialize-document.ts b/apps/web/lib/api/partners/search/serialize-document.ts
index 744111a2d3..ad384235eb 100644
--- a/apps/web/lib/api/partners/search/serialize-document.ts
+++ b/apps/web/lib/api/partners/search/serialize-document.ts
@@ -1,5 +1,5 @@
-import { Prisma } from "@prisma/client";
import { unique } from "@dub/utils";
+import { Prisma } from "@prisma/client";
import { PartnerSearchDocument } from "./types";
export const partnerSearchDocumentSelect = {
@@ -16,14 +16,6 @@ export const partnerSearchDocumentSelect = {
companyName: true,
description: true,
country: true,
- // Tags are per (program, partner) and this select cannot take a program,
- // so the serializer narrows them to the enrollment's own program.
- programPartnerTags: {
- select: {
- programId: true,
- partnerTagId: true,
- },
- },
platforms: {
select: {
type: true,
@@ -37,6 +29,11 @@ export const partnerSearchDocumentSelect = {
key: true,
},
},
+ programPartnerTags: {
+ select: {
+ partnerTagId: true,
+ },
+ },
} satisfies Prisma.ProgramEnrollmentSelect;
export type PartnerSearchDocumentSource = Prisma.ProgramEnrollmentGetPayload<{
@@ -46,7 +43,7 @@ export type PartnerSearchDocumentSource = Prisma.ProgramEnrollmentGetPayload<{
export function serializePartnerSearchDocument(
enrollment: PartnerSearchDocumentSource,
): PartnerSearchDocument {
- const { partner, links } = enrollment;
+ const { partner, links, programPartnerTags } = enrollment;
return {
id: enrollment.id,
@@ -66,9 +63,7 @@ export function serializePartnerSearchDocument(
tenantId: enrollment.tenantId,
groupId: enrollment.groupId,
partnerTagIds: unique(
- partner.programPartnerTags
- .filter(({ programId }) => programId === enrollment.programId)
- .map(({ partnerTagId }) => partnerTagId),
+ programPartnerTags.map(({ partnerTagId }) => partnerTagId),
),
};
}
diff --git a/apps/web/tests/partners/partner-search-backfill.test.ts b/apps/web/tests/partners/partner-search-backfill.test.ts
index 62730b1294..0e69d05d43 100644
--- a/apps/web/tests/partners/partner-search-backfill.test.ts
+++ b/apps/web/tests/partners/partner-search-backfill.test.ts
@@ -24,6 +24,7 @@ function createSource(id: string): PartnerSearchDocumentSource {
programId: "prog_test",
partnerId: `pn_${id}`,
status: "approved" as const,
+ tenantId: null,
groupId: null,
partner: {
name: "Rafi Hasan",
@@ -31,10 +32,10 @@ function createSource(id: string): PartnerSearchDocumentSource {
companyName: "Dub Partners",
description: "Developer tools educator",
country: null,
- programPartnerTags: [],
platforms: [],
},
links: [],
+ programPartnerTags: [],
};
}
diff --git a/apps/web/tests/partners/partner-search-document.test.ts b/apps/web/tests/partners/partner-search-document.test.ts
index 200a71c4d0..010318c3c0 100644
--- a/apps/web/tests/partners/partner-search-document.test.ts
+++ b/apps/web/tests/partners/partner-search-document.test.ts
@@ -9,6 +9,7 @@ const source: PartnerSearchDocumentSource = {
programId: "prog_test",
partnerId: "pn_test",
status: "approved" as const,
+ tenantId: null,
groupId: "grp_test",
partner: {
name: "Rafi Hasan",
@@ -16,11 +17,6 @@ const source: PartnerSearchDocumentSource = {
companyName: "Dub Partners",
description: "Developer tools educator",
country: "US",
- programPartnerTags: [
- { programId: "prog_test", partnerTagId: "ptag_a" },
- // A tag from a different program must not leak into this document.
- { programId: "prog_other", partnerTagId: "ptag_other" },
- ],
platforms: [
{
type: "website",
@@ -33,6 +29,7 @@ const source: PartnerSearchDocumentSource = {
],
},
links: [{ key: "rafi" }, { key: "rafi-tools" }],
+ programPartnerTags: [{ partnerTagId: "ptag_a" }, { partnerTagId: "ptag_a" }],
};
describe("serializePartnerSearchDocument", () => {
@@ -49,11 +46,10 @@ describe("serializePartnerSearchDocument", () => {
platformIdentifiers: ["https://rafi.dev", "@rafi-on-x"],
linkKeys: ["rafi", "rafi-tools"],
status: "approved",
+ tenantId: null,
groupId: "grp_test",
country: "US",
- // The tag from prog_other is dropped: tags are per program.
partnerTagIds: ["ptag_a"],
});
});
-
});
diff --git a/apps/web/tests/partners/partner-search-sync.test.ts b/apps/web/tests/partners/partner-search-sync.test.ts
index 6973a2e49f..ec0d0944ad 100644
--- a/apps/web/tests/partners/partner-search-sync.test.ts
+++ b/apps/web/tests/partners/partner-search-sync.test.ts
@@ -27,6 +27,7 @@ function createSource(
programId: "prog_test",
partnerId: `pn_${id}`,
status: "approved" as const,
+ tenantId: null,
groupId: null,
partner: {
name: "Rafi Hasan",
@@ -34,10 +35,10 @@ function createSource(
companyName: "Dub Partners",
description: "Developer tools educator",
country: null,
- programPartnerTags: [],
platforms: [],
},
links: [],
+ programPartnerTags: [],
...overrides,
};
}
@@ -148,13 +149,9 @@ describe("syncPartnerSearchDocuments", () => {
companyName: null,
description: null,
country: "US",
- // Tags from another program must not leak into this document.
- programPartnerTags: [
- { programId: "prog_test", partnerTagId: "ptag_1" },
- { programId: "prog_other", partnerTagId: "ptag_other" },
- ],
platforms: [{ type: "youtube" as const, identifier: "rafi" }],
},
+ programPartnerTags: [{ partnerTagId: "ptag_1" }],
}),
]);