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.

Partner Network invited tab vs counts (#3819)

Pedro Ladeira04203295edf2
diff --git a/apps/web/app/(ee)/api/network/partners/count/route.ts b/apps/web/app/(ee)/api/network/partners/count/route.ts
index bac66e22cf..48858bf630 100644
--- a/apps/web/app/(ee)/api/network/partners/count/route.ts
+++ b/apps/web/app/(ee)/api/network/partners/count/route.ts
@@ -1,4 +1,8 @@
import { DubApiError } from "@/lib/api/errors";
+import {
+ partnerNetworkListingParts,
+ partnerWhereFromListingParts,
+} from "@/lib/api/network/partner-network-listing-where";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { withWorkspace } from "@/lib/auth";
import { getNetworkPartnersCountQuerySchema } from "@/lib/zod/schemas/partner-network";
@@ -37,41 +41,14 @@ export const GET = withWorkspace(
subscribers,
} = getNetworkPartnersCountQuerySchema.parse(searchParams);
- // Build platform filter - combine platform type and subscribers if both are set
- const platformFilter: Prisma.PartnerPlatformWhereInput | undefined =
- platform || subscribers
- ? {
- verifiedAt: { not: null },
- ...(platform && { type: platform }),
- ...(subscribers === "<5000" && {
- subscribers: { lt: 5000 },
- }),
- ...(subscribers === "5000-25000" && {
- subscribers: { gte: 5000, lt: 25000 },
- }),
- ...(subscribers === "25000-100000" && {
- subscribers: { gte: 25000, lt: 100000 },
- }),
- ...(subscribers === "100000+" && {
- subscribers: { gte: 100000 },
- }),
- }
- : undefined;
+ const listingParts = partnerNetworkListingParts({
+ partnerIds,
+ country,
+ platform,
+ subscribers,
+ });
- const commonWhere: Prisma.PartnerWhereInput = {
- discoverableAt: { not: null },
- ...(partnerIds && {
- id: { in: partnerIds },
- }),
- ...(country && {
- country,
- }),
- ...(platformFilter && {
- platforms: {
- some: platformFilter,
- },
- }),
- };
+ const commonWhere = partnerWhereFromListingParts(listingParts);
const statusWheres = {
discover: {
@@ -202,12 +179,16 @@ export const GET = withWorkspace(
}),
};
- // Build partner where clause combining all filters
+ const mergedPlatformsSome: Prisma.PartnerPlatformWhereInput =
+ listingParts.listingPlatformSome
+ ? { AND: [listingParts.listingPlatformSome, platformPlatformFilter] }
+ : platformPlatformFilter;
+
const partnerWhere: Prisma.PartnerWhereInput = {
- ...commonWhere,
+ ...listingParts.listingPartnerBase,
...statusWhereForFacet,
platforms: {
- some: platformPlatformFilter,
+ some: mergedPlatformsSome,
},
};
@@ -217,7 +198,7 @@ export const GET = withWorkspace(
select: {
id: true,
platforms: {
- where: platformPlatformFilter,
+ where: mergedPlatformsSome,
select: {
type: true,
},
@@ -256,21 +237,30 @@ export const GET = withWorkspace(
const subscriberCounts = await Promise.all(
subscriberRanges.map(async (range) => {
+ const rangePlatformSome: Prisma.PartnerPlatformWhereInput = {
+ verifiedAt: { not: null },
+ ...(range.max !== null
+ ? {
+ subscribers: { gte: range.min, lt: range.max + 1 },
+ }
+ : {
+ subscribers: { gte: range.min },
+ }),
+ ...(platform && { type: platform }),
+ };
+
+ const mergedPlatformsSome: Prisma.PartnerPlatformWhereInput =
+ listingParts.listingPlatformSome
+ ? {
+ AND: [listingParts.listingPlatformSome, rangePlatformSome],
+ }
+ : rangePlatformSome;
+
const where: Prisma.PartnerWhereInput = {
- ...commonWhere,
+ ...listingParts.listingPartnerBase,
...statusWhereForFacet,
platforms: {
- some: {
- verifiedAt: { not: null },
- ...(range.max !== null
- ? {
- subscribers: { gte: range.min, lt: range.max + 1 },
- }
- : {
- subscribers: { gte: range.min },
- }),
- ...(platform && { type: platform }),
- },
+ some: mergedPlatformsSome,
},
};
diff --git a/apps/web/app/(ee)/api/network/partners/route.ts b/apps/web/app/(ee)/api/network/partners/route.ts
index d78f16d677..6d98af17fd 100644
--- a/apps/web/app/(ee)/api/network/partners/route.ts
+++ b/apps/web/app/(ee)/api/network/partners/route.ts
@@ -1,5 +1,6 @@
import { DubApiError } from "@/lib/api/errors";
import { calculatePartnerRanking } from "@/lib/api/network/calculate-partner-ranking";
+import { partnerNetworkListingWhere } from "@/lib/api/network/partner-network-listing-where";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { withWorkspace } from "@/lib/auth";
import { PROGRAM_SIMILARITY_SCORE_THRESHOLD } from "@/lib/constants/program";
@@ -55,11 +56,23 @@ export const GET = withWorkspace(
} = getNetworkPartnersQuerySchema.parse(searchParams);
if (status !== "discover") {
+ const partnerWhere = partnerNetworkListingWhere({
+ partnerIds,
+ country,
+ platform,
+ subscribers,
+ });
+
const partners = await prisma.discoveredPartner.findMany({
where: {
programId,
+ partner: partnerWhere,
...(status === "ignored" && { ignoredAt: { not: null } }),
- ...(status === "invited" && { invitedAt: { not: null } }),
+ ...(status === "invited" && {
+ invitedAt: { not: null },
+ ignoredAt: null,
+ programEnrollment: { status: "invited" },
+ }),
...(status === "recruited" && {
invitedAt: { not: null },
programEnrollment: { status: "approved" },
@@ -81,7 +94,7 @@ export const GET = withWorkspace(
programEnrollment: true,
},
take: pageSize,
- skip: (page ?? 1 - 1) * pageSize,
+ skip: ((page ?? 1) - 1) * pageSize,
});
return NextResponse.json(
diff --git a/apps/web/lib/api/network/partner-network-listing-where.ts b/apps/web/lib/api/network/partner-network-listing-where.ts
new file mode 100644
index 0000000000..f98aef6427
--- /dev/null
+++ b/apps/web/lib/api/network/partner-network-listing-where.ts
@@ -0,0 +1,78 @@
+import { PlatformType, Prisma } from "@dub/prisma/client";
+
+/** Query params shared by `/api/network/partners` and `/count` for listing. */
+export type PartnerNetworkListingParams = {
+ partnerIds?: string[];
+ country?: string;
+ platform?: PlatformType;
+ subscribers?: "<5000" | "5000-25000" | "25000-100000" | "100000+" | undefined;
+};
+
+export type PartnerNetworkListingParts = {
+ listingPartnerBase: Omit<Prisma.PartnerWhereInput, "platforms">;
+ listingPlatformSome?: Prisma.PartnerPlatformWhereInput;
+};
+
+function listingPlatformSomeFromParams({
+ platform,
+ subscribers,
+}: Pick<PartnerNetworkListingParams, "platform" | "subscribers">):
+ | Prisma.PartnerPlatformWhereInput
+ | undefined {
+ return platform || subscribers
+ ? {
+ verifiedAt: { not: null },
+ ...(platform && { type: platform }),
+ ...(subscribers === "<5000" && {
+ subscribers: { lt: 5000 },
+ }),
+ ...(subscribers === "5000-25000" && {
+ subscribers: { gte: 5000, lt: 25000 },
+ }),
+ ...(subscribers === "25000-100000" && {
+ subscribers: { gte: 25000, lt: 100000 },
+ }),
+ ...(subscribers === "100000+" && {
+ subscribers: { gte: 100000 },
+ }),
+ }
+ : undefined;
+}
+
+export function partnerNetworkListingParts(
+ params: PartnerNetworkListingParams,
+): PartnerNetworkListingParts {
+ const listingPlatformSome = listingPlatformSomeFromParams(params);
+
+ return {
+ listingPartnerBase: {
+ discoverableAt: { not: null },
+ ...(params.partnerIds && {
+ id: { in: params.partnerIds },
+ }),
+ ...(params.country && {
+ country: params.country,
+ }),
+ },
+ listingPlatformSome,
+ };
+}
+
+export function partnerWhereFromListingParts(
+ parts: PartnerNetworkListingParts,
+): Prisma.PartnerWhereInput {
+ return {
+ ...parts.listingPartnerBase,
+ ...(parts.listingPlatformSome && {
+ platforms: {
+ some: parts.listingPlatformSome,
+ },
+ }),
+ };
+}
+
+export function partnerNetworkListingWhere(
+ params: PartnerNetworkListingParams,
+): Prisma.PartnerWhereInput {
+ return partnerWhereFromListingParts(partnerNetworkListingParts(params));
+}