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.

Rename hideRevenueFromPartnersAt to revenueDataSharingDisabledAt.

Kiran Ke6c6f373391c
diff --git a/apps/web/app/(ee)/api/cron/export/customers/partner/route.ts b/apps/web/app/(ee)/api/cron/export/customers/partner/route.ts
index bdd9818ce0..da92972599 100644
--- a/apps/web/app/(ee)/api/cron/export/customers/partner/route.ts
+++ b/apps/web/app/(ee)/api/cron/export/customers/partner/route.ts
@@ -68,7 +68,7 @@ export const POST = withCron(async ({ rawBody }) => {
},
partnerGroup: {
select: {
- hideRevenueFromPartnersAt: true,
+ revenueDataSharingDisabledAt: true,
},
},
},
diff --git a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
index c8970da248..81009d3936 100644
--- a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
+++ b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
@@ -13,6 +13,7 @@ import { generateRandomString } from "@/lib/api/utils/generate-random-string";
import { MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING } from "@/lib/constants/partner-profile";
import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
import { generateRandomName } from "@/lib/names";
+import { isPartnerRevenueHidden } from "@/lib/partners/is-partner-revenue-hidden";
import { prisma } from "@/lib/prisma";
import {
partnerProfileEventsQuerySchema,
@@ -45,8 +46,13 @@ export async function POST(req: Request) {
rawBody,
});
- const { columns, partnerId, programId, userId, ...parsedParams } =
- payloadSchema.parse(JSON.parse(rawBody));
+ const {
+ columns: columnsParam,
+ partnerId,
+ programId,
+ userId,
+ ...parsedParams
+ } = payloadSchema.parse(JSON.parse(rawBody));
const user = await prisma.user.findUnique({
where: {
@@ -65,16 +71,38 @@ export async function POST(req: Request) {
return logAndRespond(`User ${userId} has no email. Skipping the export.`);
}
- const { program, links, customerDataSharingEnabledAt } =
+ const { program, links, customerDataSharingEnabledAt, partnerGroup } =
await getProgramEnrollmentOrThrow({
partnerId,
programId,
include: {
- program: true,
- links: true,
+ program: {
+ select: {
+ name: true,
+ workspaceId: true,
+ startedAt: true,
+ createdAt: true,
+ },
+ },
+ links: {
+ select: {
+ id: true,
+ domain: true,
+ key: true,
+ },
+ },
+ partnerGroup: {
+ select: {
+ revenueDataSharingDisabledAt: true,
+ },
+ },
},
});
+ const columns = columnsParam.filter(
+ (c) => !(isPartnerRevenueHidden(partnerGroup) && c === "saleAmount"),
+ );
+
// If no links, return early with empty export
if (links.length === 0) {
return logAndRespond("No links found. Skipping the export.");
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
index 0c4b87d80b..a1174a09e4 100644
--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
@@ -62,7 +62,7 @@ export const PATCH = withWorkspace(
landerData,
holdingPeriodDays,
autoApprovePartners,
- hideRevenueFromPartners,
+ revenueDataSharingDisabled,
updateAutoApprovePartnersForAllGroups,
updateHoldingPeriodDaysForAllGroups,
moveRules,
@@ -154,8 +154,8 @@ export const PATCH = withWorkspace(
? new Date()
: null,
}),
- ...(hideRevenueFromPartners !== undefined && {
- hideRevenueFromPartnersAt: hideRevenueFromPartners
+ ...(revenueDataSharingDisabled !== undefined && {
+ revenueDataSharingDisabledAt: revenueDataSharingDisabled
? new Date()
: null,
}),
diff --git a/apps/web/app/(ee)/api/groups/route.ts b/apps/web/app/(ee)/api/groups/route.ts
index 7b88c46fe2..4af5efd00a 100644
--- a/apps/web/app/(ee)/api/groups/route.ts
+++ b/apps/web/app/(ee)/api/groups/route.ts
@@ -114,7 +114,7 @@ export const POST = withWorkspace(
landerData,
holdingPeriodDays,
autoApprovePartnersEnabledAt,
- hideRevenueFromPartnersAt,
+ revenueDataSharingDisabledAt,
submittedLeadFormData,
submittedLeadsEnabledAt,
} = program.groups[0];
@@ -131,7 +131,7 @@ export const POST = withWorkspace(
brandColor,
holdingPeriodDays,
autoApprovePartnersEnabledAt,
- hideRevenueFromPartnersAt,
+ revenueDataSharingDisabledAt,
submittedLeadsEnabledAt,
...(additionalLinks && {
additionalLinks: sanitizeAdditionalLinks(additionalLinks),
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
index 442fe0c2ba..90010bafcb 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
@@ -8,6 +8,8 @@ import {
LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS,
MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING,
} from "@/lib/constants/partner-profile";
+import { omitSaleAmount } from "@/lib/partners/hide-partner-revenue";
+import { isPartnerRevenueHidden } from "@/lib/partners/is-partner-revenue-hidden";
import { partnerProfileAnalyticsQuerySchema } from "@/lib/zod/schemas/partner-profile";
import { parseFilterValue, toCentsNumber } from "@dub/utils";
import { NextResponse } from "next/server";
@@ -15,13 +17,31 @@ import { NextResponse } from "next/server";
// GET /api/partner-profile/programs/[programId]/analytics – get analytics for a program enrollment link
export const GET = withPartnerProfile(
async ({ partner, params, searchParams }) => {
- const { program, links, totalCommissions } =
+ const { program, links, totalCommissions, partnerGroup } =
await getProgramEnrollmentOrThrow({
partnerId: partner.id,
programId: params.programId,
include: {
- program: true,
- links: true,
+ program: {
+ select: {
+ id: true,
+ workspaceId: true,
+ startedAt: true,
+ createdAt: true,
+ },
+ },
+ links: {
+ select: {
+ id: true,
+ domain: true,
+ key: true,
+ },
+ },
+ partnerGroup: {
+ select: {
+ revenueDataSharingDisabledAt: true,
+ },
+ },
},
});
@@ -96,6 +116,24 @@ export const GET = withPartnerProfile(
dataAvailableFrom: program.startedAt ?? program.createdAt,
});
+ if (!isPartnerRevenueHidden(partnerGroup)) {
+ return NextResponse.json(response);
+ }
+
+ if (Array.isArray(response)) {
+ return NextResponse.json(
+ response.map((row) =>
+ row && typeof row === "object" && "saleAmount" in row
+ ? omitSaleAmount(row)
+ : row,
+ ),
+ );
+ }
+
+ if (response && typeof response === "object" && "saleAmount" in response) {
+ return NextResponse.json(omitSaleAmount(response));
+ }
+
return NextResponse.json(response);
},
);
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/route.ts
index ad82102854..93dd70327b 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/route.ts
@@ -1,5 +1,6 @@
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { withPartnerProfile } from "@/lib/auth/partner";
+import { hidePartnerLinkSaleAmount } from "@/lib/partners/hide-partner-revenue";
import { ProgramEnrollmentSchema } from "@/lib/zod/schemas/programs";
import { Reward } from "@prisma/client";
import { NextResponse } from "next/server";
@@ -38,11 +39,16 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
programEnrollment.customReward,
].filter((r): r is Reward => r !== null);
+ const { partnerGroup } = programEnrollment;
+
return NextResponse.json(
ProgramEnrollmentSchema.parse({
...programEnrollment,
+ links: programEnrollment.links?.map((link) =>
+ hidePartnerLinkSaleAmount(link, partnerGroup),
+ ),
rewards,
- group: programEnrollment.partnerGroup,
+ group: partnerGroup,
application: programEnrollment.application
? {
rejectionReason: programEnrollment.application.rejectionReason,
diff --git a/apps/web/lib/api/groups/get-groups.ts b/apps/web/lib/api/groups/get-groups.ts
index 9194458601..244e21d8ed 100644
--- a/apps/web/lib/api/groups/get-groups.ts
+++ b/apps/web/lib/api/groups/get-groups.ts
@@ -42,7 +42,7 @@ export async function getGroups(filters: GroupFilters) {
pg.brandColor,
pg.holdingPeriodDays,
pg.autoApprovePartnersEnabledAt,
- pg.hideRevenueFromPartnersAt,
+ pg.revenueDataSharingDisabledAt,
pg.submittedLeadsEnabledAt,
pg.utmTemplateId,
pg.createdAt,
diff --git a/apps/web/lib/firstpromoter/import-campaigns.ts b/apps/web/lib/firstpromoter/import-campaigns.ts
index ead01eb8f1..e167526d68 100644
--- a/apps/web/lib/firstpromoter/import-campaigns.ts
+++ b/apps/web/lib/firstpromoter/import-campaigns.ts
@@ -44,7 +44,7 @@ export async function importCampaigns(payload: FirstPromoterImportPayload) {
brandColor,
holdingPeriodDays,
autoApprovePartnersEnabledAt,
- hideRevenueFromPartnersAt,
+ revenueDataSharingDisabledAt,
additionalLinks,
maxPartnerLinks,
linkStructure,
@@ -94,7 +94,7 @@ export async function importCampaigns(payload: FirstPromoterImportPayload) {
brandColor,
holdingPeriodDays,
autoApprovePartnersEnabledAt,
- hideRevenueFromPartnersAt,
+ revenueDataSharingDisabledAt,
submittedLeadsEnabledAt,
...(additionalLinks && {
additionalLinks: sanitizeAdditionalLinks(additionalLinks),
diff --git a/apps/web/lib/rewardful/import-campaigns.ts b/apps/web/lib/rewardful/import-campaigns.ts
index ce6bff707b..d7356dd273 100644
--- a/apps/web/lib/rewardful/import-campaigns.ts
+++ b/apps/web/lib/rewardful/import-campaigns.ts
@@ -52,7 +52,7 @@ export async function importCampaigns(payload: RewardfulImportPayload) {
brandColor,
holdingPeriodDays,
autoApprovePartnersEnabledAt,
- hideRevenueFromPartnersAt,
+ revenueDataSharingDisabledAt,
additionalLinks,
maxPartnerLinks,
linkStructure,
@@ -107,7 +107,7 @@ export async function importCampaigns(payload: RewardfulImportPayload) {
brandColor,
holdingPeriodDays,
autoApprovePartnersEnabledAt,
- hideRevenueFromPartnersAt,
+ revenueDataSharingDisabledAt,
submittedLeadsEnabledAt,
...(additionalLinks && {
additionalLinks: sanitizeAdditionalLinks(additionalLinks),
diff --git a/apps/web/lib/zod/schemas/groups.ts b/apps/web/lib/zod/schemas/groups.ts
index 0815465f4c..3150ac208c 100644
--- a/apps/web/lib/zod/schemas/groups.ts
+++ b/apps/web/lib/zod/schemas/groups.ts
@@ -65,7 +65,7 @@ export const GroupSchema = z.object({
brandColor: z.string().nullable(),
holdingPeriodDays: z.number(),
autoApprovePartnersEnabledAt: z.coerce.date().nullish(),
- hideRevenueFromPartnersAt: z.coerce.date().nullish(),
+ revenueDataSharingDisabledAt: z.coerce.date().nullish(),
submittedLeadsEnabledAt: z.coerce.date().nullish(),
clickReward: RewardSchema.nullish(),
leadReward: RewardSchema.nullish(),
@@ -155,7 +155,7 @@ export const updateGroupSchema = createGroupSchema.partial().extend({
)
.optional(),
autoApprovePartners: z.coerce.boolean().optional(),
- hideRevenueFromPartners: z.coerce.boolean().optional(),
+ revenueDataSharingDisabled: z.coerce.boolean().optional(),
updateAutoApprovePartnersForAllGroups: z.coerce.boolean().optional(),
updateHoldingPeriodDaysForAllGroups: z.coerce.boolean().optional(),
moveRules: workflowConditionsSchema.optional(),
diff --git a/apps/web/lib/zod/schemas/programs.ts b/apps/web/lib/zod/schemas/programs.ts
index 49f7aad01e..a0267bc3d5 100644
--- a/apps/web/lib/zod/schemas/programs.ts
+++ b/apps/web/lib/zod/schemas/programs.ts
@@ -204,7 +204,7 @@ export const ProgramEnrollmentSchema = z.object({
wordmark: true,
brandColor: true,
holdingPeriodDays: true,
- hideRevenueFromPartnersAt: true,
+ revenueDataSharingDisabledAt: true,
additionalLinks: true,
maxPartnerLinks: true,
linkStructure: true,
diff --git a/apps/web/prisma/schema/group.prisma b/apps/web/prisma/schema/group.prisma
index 4f83190059..0b6f1ffaa8 100644
--- a/apps/web/prisma/schema/group.prisma
+++ b/apps/web/prisma/schema/group.prisma
@@ -28,7 +28,7 @@ model PartnerGroup {
brandColor String?
holdingPeriodDays Int @default(0) // number of days to wait before earnings are added to a payout
autoApprovePartnersEnabledAt DateTime?
- hideRevenueFromPartnersAt DateTime?
+ revenueDataSharingDisabledAt DateTime?
submittedLeadFormData Json? @db.Json
submittedLeadsEnabledAt DateTime?
workflowId String? @unique