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 discoverableAt

Steven Tey3d450c5d54e1
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-application-sheet.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-application-sheet.tsx
index b5cd5c1c3c..3e30a8f8e3 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-application-sheet.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-application-sheet.tsx
@@ -68,7 +68,7 @@ export function NetworkPartnerApplicationSheet({
setShowConfirmModal: setShowApproveConfirm,
confirmModal: approveModal,
} = useConfirmModal({
- title: "Approve network application",
+ title: "Approve network profile",
description: PartnerDetails,
confirmText: "Approve",
onConfirm: async () => {
@@ -82,7 +82,7 @@ export function NetworkPartnerApplicationSheet({
setShowConfirmModal: setShowRejectConfirm,
confirmModal: rejectModal,
} = useConfirmModal({
- title: "Reject network application",
+ title: "Reject network profile",
description: PartnerDetails,
confirmText: "Reject",
confirmVariant: "danger",
@@ -115,12 +115,12 @@ export function NetworkPartnerApplicationSheet({
useKeyboardShortcut("a", () => setShowApproveConfirm(true), {
sheet: true,
- enabled: !["rejected", "trusted"].includes(partner.networkStatus),
+ enabled: !["approved", "trusted"].includes(partner.networkStatus),
});
useKeyboardShortcut("r", () => setShowRejectConfirm(true), {
sheet: true,
- enabled: !["approved", "trusted"].includes(partner.networkStatus),
+ enabled: !["rejected", "trusted"].includes(partner.networkStatus),
});
return (
@@ -137,7 +137,7 @@ export function NetworkPartnerApplicationSheet({
<div className="flex size-full flex-col">
<div className="flex h-16 shrink-0 items-center justify-between border-b border-neutral-200 px-6 py-4">
<Sheet.Title className="text-lg font-semibold">
- Network application
+ Network profile
</Sheet.Title>
<div className="flex items-center gap-4">
<div className="flex items-center">
diff --git a/apps/web/app/(ee)/api/cron/partner-platforms/route.ts b/apps/web/app/(ee)/api/cron/partner-platforms/route.ts
index 5ffeee63c4..c4926fc2ad 100644
--- a/apps/web/app/(ee)/api/cron/partner-platforms/route.ts
+++ b/apps/web/app/(ee)/api/cron/partner-platforms/route.ts
@@ -51,10 +51,10 @@ export const POST = withCron(async ({ rawBody }) => {
lastCheckedAt: null,
},
],
- // only check partners that are discoverable in the partner network
+ // only check partners that are approved or trusted
partner: {
- discoverableAt: {
- not: null,
+ networkStatus: {
+ in: ["approved", "trusted"],
},
},
},
diff --git a/apps/web/app/(ee)/api/messages/route.ts b/apps/web/app/(ee)/api/messages/route.ts
index 483d7e7c73..179cac421e 100644
--- a/apps/web/app/(ee)/api/messages/route.ts
+++ b/apps/web/app/(ee)/api/messages/route.ts
@@ -25,9 +25,9 @@ export const GET = withWorkspace(
where: partnerId
? {
id: partnerId,
- // Partner is either discoverable, enrolled in the program, or already has a message with the program
+ // Partner is either approved or trusted in the partner network, enrolled in the program, or already has a message with the program
OR: [
- { discoverableAt: { not: null } },
+ { networkStatus: { in: ["approved", "trusted"] } },
{ programs: { some: { programId } } },
{ messages: { some: { programId } } },
],
diff --git a/apps/web/lib/actions/partners/message-partner.ts b/apps/web/lib/actions/partners/message-partner.ts
index c2f5ae50ff..723d05a458 100644
--- a/apps/web/lib/actions/partners/message-partner.ts
+++ b/apps/web/lib/actions/partners/message-partner.ts
@@ -42,14 +42,14 @@ export const messagePartnerAction = authActionClient
});
}
- // Make sure partner is either discoverable, enrolled in the program, or already has a message with the program
+ // Make sure partner is either approved or trusted in the partner network, enrolled in the program, or already has a message with the program
const { _count, programs } = await prisma.partner.findFirstOrThrow({
where: {
id: partnerId,
OR: [
{
- discoverableAt: {
- not: null,
+ networkStatus: {
+ in: ["approved", "trusted"],
},
},
{
diff --git a/apps/web/lib/api/network/calculate-partner-ranking.ts b/apps/web/lib/api/network/calculate-partner-ranking.ts
index 3a84eec53a..fb21e1fed3 100644
--- a/apps/web/lib/api/network/calculate-partner-ranking.ts
+++ b/apps/web/lib/api/network/calculate-partner-ranking.ts
@@ -49,7 +49,7 @@ export async function calculatePartnerRanking({
similarPrograms = [],
}: PartnerRankingParams) {
const conditions: Prisma.Sql[] = [
- Prisma.sql`p.discoverableAt IS NOT NULL`,
+ Prisma.sql`p.networkStatus IN ("approved", "trusted")`,
Prisma.sql`COALESCE(pe.clickToConversionRate, 0) < 1`,
Prisma.sql`(dp.ignoredAt IS NULL OR dp.id IS NULL)`,
Prisma.sql`enrolled.id IS NULL`,
@@ -131,7 +131,7 @@ export async function calculatePartnerRanking({
// This dramatically reduces the dataset from 1.5M to 5,000 before expensive joins
const buildDiscoverablePartnersFilter = (alias: string) => {
const conditions: Prisma.Sql[] = [
- Prisma.sql`${Prisma.raw(alias)}.discoverableAt IS NOT NULL`,
+ Prisma.sql`${Prisma.raw(alias)}.networkStatus IN ("approved", "trusted")`,
];
if (partnerIds && partnerIds.length > 0) {
diff --git a/apps/web/lib/api/network/partner-network-listing-where.ts b/apps/web/lib/api/network/partner-network-listing-where.ts
index f98aef6427..ed71bc122c 100644
--- a/apps/web/lib/api/network/partner-network-listing-where.ts
+++ b/apps/web/lib/api/network/partner-network-listing-where.ts
@@ -46,7 +46,7 @@ export function partnerNetworkListingParts(
return {
listingPartnerBase: {
- discoverableAt: { not: null },
+ networkStatus: { in: ["approved", "trusted"] },
...(params.partnerIds && {
id: { in: params.partnerIds },
}),
diff --git a/packages/prisma/schema/partner.prisma b/packages/prisma/schema/partner.prisma
index 1f022d36ba..2ccc66187e 100644
--- a/packages/prisma/schema/partner.prisma
+++ b/packages/prisma/schema/partner.prisma
@@ -73,7 +73,6 @@ model Partner {
// timestamp fields
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
- discoverableAt DateTime?
submittedAt DateTime?
reviewedAt DateTime?
trustedAt DateTime?
@@ -114,7 +113,6 @@ model Partner {
@@index(country)
@@index(networkStatus)
@@index(createdAt)
- @@index(discoverableAt) // TODO: remove index once we fully migrate to networkStatus
@@index(trustedAt) // TODO: remove index once we fully migrate to networkStatus
@@index(payoutMethodHash)
@@index(cryptoWalletAddress)