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.

Use relevance sorting for partner searches

Rafia03c73e398ce
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
index 1708bb5bdb..f615aab7fd 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
@@ -140,7 +140,11 @@ export function PartnersTable() {
const sortBy =
searchParams.get("sortBy") ||
- (program?.primaryRewardEvent === "lead" ? "totalLeads" : "totalSaleAmount");
+ (searchParams.get("search")
+ ? "relevance"
+ : program?.primaryRewardEvent === "lead"
+ ? "totalLeads"
+ : "totalSaleAmount");
const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
const { partnersCount, error: countError } = usePartnersCount<number>({
diff --git a/apps/web/lib/api/partners/get-partners.ts b/apps/web/lib/api/partners/get-partners.ts
index 8a36423954..59f37b9efe 100644
--- a/apps/web/lib/api/partners/get-partners.ts
+++ b/apps/web/lib/api/partners/get-partners.ts
@@ -37,6 +37,7 @@ export async function getPartners(
searchProvider && searchQuery
? await searchProvider.search(searchQuery)
: null;
+ const databaseSortBy = sortBy === "relevance" ? "totalSaleAmount" : sortBy;
const programEnrollments = await prisma.programEnrollment.findMany({
where: searchResult
@@ -79,7 +80,7 @@ export async function getPartners(
take: pageSize,
skip: (page - 1) * pageSize,
orderBy: {
- [sortBy]: sortOrder,
+ [databaseSortBy]: sortOrder,
},
}),
});
diff --git a/apps/web/lib/api/partners/search/build-search-query.ts b/apps/web/lib/api/partners/search/build-search-query.ts
index bbc17e25fc..1a66f7a770 100644
--- a/apps/web/lib/api/partners/search/build-search-query.ts
+++ b/apps/web/lib/api/partners/search/build-search-query.ts
@@ -147,10 +147,12 @@ export function buildPartnerSearchQuery(
...request,
page: input.page ?? 1,
pageSize: input.pageSize,
- sort: {
- field: input.sortBy,
- order: input.sortOrder,
- },
+ ...(input.sortBy !== "relevance" && {
+ sort: {
+ field: input.sortBy,
+ order: input.sortOrder,
+ },
+ }),
};
}
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 9096fc1453..fa5a462e6f 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -203,6 +203,7 @@ export const getPartnersQuerySchema = z
// Only Dub UI uses the following query parameters
export const getPartnersQuerySchemaExtended = getPartnersQuerySchema.extend({
+ sortBy: getPartnersQuerySchema.shape.sortBy.or(z.literal("relevance")),
status: z.enum(ProgramEnrollmentStatus).optional(),
// TODO: refactor to use multi/negative filtering syntax
partnerIds: z
diff --git a/apps/web/tests/partners/get-partners-search.test.ts b/apps/web/tests/partners/get-partners-search.test.ts
index 6f7cbf9a20..9d4f00e89b 100644
--- a/apps/web/tests/partners/get-partners-search.test.ts
+++ b/apps/web/tests/partners/get-partners-search.test.ts
@@ -7,6 +7,7 @@ const mocks = vi.hoisted(() => ({
}));
vi.mock("@/lib/prisma", () => ({
+ sanitizeFullTextSearch: (value: string) => value,
prisma: {
programEnrollment: {
findMany: mocks.findMany,
@@ -114,4 +115,26 @@ describe("getPartners search", () => {
expect(mocks.findMany).not.toHaveBeenCalled();
});
+
+ it("uses the existing database sort when relevance has no provider", async () => {
+ mocks.findMany.mockResolvedValue([]);
+
+ await getPartners(
+ {
+ programId: "prog_test",
+ search: "examp",
+ page: 1,
+ pageSize: 25,
+ sortBy: "relevance",
+ sortOrder: "desc",
+ },
+ { searchProvider: null },
+ );
+
+ expect(mocks.findMany).toHaveBeenCalledWith(
+ expect.objectContaining({
+ orderBy: { totalSaleAmount: "desc" },
+ }),
+ );
+ });
});
diff --git a/apps/web/tests/partners/partner-search-query.test.ts b/apps/web/tests/partners/partner-search-query.test.ts
index 8e0188a6ba..c57ea4122e 100644
--- a/apps/web/tests/partners/partner-search-query.test.ts
+++ b/apps/web/tests/partners/partner-search-query.test.ts
@@ -47,6 +47,28 @@ describe("buildPartnerSearchQuery", () => {
});
});
+ it("uses provider relevance order when requested", () => {
+ expect(
+ buildPartnerSearchQuery({
+ ...defaultInput,
+ sortBy: "relevance",
+ }),
+ ).toEqual(
+ expect.objectContaining({
+ programId: "prog_test",
+ query: "examp",
+ page: 3,
+ pageSize: 25,
+ }),
+ );
+ expect(
+ buildPartnerSearchQuery({
+ ...defaultInput,
+ sortBy: "relevance",
+ }),
+ ).not.toHaveProperty("sort");
+ });
+
it.each([
["missing search", { ...defaultInput, search: undefined }],
["empty search", { ...defaultInput, search: " " }],