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.

Approve social metrics milestones incrementally and simplify single-tier buttons

Kiran K265f2c85ecb0
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx
index 43f94fd4e8..d220105ef1 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx
@@ -165,11 +165,15 @@ function BountySubmissionDetailsSheetContent({
return true;
}, [bounty, rewardAmount]);
- const { isSocialMetricsBounty, pendingMilestones, hasReachedEarningCap } =
- useSocialMetricsMilestones({
- bounty,
- submission,
- });
+ const {
+ isSocialMetricsBounty,
+ hasMultipleMilestones,
+ pendingMilestones,
+ hasReachedEarningCap,
+ } = useSocialMetricsMilestones({
+ bounty,
+ submission,
+ });
const canApprove =
submission?.status !== "draft" &&
@@ -585,7 +589,7 @@ function BountySubmissionDetailsSheetContent({
<Button
type="button"
variant="danger"
- text={isSocialMetricsBounty ? "Reject all" : "Reject"}
+ text={hasMultipleMilestones ? "Reject all" : "Reject"}
shortcut="R"
disabledTooltip={
permissionsError
@@ -604,7 +608,7 @@ function BountySubmissionDetailsSheetContent({
type="button"
variant="primary"
text={
- !isSocialMetricsBounty
+ !hasMultipleMilestones
? "Approve"
: pendingMilestones.length > 0
? `Approve ${pendingMilestones.length} ${pluralize("milestone", pendingMilestones.length)}`
diff --git a/apps/web/lib/bounty/api/approve-bounty-submission.ts b/apps/web/lib/bounty/api/approve-bounty-submission.ts
index 7ada528df8..b051ab7a32 100644
--- a/apps/web/lib/bounty/api/approve-bounty-submission.ts
+++ b/apps/web/lib/bounty/api/approve-bounty-submission.ts
@@ -1,7 +1,11 @@
import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
import { DubApiError } from "@/lib/api/errors";
import { Session } from "@/lib/auth";
-import { calculateSocialMetricsRewardAmount } from "@/lib/bounty/rewards";
+import {
+ buildMilestonesCommissionDescription,
+ getPendingSocialMetricsMilestones,
+ getSocialMetricsEarningCap,
+} from "@/lib/bounty/social-metrics-milestones";
import { resolveBountyDetails } from "@/lib/bounty/utils";
import { queuePartnerCommissionCreation } from "@/lib/partners/queue-partner-commission-creation";
import { prisma } from "@/lib/prisma";
@@ -11,7 +15,12 @@ import {
} from "@/lib/zod/schemas/bounties";
import { sendEmail } from "@dub/email";
import BountyApproved from "@dub/email/templates/bounty-approved";
-import { BountySubmissionStatus, CommissionSource } from "@prisma/client";
+import { nFormatter } from "@dub/utils";
+import {
+ BountySubmissionStatus,
+ CommissionSource,
+ Prisma,
+} from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import * as z from "zod/v4";
@@ -23,6 +32,49 @@ interface ApproveBountySubmissionParams
user: Session["user"];
}
+const submissionApprovalInclude = {
+ partner: {
+ select: {
+ id: true,
+ email: true,
+ },
+ },
+ program: {
+ select: {
+ workspaceId: true,
+ id: true,
+ name: true,
+ slug: true,
+ supportEmail: true,
+ },
+ },
+} satisfies Prisma.BountySubmissionInclude;
+
+type ApprovedSubmission = Prisma.BountySubmissionGetPayload<{
+ include: typeof submissionApprovalInclude;
+}>;
+
+const submissionApprovalSelect = {
+ programId: true,
+ partnerId: true,
+ bountyId: true,
+ status: true,
+ socialMetricCount: true,
+ approvedSocialMetricThreshold: true,
+ bounty: {
+ select: {
+ name: true,
+ type: true,
+ rewardAmount: true,
+ submissionRequirements: true,
+ },
+ },
+} satisfies Prisma.BountySubmissionSelect;
+
+type SubmissionToApprove = Prisma.BountySubmissionGetPayload<{
+ select: typeof submissionApprovalSelect;
+}>;
+
export async function approveBountySubmission({
bountyId,
programId,
@@ -34,21 +86,7 @@ export async function approveBountySubmission({
where: {
id: submissionId,
},
- select: {
- programId: true,
- partnerId: true,
- bountyId: true,
- status: true,
- socialMetricCount: true,
- bounty: {
- select: {
- name: true,
- type: true,
- rewardAmount: true,
- submissionRequirements: true,
- },
- },
- },
+ select: submissionApprovalSelect,
});
if (!submission) {
@@ -89,17 +127,18 @@ export async function approveBountySubmission({
const bounty = submission.bounty;
const bountyInfo = resolveBountyDetails(bounty);
- let finalRewardAmount = bounty.rewardAmount ?? rewardAmount;
-
- if (bountyInfo?.hasSocialMetrics) {
- const socialRewardAmount = calculateSocialMetricsRewardAmount({
- bounty,
+ // If the bounty has social metrics, approve the milestones
+ if (bountyInfo?.socialMetrics) {
+ return approveSocialMetricsMilestones({
+ submissionId,
submission,
+ metric: bountyInfo.socialMetrics.metric,
+ user,
});
-
- finalRewardAmount = socialRewardAmount;
}
+ const finalRewardAmount = bounty.rewardAmount ?? rewardAmount;
+
if (!finalRewardAmount) {
throw new DubApiError({
code: "bad_request",
@@ -125,23 +164,7 @@ export async function approveBountySubmission({
rejectionNote: null,
rejectionReason: null,
},
- include: {
- partner: {
- select: {
- id: true,
- email: true,
- },
- },
- program: {
- select: {
- workspaceId: true,
- id: true,
- name: true,
- slug: true,
- supportEmail: true,
- },
- },
- },
+ include: submissionApprovalInclude,
})
.catch((error) => {
if (error.code === "P2025") {
@@ -167,6 +190,144 @@ export async function approveBountySubmission({
bountySubmissionId: submissionId,
});
+ runApprovalSideEffects({
+ approvedSubmission,
+ bounty,
+ user,
+ description: `Bounty submission approved for ${approvedSubmission.partner.id}`,
+ notifyPartner: true,
+ });
+
+ return BountySubmissionSchema.parse(approvedSubmission);
+}
+
+async function approveSocialMetricsMilestones({
+ submissionId,
+ submission,
+ metric,
+ user,
+}: {
+ submissionId: string;
+ submission: SubmissionToApprove;
+ metric: string;
+ user: Session["user"];
+}) {
+ const { bounty } = submission;
+
+ const pendingMilestones = getPendingSocialMetricsMilestones({
+ bounty,
+ submission,
+ });
+
+ const earningCap = getSocialMetricsEarningCap(bounty);
+
+ if (pendingMilestones.length === 0 || earningCap == null) {
+ throw new DubApiError({
+ code: "bad_request",
+ message:
+ "The partner hasn't reached a new milestone for this bounty yet, so there is nothing to approve.",
+ });
+ }
+
+ const firstPendingMilestone = pendingMilestones[0];
+ const approvedThreshold =
+ pendingMilestones[pendingMilestones.length - 1].threshold;
+ const completesEarningCap = approvedThreshold >= earningCap;
+
+ const approvedSubmission = await prisma.bountySubmission
+ .update({
+ where: {
+ id: submissionId,
+ approvedSocialMetricThreshold: submission.approvedSocialMetricThreshold,
+ status: {
+ notIn: [
+ BountySubmissionStatus.approved,
+ BountySubmissionStatus.draft,
+ ],
+ },
+ },
+ data: {
+ approvedSocialMetricThreshold: approvedThreshold,
+ status: completesEarningCap ? "approved" : "submitted",
+ reviewedAt: new Date(),
+ userId: user.id,
+ rejectionNote: null,
+ rejectionReason: null,
+ },
+ include: submissionApprovalInclude,
+ })
+ .catch((error) => {
+ if (error.code === "P2025") {
+ throw new DubApiError({
+ code: "bad_request",
+ message:
+ "These milestones have already been approved or the submission is no longer awaiting review.",
+ });
+ }
+
+ throw error;
+ });
+
+ const rewardAmount = pendingMilestones.reduce(
+ (sum, { rewardAmount }) => sum + rewardAmount,
+ 0,
+ );
+
+ const description = buildMilestonesCommissionDescription({
+ bountyName: bounty.name,
+ metric,
+ milestone: {
+ fromThreshold: firstPendingMilestone.fromThreshold,
+ threshold: approvedThreshold,
+ },
+ });
+
+ await queuePartnerCommissionCreation({
+ event: "custom",
+ partnerId: submission.partnerId,
+ programId: submission.programId,
+ amount: rewardAmount,
+ quantity: 1,
+ userId: user.id,
+ source: CommissionSource.user,
+ description,
+ bountySubmissionId: submissionId,
+ metadata: {
+ socialMetrics: {
+ metric,
+ fromThreshold: firstPendingMilestone.fromThreshold,
+ threshold: approvedThreshold,
+ milestones: pendingMilestones,
+ },
+ },
+ });
+
+ runApprovalSideEffects({
+ approvedSubmission,
+ bounty,
+ user,
+ description: completesEarningCap
+ ? `Bounty submission approved for ${approvedSubmission.partner.id}`
+ : `Bounty milestones approved up to ${nFormatter(approvedThreshold, { full: true })} ${metric} for ${approvedSubmission.partner.id}`,
+ notifyPartner: completesEarningCap,
+ });
+
+ return BountySubmissionSchema.parse(approvedSubmission);
+}
+
+function runApprovalSideEffects({
+ approvedSubmission,
+ bounty,
+ user,
+ description,
+ notifyPartner,
+}: {
+ approvedSubmission: ApprovedSubmission;
+ bounty: Pick<SubmissionToApprove["bounty"], "name" | "type">;
+ user: Session["user"];
+ description: string;
+ notifyPartner: boolean;
+}) {
const { program, partner } = approvedSubmission;
waitUntil(
@@ -175,18 +336,19 @@ export async function approveBountySubmission({
workspaceId: program.workspaceId,
programId: program.id,
action: "bounty_submission.approved",
- description: `Bounty submission approved for ${partner.id}`,
+ description,
actor: user,
targets: [
{
type: "bounty_submission",
- id: submissionId,
+ id: approvedSubmission.id,
metadata: BountySubmissionSchema.parse(approvedSubmission),
},
],
}),
- partner.email &&
+ notifyPartner &&
+ partner.email &&
sendEmail({
subject: "Bounty approved!",
to: partner.email,
@@ -206,6 +368,4 @@ export async function approveBountySubmission({
}),
]),
);
-
- return BountySubmissionSchema.parse(approvedSubmission);
}
diff --git a/apps/web/ui/partners/bounties/use-social-metrics-milestones.ts b/apps/web/ui/partners/bounties/use-social-metrics-milestones.ts
index a4d840b122..07e8b7a5a8 100644
--- a/apps/web/ui/partners/bounties/use-social-metrics-milestones.ts
+++ b/apps/web/ui/partners/bounties/use-social-metrics-milestones.ts
@@ -1,6 +1,7 @@
import {
getPendingSocialMetricsMilestones,
getSocialMetricsEarningCap,
+ getSocialMetricsMilestones,
hasReachedSocialMetricsEarningCap,
SubmissionMilestoneInput,
} from "@/lib/bounty/social-metrics-milestones";
@@ -30,6 +31,9 @@ export function useSocialMetricsMilestones({
0,
);
+ const hasMultipleMilestones =
+ isSocialMetricsBounty && getSocialMetricsMilestones(bounty).length > 1;
+
const earningCap = getSocialMetricsEarningCap(bounty);
const lastPendingMilestone = pendingMilestones[pendingMilestones.length - 1];
@@ -46,6 +50,7 @@ export function useSocialMetricsMilestones({
return {
metric,
isSocialMetricsBounty,
+ hasMultipleMilestones,
pendingMilestones,
pendingRewardAmount,
completesEarningCap,