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.

Remove obsolete code and simplify project structure

Rafi269e57820de0
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 495c1fb4ed..632fb96134 100644
--- a/apps/web/lib/api/partners/search/build-search-query.ts
+++ b/apps/web/lib/api/partners/search/build-search-query.ts
@@ -1,15 +1,7 @@
import { getPartnersQuerySchemaExtended } from "@/lib/zod/schemas/partners";
import * as z from "zod/v4";
import { PARTNER_SEARCH_CANDIDATE_LIMIT } from "./constants";
-import {
- PartnerSearchCandidateQuery,
- PartnerSearchCountQuery,
- PartnerSearchFilters,
- PartnerSearchListFilter,
- PartnerSearchMetricField,
- PartnerSearchQuery,
- PartnerSearchRangeFilter,
-} from "./types";
+import { PartnerSearchCandidateQuery } from "./types";
export type PartnerSearchQueryInput = z.infer<
typeof getPartnersQuerySchemaExtended
@@ -20,9 +12,9 @@ export type PartnerSearchQueryInput = z.infer<
countryOperator?: "IN" | "NOT IN";
};
-export type PartnerSearchCountQueryInput = Omit<
+type PartnerSearchCandidateQueryInput = Pick<
PartnerSearchQueryInput,
- "page" | "pageSize" | "sortBy" | "sortOrder"
+ "programId" | "search" | "email" | "tenantId"
>;
export function buildPartnerSearchCandidateQuery({
@@ -30,7 +22,7 @@ export function buildPartnerSearchCandidateQuery({
search,
email,
tenantId,
-}: PartnerSearchCountQueryInput): PartnerSearchCandidateQuery | null {
+}: PartnerSearchCandidateQueryInput): PartnerSearchCandidateQuery | null {
const query = search?.trim();
// Exact email and tenant lookups remain database-only. The search provider
@@ -45,142 +37,3 @@ export function buildPartnerSearchCandidateQuery({
limit: PARTNER_SEARCH_CANDIDATE_LIMIT,
};
}
-
-function buildListFilter(
- values: string | string[] | undefined,
- operator: "IN" | "NOT IN" | undefined,
-): PartnerSearchListFilter | undefined {
- if (values === undefined) {
- return undefined;
- }
-
- const normalizedValues = (Array.isArray(values) ? values : [values]).filter(
- Boolean,
- );
- if (normalizedValues.length === 0) {
- return undefined;
- }
-
- return {
- values: normalizedValues,
- operator: operator === "NOT IN" ? "NOT_IN" : "IN",
- };
-}
-
-function addMetricRange(
- metrics: NonNullable<PartnerSearchFilters["metrics"]>,
- field: PartnerSearchMetricField,
- min: number | undefined,
- max: number | undefined,
-) {
- if (min === undefined && max === undefined) {
- return;
- }
-
- const range: PartnerSearchRangeFilter = {};
- if (min !== undefined) {
- range.min = min;
- }
- if (max !== undefined) {
- range.max = max;
- }
- metrics[field] = range;
-}
-
-function buildPartnerSearchRequest({
- programId,
- search,
- email,
- tenantId,
- status,
- partnerIds,
- groupId,
- groupIdOperator,
- country,
- countryOperator,
- partnerTagId,
- partnerTagIdOperator,
- referredByPartnerId,
- totalClicksMin,
- totalClicksMax,
- totalLeadsMin,
- totalLeadsMax,
- totalConversionsMin,
- totalConversionsMax,
- totalSaleAmountMin,
- totalSaleAmountMax,
- totalCommissionsMin,
- totalCommissionsMax,
-}: PartnerSearchCountQueryInput): PartnerSearchCountQuery | null {
- const query = search?.trim();
-
- // Keep exact lookups on the database and use search for free-text queries.
- if (!query || email || tenantId) {
- return null;
- }
-
- const metrics: NonNullable<PartnerSearchFilters["metrics"]> = {};
- addMetricRange(metrics, "totalClicks", totalClicksMin, totalClicksMax);
- addMetricRange(metrics, "totalLeads", totalLeadsMin, totalLeadsMax);
- addMetricRange(
- metrics,
- "totalConversions",
- totalConversionsMin,
- totalConversionsMax,
- );
- addMetricRange(
- metrics,
- "totalSaleAmount",
- totalSaleAmountMin,
- totalSaleAmountMax,
- );
- addMetricRange(
- metrics,
- "totalCommissions",
- totalCommissionsMin,
- totalCommissionsMax,
- );
-
- const filters: PartnerSearchFilters = {
- status,
- partnerIds,
- groupIds: buildListFilter(groupId, groupIdOperator),
- countries: buildListFilter(country, countryOperator),
- partnerTagIds: buildListFilter(partnerTagId, partnerTagIdOperator),
- referredByPartnerId,
- ...(Object.keys(metrics).length > 0 && { metrics }),
- };
-
- return {
- programId,
- query,
- filters,
- };
-}
-
-export function buildPartnerSearchQuery(
- input: PartnerSearchQueryInput,
-): PartnerSearchQuery | null {
- const request = buildPartnerSearchRequest(input);
- if (!request) {
- return null;
- }
-
- return {
- ...request,
- page: input.page ?? 1,
- pageSize: input.pageSize,
- ...(input.sortBy !== "relevance" && {
- sort: {
- field: input.sortBy,
- order: input.sortOrder,
- },
- }),
- };
-}
-
-export function buildPartnerSearchCountQuery(
- input: PartnerSearchCountQueryInput,
-): PartnerSearchCountQuery | null {
- return buildPartnerSearchRequest(input);
-}
diff --git a/apps/web/lib/api/partners/search/providers/mock.ts b/apps/web/lib/api/partners/search/providers/mock.ts
index a503616084..d1c1282ada 100644
--- a/apps/web/lib/api/partners/search/providers/mock.ts
+++ b/apps/web/lib/api/partners/search/providers/mock.ts
@@ -5,139 +5,25 @@ import {
} from "../searchable-values";
import {
PartnerSearchCandidateQuery,
- PartnerSearchCountQuery,
PartnerSearchDocument,
- PartnerSearchFilters,
- PartnerSearchGroupField,
- PartnerSearchListFilter,
- PartnerSearchMetricField,
PartnerSearchProvider,
- PartnerSearchQuery,
} from "../types";
-function matchesListFilter(
- value: string | null,
- filter: PartnerSearchListFilter,
-): boolean {
- const matches = value !== null && filter.values.includes(value);
- return filter.operator === "IN" ? matches : !matches;
-}
-
-function matchesArrayFilter(
- values: string[],
- filter: PartnerSearchListFilter,
-): boolean {
- const matches = values.some((value) => filter.values.includes(value));
- return filter.operator === "IN" ? matches : !matches;
-}
-
-function matchesFilters(
- document: PartnerSearchDocument,
- filters: PartnerSearchFilters | undefined,
-): boolean {
- if (!filters) {
- return true;
- }
-
- if (filters.status && document.status !== filters.status) {
- return false;
- }
- if (filters.tenantId && document.tenantId !== filters.tenantId) {
- return false;
- }
- if (filters.partnerIds && !filters.partnerIds.includes(document.partnerId)) {
- return false;
- }
- if (
- filters.groupIds &&
- !matchesListFilter(document.groupId, filters.groupIds)
- ) {
- return false;
- }
- if (
- filters.countries &&
- !matchesListFilter(document.country, filters.countries)
- ) {
- return false;
- }
- if (
- filters.partnerTagIds &&
- !matchesArrayFilter(document.partnerTagIds, filters.partnerTagIds)
- ) {
- return false;
- }
- if (
- filters.referredByPartnerId &&
- document.referredByPartnerId !== filters.referredByPartnerId
- ) {
- return false;
- }
-
- for (const [field, range] of Object.entries(filters.metrics ?? {})) {
- const value = document[field as PartnerSearchMetricField];
- if (value === null) {
- return false;
- }
- if (range.min !== undefined && value < range.min) {
- return false;
- }
- if (range.max !== undefined && value > range.max) {
- return false;
- }
- }
-
- return true;
-}
-
-function compareDocuments(
- left: PartnerSearchDocument,
- right: PartnerSearchDocument,
- sort: NonNullable<PartnerSearchQuery["sort"]>,
-): number {
- const leftValue = left[sort.field];
- const rightValue = right[sort.field];
-
- if (leftValue === rightValue) {
- return left.id.localeCompare(right.id);
- }
- if (leftValue === null) {
- return 1;
- }
- if (rightValue === null) {
- return -1;
- }
-
- const comparison = leftValue < rightValue ? -1 : 1;
- return sort.order === "asc" ? comparison : -comparison;
-}
-
function findMatchingDocuments(
documents: Iterable<PartnerSearchDocument>,
- { programId, query, filters }: PartnerSearchCountQuery,
+ { programId, query }: PartnerSearchCandidateQuery,
): PartnerSearchDocument[] {
const normalizedQuery = normalizePartnerSearchQuery(query);
return Array.from(documents).filter(
(document) =>
document.programId === programId &&
- matchesFilters(document, filters) &&
getPartnerSearchableValues(document).some((value) =>
normalizePartnerSearchQuery(value).includes(normalizedQuery),
),
);
}
-function getGroupValues(
- document: PartnerSearchDocument,
- field: PartnerSearchGroupField,
-): (string | null)[] {
- if (field === "partnerTagId") {
- return document.partnerTagIds;
- }
-
- return [document[field]];
-}
-
/**
* In-memory search used for unit tests and API plumbing. It is not
* intended for production or performance testing.
@@ -159,63 +45,16 @@ export function createMockPartnerSearchProvider(
const matches = findMatchingDocuments(documents.values(), {
programId,
query,
+ limit,
});
return {
hits: matches.slice(0, limit).map((document) => ({
id: document.id,
- partnerId: document.partnerId,
})),
};
},
- async search({
- programId,
- query,
- page,
- pageSize,
- filters,
- sort,
- }: PartnerSearchQuery) {
- const matches = findMatchingDocuments(documents.values(), {
- programId,
- query,
- filters,
- });
-
- if (sort) {
- matches.sort((left, right) => compareDocuments(left, right, sort));
- }
-
- const offset = (page - 1) * pageSize;
-
- return {
- hits: matches.slice(offset, offset + pageSize).map((document) => ({
- id: document.id,
- partnerId: document.partnerId,
- })),
- };
- },
-
- async count(query) {
- return findMatchingDocuments(documents.values(), query).length;
- },
-
- async groupBy(query, field) {
- const groups = new Map<string | null, number>();
-
- for (const document of findMatchingDocuments(documents.values(), query)) {
- for (const value of getGroupValues(document, field)) {
- if (field === "referredByPartnerId" && value === null) {
- continue;
- }
- groups.set(value, (groups.get(value) ?? 0) + 1);
- }
- }
-
- return Array.from(groups, ([value, count]) => ({ value, count }));
- },
-
async waitForIndexing() {},
async upsert(updatedDocuments) {
diff --git a/apps/web/lib/api/partners/search/providers/upstash-redis.ts b/apps/web/lib/api/partners/search/providers/upstash-redis.ts
index 39d830f93a..c736ba1729 100644
--- a/apps/web/lib/api/partners/search/providers/upstash-redis.ts
+++ b/apps/web/lib/api/partners/search/providers/upstash-redis.ts
@@ -5,10 +5,7 @@ import {
type InferFilterFromSchema,
type SearchIndex,
} from "@upstash/redis";
-import {
- PARTNER_SEARCH_CANDIDATE_LIMIT,
- validatePartnerSearchCandidateLimit,
-} from "../constants";
+import { validatePartnerSearchCandidateLimit } from "../constants";
import {
getPartnerSearchableValues,
normalizePartnerSearchQuery,
@@ -52,15 +49,12 @@ interface CreateUpstashRedisPartnerSearchProviderOptions {
indexName?: string;
}
-function logPartnerSearchDebug(
- operation: "search" | "count" | "groupBy",
- details: Record<string, unknown>,
-) {
+function logPartnerSearchDebug(details: Record<string, unknown>) {
if (process.env.PARTNER_SEARCH_DEBUG !== "true") {
return;
}
- console.log(`[Partner Search Debug] Upstash ${operation}`, details);
+ console.log("[Partner Search Debug] Upstash search", details);
}
function getIndexName(indexName?: string): string {
@@ -398,7 +392,7 @@ export function createUpstashRedisPartnerSearchProvider({
score,
}));
- logPartnerSearchDebug("search", {
+ logPartnerSearchDebug({
indexName: resolvedIndexName,
operation: "searchCandidates",
query: { programId, query, limit },
@@ -413,46 +407,6 @@ export function createUpstashRedisPartnerSearchProvider({
return {
searchCandidates: findCandidates,
- async search(query) {
- if (query.sort) {
- throw new Error(
- "Upstash Redis partner search supports relevance ordering only.",
- );
- }
- if (query.filters && Object.keys(query.filters).length > 0) {
- throw new Error(
- "Upstash Redis partner search filters must be applied by the database.",
- );
- }
-
- const offset = (query.page - 1) * query.pageSize;
- const requestedResults = offset + query.pageSize;
- if (requestedResults > PARTNER_SEARCH_CANDIDATE_LIMIT) {
- throw new Error(
- `Upstash Redis relevance pagination is limited to the first ${PARTNER_SEARCH_CANDIDATE_LIMIT.toLocaleString()} results.`,
- );
- }
-
- const result = await findCandidates({
- programId: query.programId,
- query: query.query,
- limit: requestedResults,
- });
- return { hits: result.hits.slice(offset, requestedResults) };
- },
-
- async count() {
- throw new Error(
- "Upstash Redis partner search counts must be calculated by the database.",
- );
- },
-
- async groupBy() {
- throw new Error(
- "Upstash Redis partner search groups must be calculated by the database.",
- );
- },
-
async waitForIndexing() {
let timeoutId: ReturnType<typeof setTimeout> | undefined;
const timeout = new Promise<never>((_, reject) => {
diff --git a/apps/web/lib/api/partners/search/providers/upstash-search.ts b/apps/web/lib/api/partners/search/providers/upstash-search.ts
index 5fd79f70d1..fb7a600564 100644
--- a/apps/web/lib/api/partners/search/providers/upstash-search.ts
+++ b/apps/web/lib/api/partners/search/providers/upstash-search.ts
@@ -1,9 +1,6 @@
import { chunk } from "@dub/utils";
import { Search } from "@upstash/search";
-import {
- PARTNER_SEARCH_CANDIDATE_LIMIT,
- validatePartnerSearchCandidateLimit,
-} from "../constants";
+import { validatePartnerSearchCandidateLimit } from "../constants";
import { normalizePartnerSearchQuery } from "../searchable-values";
import type {
PartnerSearchCandidateQuery,
@@ -12,7 +9,6 @@ import type {
} from "../types";
const DEFAULT_INDEX_NAME = "partner-search-v1";
-const MAX_SEARCH_RESULTS = PARTNER_SEARCH_CANDIDATE_LIMIT;
const WRITE_BATCH_SIZE = 100;
const DELETE_BATCH_SIZE = 1_000;
const WAIT_FOR_INDEXING_TIMEOUT_MS = 30_000;
@@ -264,15 +260,12 @@ function mergeSearchResults(
);
}
-function logPartnerSearchDebug(
- operation: "search" | "count" | "groupBy",
- details: Record<string, unknown>,
-) {
+function logPartnerSearchDebug(details: Record<string, unknown>) {
if (process.env.PARTNER_SEARCH_DEBUG !== "true") {
return;
}
- console.log(`[Partner Search Debug] Upstash Search ${operation}`, details);
+ console.log("[Partner Search Debug] Upstash Search", details);
}
export async function resetUpstashSearchPartnerSearchIndex({
@@ -344,7 +337,7 @@ export function createUpstashSearchPartnerSearchProvider({
score,
}));
- logPartnerSearchDebug("search", {
+ logPartnerSearchDebug({
indexName: resolvedIndexName,
operation: "searchCandidates",
query: { programId, query, limit },
@@ -355,58 +348,6 @@ export function createUpstashSearchPartnerSearchProvider({
return { hits };
},
- async search(query) {
- if (query.sort) {
- throw new Error(
- "Upstash Search partner search supports relevance ordering only.",
- );
- }
- if (query.filters && Object.keys(query.filters).length > 0) {
- throw new Error(
- "Upstash Search partner search filters must be applied by the database.",
- );
- }
-
- const offset = (query.page - 1) * query.pageSize;
- const requestedResults = offset + query.pageSize;
- if (requestedResults > MAX_SEARCH_RESULTS) {
- throw new Error(
- `Upstash Search relevance pagination is limited to the first ${MAX_SEARCH_RESULTS.toLocaleString()} results.`,
- );
- }
-
- const candidates = await findSearchCandidates({
- programId: query.programId,
- query: query.query,
- limit: requestedResults,
- });
- const hits = candidates
- .slice(offset, offset + query.pageSize)
- .map(({ id, score }) => ({ id, score }));
-
- logPartnerSearchDebug("search", {
- indexName: resolvedIndexName,
- query,
- candidateCount: candidates.length,
- resultCount: hits.length,
- hits,
- });
-
- return { hits };
- },
-
- async count() {
- throw new Error(
- "Upstash Search partner search counts must be calculated by the database.",
- );
- },
-
- async groupBy() {
- throw new Error(
- "Upstash Search partner search groups must be calculated by the database.",
- );
- },
-
async waitForIndexing() {
const deadline = Date.now() + WAIT_FOR_INDEXING_TIMEOUT_MS;
while (Date.now() < deadline) {
diff --git a/apps/web/lib/api/partners/search/serialize-document.ts b/apps/web/lib/api/partners/search/serialize-document.ts
index be726aeddd..42d6729c58 100644
--- a/apps/web/lib/api/partners/search/serialize-document.ts
+++ b/apps/web/lib/api/partners/search/serialize-document.ts
@@ -5,36 +5,16 @@ export const partnerSearchDocumentSelect = {
id: true,
programId: true,
partnerId: true,
- status: true,
- tenantId: true,
- groupId: true,
- totalClicks: true,
- totalLeads: true,
- totalConversions: true,
- totalSaleAmount: true,
- totalCommissions: true,
- netRevenue: true,
- earningsPerClick: true,
- averageLifetimeValue: true,
- clickToLeadRate: true,
- clickToConversionRate: true,
- leadToConversionRate: true,
- returnOnAdSpend: true,
- createdAt: true,
- updatedAt: true,
partner: {
select: {
name: true,
email: true,
companyName: true,
description: true,
- country: true,
- updatedAt: true,
platforms: {
select: {
type: true,
identifier: true,
- updatedAt: true,
},
},
},
@@ -45,17 +25,6 @@ export const partnerSearchDocumentSelect = {
key: true,
shortLink: true,
url: true,
- updatedAt: true,
- },
- },
- programPartnerTags: {
- select: {
- partnerTagId: true,
- },
- },
- applicationEvent: {
- select: {
- referredByPartnerId: true,
},
},
} satisfies Prisma.ProgramEnrollmentSelect;
@@ -68,19 +37,6 @@ function unique<T>(values: T[]): T[] {
return Array.from(new Set(values));
}
-function getDocumentUpdatedAt(enrollment: PartnerSearchDocumentSource): string {
- const timestamps = [
- enrollment.updatedAt,
- enrollment.partner.updatedAt,
- ...enrollment.partner.platforms.map(({ updatedAt }) => updatedAt),
- ...enrollment.links.map(({ updatedAt }) => updatedAt),
- ];
-
- return new Date(
- Math.max(...timestamps.map((timestamp) => timestamp.getTime())),
- ).toISOString();
-}
-
export function serializePartnerSearchDocument(
enrollment: PartnerSearchDocumentSource,
): PartnerSearchDocument {
@@ -102,28 +58,5 @@ export function serializePartnerSearchDocument(
linkKeys: unique(links.map(({ key }) => key)),
shortLinks: unique(links.map(({ shortLink }) => shortLink)),
destinationUrls: unique(links.map(({ url }) => url)),
- status: enrollment.status,
- tenantId: enrollment.tenantId,
- groupId: enrollment.groupId,
- country: partner.country,
- partnerTagIds: unique(
- enrollment.programPartnerTags.map(({ partnerTagId }) => partnerTagId),
- ),
- referredByPartnerId:
- enrollment.applicationEvent?.referredByPartnerId ?? null,
- totalClicks: enrollment.totalClicks,
- totalLeads: enrollment.totalLeads,
- totalConversions: enrollment.totalConversions,
- totalSaleAmount: Number(enrollment.totalSaleAmount),
- totalCommissions: Number(enrollment.totalCommissions),
- netRevenue: Number(enrollment.netRevenue),
- earningsPerClick: enrollment.earningsPerClick,
- averageLifetimeValue: enrollment.averageLifetimeValue,
- clickToLeadRate: enrollment.clickToLeadRate,
- clickToConversionRate: enrollment.clickToConversionRate,
- leadToConversionRate: enrollment.leadToConversionRate,
- returnOnAdSpend: enrollment.returnOnAdSpend,
- createdAt: enrollment.createdAt.toISOString(),
- updatedAt: getDocumentUpdatedAt(enrollment),
};
}
diff --git a/apps/web/lib/api/partners/search/types.ts b/apps/web/lib/api/partners/search/types.ts
index be5e7b1c6f..41a63b67a4 100644
--- a/apps/web/lib/api/partners/search/types.ts
+++ b/apps/web/lib/api/partners/search/types.ts
@@ -1,4 +1,4 @@
-import { PlatformType, ProgramEnrollmentStatus } from "@prisma/client";
+import { PlatformType } from "@prisma/client";
/**
* Program enrollment data stored in the partner search index.
@@ -24,103 +24,10 @@ export interface PartnerSearchDocument {
linkKeys: string[];
shortLinks: string[];
destinationUrls: string[];
-
- // Program-scoped fields used by search filters and sorting
- status: ProgramEnrollmentStatus;
- tenantId: string | null;
- groupId: string | null;
- country: string | null;
- partnerTagIds: string[];
- referredByPartnerId: string | null;
- totalClicks: number;
- totalLeads: number;
- totalConversions: number;
- totalSaleAmount: number;
- totalCommissions: number;
- netRevenue: number;
- earningsPerClick: number;
- averageLifetimeValue: number | null;
- clickToLeadRate: number | null;
- clickToConversionRate: number | null;
- leadToConversionRate: number | null;
- returnOnAdSpend: number | null;
- createdAt: string;
- updatedAt: string;
-}
-
-export type PartnerSearchSortField =
- | "createdAt"
- | "totalClicks"
- | "totalLeads"
- | "totalConversions"
- | "totalSaleAmount"
- | "totalCommissions"
- | "netRevenue"
- | "earningsPerClick"
- | "averageLifetimeValue"
- | "clickToLeadRate"
- | "clickToConversionRate"
- | "leadToConversionRate"
- | "returnOnAdSpend";
-
-export type PartnerSearchMetricField = Exclude<
- PartnerSearchSortField,
- "createdAt"
->;
-
-export interface PartnerSearchListFilter {
- values: string[];
- operator: "IN" | "NOT_IN";
-}
-
-export interface PartnerSearchRangeFilter {
- min?: number;
- max?: number;
-}
-
-export interface PartnerSearchFilters {
- status?: ProgramEnrollmentStatus;
- tenantId?: string;
- partnerIds?: string[];
- groupIds?: PartnerSearchListFilter;
- countries?: PartnerSearchListFilter;
- partnerTagIds?: PartnerSearchListFilter;
- referredByPartnerId?: string;
- metrics?: Partial<Record<PartnerSearchMetricField, PartnerSearchRangeFilter>>;
-}
-
-export interface PartnerSearchQuery {
- programId: string;
- query: string;
- filters?: PartnerSearchFilters;
- page: number;
- pageSize: number;
- sort?: {
- field: PartnerSearchSortField;
- order: "asc" | "desc";
- };
-}
-
-export type PartnerSearchCountQuery = Pick<
- PartnerSearchQuery,
- "programId" | "query" | "filters"
->;
-
-export type PartnerSearchGroupField =
- | "status"
- | "country"
- | "groupId"
- | "partnerTagId"
- | "referredByPartnerId";
-
-export interface PartnerSearchGroup {
- value: string | null;
- count: number;
}
export interface PartnerSearchHit {
id: string;
- partnerId?: string;
score?: number;
}
@@ -138,12 +45,6 @@ export interface PartnerSearchProvider {
searchCandidates(
query: PartnerSearchCandidateQuery,
): Promise<PartnerSearchResult>;
- search(query: PartnerSearchQuery): Promise<PartnerSearchResult>;
- count(query: PartnerSearchCountQuery): Promise<number>;
- groupBy(
- query: PartnerSearchCountQuery,
- field: PartnerSearchGroupField,
- ): Promise<PartnerSearchGroup[]>;
waitForIndexing(): Promise<void>;
upsert(documents: PartnerSearchDocument[]): Promise<void>;
delete(documentIds: string[]): Promise<void>;
diff --git a/apps/web/scripts/dev/debug-partner-search.ts b/apps/web/scripts/dev/debug-partner-search.ts
index 11dde7ee8a..915b86da2e 100644
--- a/apps/web/scripts/dev/debug-partner-search.ts
+++ b/apps/web/scripts/dev/debug-partner-search.ts
@@ -119,7 +119,7 @@ function reportResults({
normalizedQuery,
),
enrollmentId: hit.id,
- partnerId: databaseDocument?.partnerId ?? hit.partnerId,
+ partnerId: databaseDocument?.partnerId ?? "missing from database",
name: databaseDocument?.name ?? "missing from database",
email: databaseDocument?.email ?? null,
company: databaseDocument?.companyName ?? null,
diff --git a/apps/web/tests/partners/get-partners-count-search.test.ts b/apps/web/tests/partners/get-partners-count-search.test.ts
index b31c45f12c..ec83ae76f4 100644
--- a/apps/web/tests/partners/get-partners-count-search.test.ts
+++ b/apps/web/tests/partners/get-partners-count-search.test.ts
@@ -26,14 +26,8 @@ vi.mock("@/lib/prisma", () => ({
function createSearchProvider(): PartnerSearchProvider {
return {
searchCandidates: vi.fn().mockResolvedValue({
- hits: [
- { id: "pge_2", partnerId: "pn_2" },
- { id: "pge_1", partnerId: "pn_1" },
- ],
+ hits: [{ id: "pge_2" }, { id: "pge_1" }],
}),
- search: vi.fn(),
- count: vi.fn(),
- groupBy: vi.fn(),
waitForIndexing: vi.fn(),
upsert: vi.fn(),
delete: vi.fn(),
@@ -67,7 +61,6 @@ describe("getPartnersCount search", () => {
query: "examp",
limit: 100,
});
- expect(searchProvider.count).not.toHaveBeenCalled();
expect(mocks.count).toHaveBeenCalledWith({
where: expect.objectContaining({
programId: "prog_test",
@@ -89,7 +82,6 @@ describe("getPartnersCount search", () => {
{ searchProvider },
);
- expect(searchProvider.groupBy).not.toHaveBeenCalled();
expect(mocks.enrollmentGroupBy).toHaveBeenCalledWith(
expect.objectContaining({
by: ["status"],
diff --git a/apps/web/tests/partners/get-partners-search.test.ts b/apps/web/tests/partners/get-partners-search.test.ts
index 2b8004fa6c..d6f8d3aa2f 100644
--- a/apps/web/tests/partners/get-partners-search.test.ts
+++ b/apps/web/tests/partners/get-partners-search.test.ts
@@ -33,13 +33,10 @@ function enrollment(id: string, partnerId: string) {
}
function createSearchProvider(
- hits: { id: string; partnerId: string }[] = [],
+ hits: { id: string }[] = [],
): PartnerSearchProvider {
return {
searchCandidates: vi.fn().mockResolvedValue({ hits }),
- search: vi.fn(),
- count: vi.fn(),
- groupBy: vi.fn(),
waitForIndexing: vi.fn(),
upsert: vi.fn(),
delete: vi.fn(),
@@ -57,8 +54,8 @@ describe("getPartners search", () => {
enrollment("pge_2", "pn_2"),
]);
const searchProvider = createSearchProvider([
- { id: "pge_2", partnerId: "pn_2" },
- { id: "pge_1", partnerId: "pn_1" },
+ { id: "pge_2" },
+ { id: "pge_1" },
]);
const partners = await getPartners(
@@ -79,7 +76,6 @@ describe("getPartners search", () => {
query: "examp",
limit: 100,
});
- expect(searchProvider.search).not.toHaveBeenCalled();
expect(mocks.findMany).toHaveBeenCalledWith(
expect.objectContaining({
where: expect.objectContaining({
@@ -101,9 +97,9 @@ describe("getPartners search", () => {
enrollment("pge_1", "pn_1"),
]);
const searchProvider = createSearchProvider([
- { id: "pge_1", partnerId: "pn_1" },
- { id: "pge_2", partnerId: "pn_2" },
- { id: "pge_3", partnerId: "pn_3" },
+ { id: "pge_1" },
+ { id: "pge_2" },
+ { id: "pge_3" },
]);
const partners = await getPartners(
diff --git a/apps/web/tests/partners/partner-search-backfill.test.ts b/apps/web/tests/partners/partner-search-backfill.test.ts
index 1cbdbdc1e6..732030193c 100644
--- a/apps/web/tests/partners/partner-search-backfill.test.ts
+++ b/apps/web/tests/partners/partner-search-backfill.test.ts
@@ -19,50 +19,24 @@ vi.mock("@/lib/prisma", () => ({
}));
function createSource(id: string): PartnerSearchDocumentSource {
- const timestamp = new Date("2026-01-01T00:00:00.000Z");
-
return {
id,
programId: "prog_test",
partnerId: `pn_${id}`,
- status: "approved",
- tenantId: null,
- groupId: null,
- totalClicks: 0,
- totalLeads: 0,
- totalConversions: 0,
- totalSaleAmount: BigInt(0),
- totalCommissions: BigInt(0),
- netRevenue: BigInt(0),
- earningsPerClick: 0,
- averageLifetimeValue: null,
- clickToLeadRate: null,
- clickToConversionRate: null,
- leadToConversionRate: null,
- returnOnAdSpend: null,
- createdAt: timestamp,
- updatedAt: timestamp,
partner: {
name: "Rafi Hasan",
companyName: "Dub Partners",
description: "Developer tools educator",
- country: "CA",
- updatedAt: timestamp,
platforms: [],
},
links: [],
- programPartnerTags: [],
- applicationEvent: null,
};
}
function createProvider(): PartnerSearchProvider {
return {
searchCandidates: vi.fn(),
- search: vi.fn(),
- count: vi.fn(),
- groupBy: vi.fn(),
waitForIndexing: vi.fn(),
upsert: vi.fn(),
delete: vi.fn(),
diff --git a/apps/web/tests/partners/partner-search-document.test.ts b/apps/web/tests/partners/partner-search-document.test.ts
index 487b55e851..e591a3821f 100644
--- a/apps/web/tests/partners/partner-search-document.test.ts
+++ b/apps/web/tests/partners/partner-search-document.test.ts
@@ -8,40 +8,19 @@ const source: PartnerSearchDocumentSource = {
id: "pge_test",
programId: "prog_test",
partnerId: "pn_test",
- status: "approved",
- tenantId: "tenant_test",
- groupId: "grp_test",
- totalClicks: 100,
- totalLeads: 20,
- totalConversions: 10,
- totalSaleAmount: BigInt(50_000),
- totalCommissions: BigInt(10_000),
- netRevenue: BigInt(40_000),
- earningsPerClick: 5,
- averageLifetimeValue: 5_000,
- clickToLeadRate: 0.2,
- clickToConversionRate: 0.1,
- leadToConversionRate: 0.5,
- returnOnAdSpend: 5,
- createdAt: new Date("2026-01-01T00:00:00.000Z"),
- updatedAt: new Date("2026-01-02T00:00:00.000Z"),
partner: {
name: "Rafi Hasan",
companyName: "Dub Partners",
description: "Developer tools educator",
- country: "CA",
- updatedAt: new Date("2026-01-03T00:00:00.000Z"),
platforms: [
{
type: "website",
identifier: "https://rafi.dev",
- updatedAt: new Date("2026-01-04T00:00:00.000Z"),
},
{
type: "twitter",
identifier: "@rafi-on-x",
- updatedAt: new Date("2026-01-05T00:00:00.000Z"),
},
],
},
@@ -51,23 +30,14 @@ const source: PartnerSearchDocumentSource = {
key: "rafi",
shortLink: "https://dub.sh/rafi",
url: "https://example.com/referrals/rafi",
- updatedAt: new Date("2026-01-06T00:00:00.000Z"),
},
{
domain: "dub.sh",
key: "rafi-tools",
shortLink: "https://dub.sh/rafi-tools",
url: "https://rafi.dev/tools",
- updatedAt: new Date("2026-01-07T00:00:00.000Z"),
},
],
- programPartnerTags: [
- { partnerTagId: "ptag_test" },
- { partnerTagId: "ptag_test" },
- ],
- applicationEvent: {
- referredByPartnerId: "pn_referrer",
- },
};
describe("serializePartnerSearchDocument", () => {
@@ -89,26 +59,6 @@ describe("serializePartnerSearchDocument", () => {
"https://example.com/referrals/rafi",
"https://rafi.dev/tools",
],
- status: "approved",
- tenantId: "tenant_test",
- groupId: "grp_test",
- country: "CA",
- partnerTagIds: ["ptag_test"],
- referredByPartnerId: "pn_referrer",
- totalClicks: 100,
- totalLeads: 20,
- totalConversions: 10,
- totalSaleAmount: 50_000,
- totalCommissions: 10_000,
- netRevenue: 40_000,
- earningsPerClick: 5,
- averageLifetimeValue: 5_000,
- clickToLeadRate: 0.2,
- clickToConversionRate: 0.1,
- leadToConversionRate: 0.5,
- returnOnAdSpend: 5,
- createdAt: "2026-01-01T00:00:00.000Z",
- updatedAt: "2026-01-07T00:00:00.000Z",
});
});
});
diff --git a/apps/web/tests/partners/partner-search-provider.test.ts b/apps/web/tests/partners/partner-search-provider.test.ts
index 2fed1b2cea..993f4ab545 100644
--- a/apps/web/tests/partners/partner-search-provider.test.ts
+++ b/apps/web/tests/partners/partner-search-provider.test.ts
@@ -19,26 +19,6 @@ const partnerDocument: PartnerSearchDocument = {
linkKeys: ["rafi"],
shortLinks: ["https://dub.sh/rafi"],
destinationUrls: ["https://example.com/referrals/rafi"],
- status: "approved",
- tenantId: "tenant_test",
- groupId: null,
- country: "CA",
- partnerTagIds: ["ptag_test"],
- referredByPartnerId: "pn_referrer",
- totalClicks: 100,
- totalLeads: 20,
- totalConversions: 10,
- totalSaleAmount: 50_000,
- totalCommissions: 10_000,
- netRevenue: 40_000,
- earningsPerClick: 5,
- averageLifetimeValue: 5_000,
- clickToLeadRate: 0.2,
- clickToConversionRate: 0.1,
- leadToConversionRate: 0.5,
- returnOnAdSpend: 5,
- createdAt: "2026-08-08T00:00:00.000Z",
- updatedAt: "2026-08-08T00:00:00.000Z",
};
describe("partner search provider contract", () => {
@@ -57,36 +37,17 @@ describe("partner search provider contract", () => {
])("searches by %s", async (_field, query) => {
const provider = createMockPartnerSearchProvider([partnerDocument]);
- const result = await provider.search({
- programId: partnerDocument.programId,
- query,
- page: 1,
- pageSize: 10,
- });
-
- expect(result.hits).toHaveLength(1);
- expect(result.hits[0]?.partnerId).toBe(partnerDocument.partnerId);
-
- const candidates = await provider.searchCandidates({
+ const result = await provider.searchCandidates({
programId: partnerDocument.programId,
query,
limit: PARTNER_SEARCH_CANDIDATE_LIMIT,
});
- expect(candidates.hits).toHaveLength(1);
- expect(candidates.hits[0]?.partnerId).toBe(partnerDocument.partnerId);
+ expect(result.hits).toEqual([{ id: partnerDocument.id }]);
});
it("keeps search results scoped to a program", async () => {
const provider = createMockPartnerSearchProvider([partnerDocument]);
- const result = await provider.search({
- programId: "prog_other",
- query: "rafi",
- page: 1,
- pageSize: 10,
- });
-
- expect(result).toEqual({ hits: [] });
await expect(
provider.searchCandidates({
programId: "prog_other",
@@ -122,63 +83,4 @@ describe("partner search provider contract", () => {
}),
).rejects.toThrow("must be between 1 and 100");
});
-
- it("combines search with filters", async () => {
- const provider = createMockPartnerSearchProvider([partnerDocument]);
-
- const result = await provider.search({
- programId: partnerDocument.programId,
- query: "examp",
- page: 1,
- pageSize: 10,
- filters: {
- status: "approved",
- countries: { values: ["CA"], operator: "IN" },
- partnerTagIds: { values: ["ptag_test"], operator: "IN" },
- metrics: { totalSaleAmount: { min: 40_000 } },
- },
- });
-
- expect(result.hits).toHaveLength(1);
- });
-
- it("sorts filtered search results", async () => {
- const higherRevenuePartner: PartnerSearchDocument = {
- ...partnerDocument,
- id: "pge_higher_revenue",
- partnerId: "pn_higher_revenue",
- email: "[email protected]",
- totalSaleAmount: 100_000,
- };
- const provider = createMockPartnerSearchProvider([
- partnerDocument,
- higherRevenuePartner,
- ]);
-
- const result = await provider.search({
- programId: partnerDocument.programId,
- query: "examp",
- page: 1,
- pageSize: 10,
- sort: { field: "totalSaleAmount", order: "desc" },
- });
-
- expect(result.hits.map(({ partnerId }) => partnerId)).toEqual([
- "pn_higher_revenue",
- "pn_test",
- ]);
- });
-
- it("counts and groups matching documents", async () => {
- const provider = createMockPartnerSearchProvider([partnerDocument]);
- const query = {
- programId: partnerDocument.programId,
- query: "examp",
- };
-
- await expect(provider.count(query)).resolves.toBe(1);
- await expect(provider.groupBy(query, "country")).resolves.toEqual([
- { value: "CA", count: 1 },
- ]);
- });
});
diff --git a/apps/web/tests/partners/partner-search-query.test.ts b/apps/web/tests/partners/partner-search-query.test.ts
index 61bd483072..51d7f13c31 100644
--- a/apps/web/tests/partners/partner-search-query.test.ts
+++ b/apps/web/tests/partners/partner-search-query.test.ts
@@ -1,7 +1,4 @@
-import {
- buildPartnerSearchCandidateQuery,
- buildPartnerSearchQuery,
-} from "@/lib/api/partners/search";
+import { buildPartnerSearchCandidateQuery } from "@/lib/api/partners/search";
import { describe, expect, it } from "vitest";
const defaultInput = {
@@ -13,14 +10,10 @@ const defaultInput = {
sortOrder: "desc" as const,
};
-describe("buildPartnerSearchQuery", () => {
+describe("buildPartnerSearchCandidateQuery", () => {
it("builds a provider-neutral relevance candidate request", () => {
expect(
- buildPartnerSearchCandidateQuery({
- ...defaultInput,
- status: "approved",
- country: ["CA"],
- }),
+ buildPartnerSearchCandidateQuery(defaultInput),
).toEqual({
programId: "prog_test",
query: "examp",
@@ -28,71 +21,12 @@ describe("buildPartnerSearchQuery", () => {
});
});
- it("maps API pagination, filters, ranges, and sorting", () => {
- expect(
- buildPartnerSearchQuery({
- ...defaultInput,
- status: "approved",
- partnerIds: ["pn_1", "pn_2"],
- groupId: ["grp_1"],
- groupIdOperator: "NOT IN",
- country: ["CA", "US"],
- partnerTagId: ["ptag_1"],
- referredByPartnerId: "pn_referrer",
- totalClicksMin: 10,
- totalClicksMax: 100,
- totalSaleAmountMin: 5_000,
- }),
- ).toEqual({
- programId: "prog_test",
- query: "examp",
- page: 3,
- pageSize: 25,
- filters: {
- status: "approved",
- partnerIds: ["pn_1", "pn_2"],
- groupIds: { values: ["grp_1"], operator: "NOT_IN" },
- countries: { values: ["CA", "US"], operator: "IN" },
- partnerTagIds: { values: ["ptag_1"], operator: "IN" },
- referredByPartnerId: "pn_referrer",
- metrics: {
- totalClicks: { min: 10, max: 100 },
- totalSaleAmount: { min: 5_000 },
- },
- },
- sort: { field: "totalSaleAmount", order: "desc" },
- });
- });
-
- 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: " " }],
["exact email", { ...defaultInput, email: "[email protected]" }],
["tenant ID", { ...defaultInput, tenantId: "tenant_test" }],
])("keeps %s on the database path", (_name, input) => {
- expect(buildPartnerSearchQuery(input)).toBeNull();
expect(buildPartnerSearchCandidateQuery(input)).toBeNull();
});
});
diff --git a/apps/web/tests/partners/partner-search-sync.test.ts b/apps/web/tests/partners/partner-search-sync.test.ts
index c04ce26f8f..c59be90482 100644
--- a/apps/web/tests/partners/partner-search-sync.test.ts
+++ b/apps/web/tests/partners/partner-search-sync.test.ts
@@ -22,50 +22,24 @@ vi.mock("@/lib/prisma", () => ({
}));
function createSource(id: string): PartnerSearchDocumentSource {
- const timestamp = new Date("2026-01-01T00:00:00.000Z");
-
return {
id,
programId: "prog_test",
partnerId: `pn_${id}`,
- status: "approved",
- tenantId: null,
- groupId: null,
- totalClicks: 0,
- totalLeads: 0,
- totalConversions: 0,
- totalSaleAmount: BigInt(0),
- totalCommissions: BigInt(0),
- netRevenue: BigInt(0),
- earningsPerClick: 0,
- averageLifetimeValue: null,
- clickToLeadRate: null,
- clickToConversionRate: null,
- leadToConversionRate: null,
- returnOnAdSpend: null,
- createdAt: timestamp,
- updatedAt: timestamp,
partner: {
name: "Rafi Hasan",
companyName: "Dub Partners",
description: "Developer tools educator",
- country: "CA",
- updatedAt: timestamp,
platforms: [],
},
links: [],
- programPartnerTags: [],
- applicationEvent: null,
};
}
function createProvider(): PartnerSearchProvider {
return {
searchCandidates: vi.fn(),
- search: vi.fn(),
- count: vi.fn(),
- groupBy: vi.fn(),
waitForIndexing: vi.fn(),
upsert: vi.fn(),
delete: vi.fn(),
diff --git a/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts b/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts
index fa4fa83970..66fb0f0123 100644
--- a/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts
+++ b/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts
@@ -22,26 +22,6 @@ const document: PartnerSearchDocument = {
linkKeys: ["rafi"],
shortLinks: ["https://dub.sh/rafi"],
destinationUrls: ["https://example.com/referrals/rafi"],
- status: "approved",
- tenantId: null,
- groupId: null,
- country: "CA",
- partnerTagIds: ["ptag_test"],
- referredByPartnerId: null,
- totalClicks: 100,
- totalLeads: 20,
- totalConversions: 10,
- totalSaleAmount: 50_000,
- totalCommissions: 10_000,
- netRevenue: 40_000,
- earningsPerClick: 5,
- averageLifetimeValue: 5_000,
- clickToLeadRate: 0.2,
- clickToConversionRate: 0.1,
- leadToConversionRate: 0.5,
- returnOnAdSpend: 5,
- createdAt: "2026-08-08T00:00:00.000Z",
- updatedAt: "2026-08-08T00:00:00.000Z",
};
const mocks = vi.hoisted(() => ({
@@ -155,23 +135,6 @@ describe("Upstash Redis partner search provider", () => {
expect(JSON.stringify(filter)).toContain('"emailNgrams":{"$eq":"amp"}');
});
- it("keeps counts and groups on the database", async () => {
- const provider = createUpstashRedisPartnerSearchProvider({
- redisClient: createRedisMock(),
- indexName: "test-index",
- });
-
- await expect(
- provider.count({ programId: document.programId, query: "rafi" }),
- ).rejects.toThrow("counts must be calculated by the database");
- await expect(
- provider.groupBy(
- { programId: document.programId, query: "rafi" },
- "country",
- ),
- ).rejects.toThrow("groups must be calculated by the database");
- });
-
it("retries a transient provider error", async () => {
mocks.query
.mockRejectedValueOnce(new Error("Upstash returned 503"))
diff --git a/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts b/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts
index 172d951912..c420aed499 100644
--- a/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts
+++ b/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts
@@ -19,26 +19,6 @@ const document: PartnerSearchDocument = {
linkKeys: ["rafi"],
shortLinks: ["https://dub.sh/rafi"],
destinationUrls: ["https://example.com/referrals/rafi"],
- status: "approved",
- tenantId: null,
- groupId: null,
- country: "CA",
- partnerTagIds: ["ptag_test"],
- referredByPartnerId: null,
- totalClicks: 100,
- totalLeads: 20,
- totalConversions: 10,
- totalSaleAmount: 50_000,
- totalCommissions: 10_000,
- netRevenue: 40_000,
- earningsPerClick: 5,
- averageLifetimeValue: 5_000,
- clickToLeadRate: 0.2,
- clickToConversionRate: 0.1,
- leadToConversionRate: 0.5,
- returnOnAdSpend: 5,
- createdAt: "2026-08-08T00:00:00.000Z",
- updatedAt: "2026-08-08T00:00:00.000Z",
};
const mocks = vi.hoisted(() => ({
@@ -142,11 +122,10 @@ describe("Upstash Search partner search provider", () => {
});
await expect(
- provider.search({
+ provider.searchCandidates({
programId: document.programId,
query: "examp",
- page: 1,
- pageSize: 10,
+ limit: 10,
}),
).resolves.toEqual({
hits: [
@@ -188,11 +167,10 @@ describe("Upstash Search partner search provider", () => {
indexName: "test-index",
});
- const result = await provider.search({
+ const result = await provider.searchCandidates({
programId: document.programId,
query: "drew moore",
- page: 1,
- pageSize: 10,
+ limit: 10,
});
expect(result.hits).toHaveLength(10);
@@ -202,59 +180,6 @@ describe("Upstash Search partner search provider", () => {
expect(mocks.search).toHaveBeenCalledWith(
expect.objectContaining({ query: "drew moore", limit: 10 }),
);
-
- const candidates = await provider.searchCandidates({
- programId: document.programId,
- query: "drew moore",
- limit: 10,
- });
- expect(candidates.hits).toHaveLength(10);
- expect(mocks.search).toHaveBeenLastCalledWith(
- expect.objectContaining({ query: "drew moore", limit: 10 }),
- );
- });
-
- it("leaves filtering and sorting to the database", async () => {
- const provider = createUpstashSearchPartnerSearchProvider({
- searchIndex: createSearchIndexMock(),
- indexName: "test-index",
- });
-
- await expect(
- provider.search({
- programId: document.programId,
- query: "rafi",
- page: 1,
- pageSize: 10,
- sort: { field: "totalSaleAmount", order: "desc" },
- }),
- ).rejects.toThrow("supports relevance ordering only");
-
- await expect(
- provider.search({
- programId: document.programId,
- query: "rafi",
- filters: { status: "approved" },
- page: 1,
- pageSize: 10,
- }),
- ).rejects.toThrow("filters must be applied by the database");
- });
-
- it("leaves counts and grouping to the database", async () => {
- const provider = createUpstashSearchPartnerSearchProvider({
- searchIndex: createSearchIndexMock(),
- indexName: "test-index",
- });
- const query = { programId: document.programId, query: "rafi" };
-
- await expect(provider.count(query)).rejects.toThrow(
- "counts must be calculated by the database",
- );
- await expect(provider.groupBy(query, "country")).rejects.toThrow(
- "groups must be calculated by the database",
- );
- expect(mocks.search).not.toHaveBeenCalled();
});
it("waits until pending documents finish indexing", async () => {