The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Merge branch 'main' into dynamic-bounty-start-date
Steven Teyb407c20982c1
diff --cc apps/web/app/(ee)/api/bounties/[bountyId]/route.tsindex daba15e74e,922486ecda..2f35707700--- a/apps/web/app/(ee)/api/bounties/[bountyId]/route.ts+++ b/apps/web/app/(ee)/api/bounties/[bountyId]/route.ts@@@ -3,10 -3,10 +3,12 @@@ import { DubApiError } from "@/lib/api/import { throwIfInvalidGroupIds } from "@/lib/api/groups/throw-if-invalid-group-ids";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { parseRequestBody } from "@/lib/api/utils";+ import { WorkflowCondition } from "@/lib/api/workflows/types";+ import { validateWorkflowConditions } from "@/lib/api/workflows/validate-workflow-conditions";import { withWorkspace } from "@/lib/auth";+import { bountyEligibilityIncludes } from "@/lib/bounty/api/bounty-availability";import { generatePerformanceBountyName } from "@/lib/bounty/api/generate-performance-bounty-name";+import { getBountyOrThrow } from "@/lib/bounty/api/get-bounty-or-throw";import { getBountyWithDetails } from "@/lib/bounty/api/get-bounty-with-details";import { PERFORMANCE_BOUNTY_SCOPE_ATTRIBUTES } from "@/lib/bounty/api/performance-bounty-scope-attributes";import { validateBounty } from "@/lib/bounty/api/validate-bounty";diff --cc apps/web/app/(ee)/api/bounties/route.tsindex 61a2e79c63,e995e591a0..c672aecf9c--- a/apps/web/app/(ee)/api/bounties/route.ts+++ b/apps/web/app/(ee)/api/bounties/route.ts@@@ -5,13 -5,9 +5,15 @@@ import { throwIfInvalidGroupIds } fromimport { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";import { parseRequestBody } from "@/lib/api/utils";+ import { WorkflowAction } from "@/lib/api/workflows/types";+ import { validateWorkflowConditions } from "@/lib/api/workflows/validate-workflow-conditions";import { withWorkspace } from "@/lib/auth";+import {+ bountyEligibilityIncludes,+ buildBountyEligibilityWhere,+ getEffectiveBountyPeriod,+ isPartnerEligibleForBounty,+} from "@/lib/bounty/api/bounty-availability";import { generatePerformanceBountyName } from "@/lib/bounty/api/generate-performance-bounty-name";import { validateBounty } from "@/lib/bounty/api/validate-bounty";import { qstash } from "@/lib/cron";@@@ -176,12 -168,20 +177,19 @@@ export const POST = withWorkspaceperformanceCondition,performanceScope,sendNotificationEmails,+ startMode,+ endsAfterDays,} = parsedBody;- // Use current date as default if startsAt is not provided- startsAt = startsAt || new Date();-validateBounty(parsedBody);+ if (type === "performance" && performanceCondition) {+ await validateWorkflowConditions({+ conditions: [performanceCondition],+ workflowType: "awardBounty",+ });+ }+const { canUseBountySocialMetrics, canSendEmailCampaigns } =getPlanCapabilities(workspace.plan);diff --cc apps/web/app/(ee)/api/cron/bounties/create-draft-submissions/route.tsindex fac6aa6efe,ff0234134c..7045b11542--- a/apps/web/app/(ee)/api/cron/bounties/create-draft-submissions/route.ts+++ b/apps/web/app/(ee)/api/cron/bounties/create-draft-submissions/route.ts@@@ -1,14 -1,13 +1,14 @@@import { createId } from "@/lib/api/create-id";import { handleAndReturnErrorResponse } from "@/lib/api/errors";+ import { awardBountyConditionSchema } from "@/lib/api/workflows/award-bounty/schema";import { evaluateWorkflowConditions } from "@/lib/api/workflows/evaluate-workflow-conditions";+import { isPartnerEligibleForBounty } from "@/lib/bounty/api/bounty-availability";import { qstash } from "@/lib/cron";import { verifyQstashSignature } from "@/lib/cron/verify-qstash";import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";import { prisma } from "@/lib/prisma";- import { workflowConditionSchema } from "@/lib/zod/schemas/workflows";import { APP_DOMAIN_WITH_NGROK, log, toCentsNumber } from "@dub/utils";-import { Prisma } from "@prisma/client";+import { Prisma, ProgramEnrollmentStatus } from "@prisma/client";import { differenceInMinutes } from "date-fns";import * as z from "zod/v4";import { logAndRespond } from "../../utils";@@@ -149,74 -133,57 +149,74 @@@ export async function POST(req: Request// Find the workflow conditionconst condition = z- .array(workflowConditionSchema)+ .array(awardBountyConditionSchema).parse(bounty.workflow.triggerConditions)[0];- // Partners with their link metrics- const partners = programEnrollments.map((programEnrollment) => {- return {- id: programEnrollment.partnerId,+ const bountySubmissionsToCreate: Prisma.BountySubmissionCreateManyInput[] =+ [];++ for (const programEnrollment of programEnrollments) {+ const performanceCount = {...aggregatePartnerLinksStats(programEnrollment.links),totalCommissions: toCentsNumber(programEnrollment.totalCommissions),- };- });+ }[condition.attribute];++ if (!performanceCount || performanceCount <= 0) {+ console.log(+ `Partner ${programEnrollment.partnerId} has no performance count for bounty ${bountyId}.`,+ );+ continue;+ }++ const isEligible = isPartnerEligibleForBounty({+ program: bounty.program,+ bounty,+ programEnrollment,+ });- const bountySubmissionsToCreate: Prisma.BountySubmissionCreateManyInput[] =- partners- // only create submissions for partners that have at least 1 performanceCount- .filter((partner) => partner[condition.attribute] > 0)- .map((partner) => {- const performanceCount = partner[condition.attribute];-- const conditionMet = evaluateWorkflowConditions({- conditions: [condition],- attributes: {- [condition.attribute]: performanceCount,- },- });-- return {- id: createId({ prefix: "bnty_sub_" }),- programId: bounty.programId,- partnerId: partner.id,- bountyId: bounty.id,- performanceCount,- // If the condition is met, automatically submit the submission- ...(conditionMet && {- status: "submitted",- completedAt: new Date(),- }),- };- });-- console.table(bountySubmissionsToCreate);+ if (!isEligible) {+ console.log(+ `Partner ${programEnrollment.partnerId} is not eligible for bounty ${bountyId}.`,+ );+ continue;+ }++ const conditionMet = evaluateWorkflowConditions({+ conditions: [condition],+ attributes: {+ [condition.attribute]: performanceCount,+ },+ });++ bountySubmissionsToCreate.push({+ id: createId({ prefix: "bnty_sub_" }),+ programId: bounty.programId,+ partnerId: programEnrollment.partnerId,+ bountyId: bounty.id,+ performanceCount: Math.min(performanceCount, condition.value as number),+ // If the condition is met, automatically submit the submission+ ...(conditionMet && {+ status: "submitted",+ completedAt: new Date(),+ }),+ });+ }// Create bounty submissions- const createdBountySubmissions = await prisma.bountySubmission.createMany({- data: bountySubmissionsToCreate,- skipDuplicates: true,- });+ if (bountySubmissionsToCreate.length > 0) {+ console.table(bountySubmissionsToCreate);- console.log(- `Created ${createdBountySubmissions.count} bounty submissions for bounty ${bountyId}.`,- );+ const createdBountySubmissions = await prisma.bountySubmission.createMany(+ {+ data: bountySubmissionsToCreate,+ skipDuplicates: true,+ },+ );++ console.log(+ `Created ${createdBountySubmissions.count} bounty submissions for bounty ${bountyId}.`,+ );+ }if (programEnrollments.length === MAX_PAGE_SIZE) {const response = await qstash.publishJSON({diff --cc apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.tsindex 5ae2fc3bc6,d5d21b169c..b2c68149c4--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts@@@ -1,8 -1,8 +1,9 @@@"use client";+ import { awardBountyConditionSchema } from "@/lib/api/workflows/award-bounty/schema";import { isCurrencyAttribute } from "@/lib/api/workflows/utils";import { generatePerformanceBountyName } from "@/lib/bounty/api/generate-performance-bounty-name";+import { resolveBountyTiming } from "@/lib/bounty/bounty-period";import {BOUNTY_DESCRIPTION_MAX_LENGTH,BOUNTY_MAX_SUBMISSIONS,@@@ -12,21 -12,10 +13,18 @@@ import { mutatePrefix } from "@/lib/swrimport { useApiMutation } from "@/lib/swr/use-api-mutation";import useWorkspace from "@/lib/swr/use-workspace";import { BountyProps } from "@/lib/types";- import {- bountyPerformanceConditionSchema,- bountySocialContentRequirementsSchema,- } from "@/lib/zod/schemas/bounties";+ import { bountySocialContentRequirementsSchema } from "@/lib/zod/schemas/bounties";import { formatDate } from "@dub/utils";-import { BountySubmissionFrequency } from "@prisma/client";-import { Dispatch, SetStateAction, useEffect, useMemo, useState } from "react";+import { BountyStartMode, BountySubmissionFrequency } from "@prisma/client";+import { addDays } from "date-fns";+import {+ Dispatch,+ SetStateAction,+ useCallback,+ useEffect,+ useMemo,+ useState,+} from "react";import { useForm } from "react-hook-form";import { toast } from "sonner";import { BountyTypeUI, CreateBountyInputExtended } from "./bounty-form-context";@@@ -685,28 -616,18 +691,28 @@@ export function useAddEditBountyForm(type === "performance" && performanceCondition? generatePerformanceBountyName({rewardAmount: rewardAmount ? rewardAmount * 100 : 0,- condition: isCurrencyAttribute(- performanceCondition?.attribute,- )- ? {- ...performanceCondition,- value: performanceCondition?.value * 100,- }- : performanceCondition,+ condition:+ typeof performanceCondition?.value === "number" &&+ isCurrencyAttribute(performanceCondition?.attribute)+ ? {+ ...performanceCondition,+ value: performanceCondition.value * 100,+ }+ : performanceCondition,}): name || "New bounty",- startsAt: startsAt || new Date(),- endsAt: endsAt || null,+ startsAt:+ startMode === BountyStartMode.relative+ ? null+ : startsAt || new Date(),+ endsAt:+ startMode === BountyStartMode.relative+ ? endsAfterDays != null+ ? null+ : endsAt ?? null+ : effectiveEndsAt,+ startMode: startMode ?? BountyStartMode.absolute,+ endsAfterDays: endsAfterDays ?? null,rewardAmount: rewardAmount ? rewardAmount * 100 : null,rewardDescription: rewardDescription || null,submissionRequirements: submissionRequirements ?? null,diff --cc apps/web/lib/api/workflows/award-bounty/execute.tsindex 2ad63c771b,26c83d3e37..f9b1476eba--- a/apps/web/lib/api/workflows/award-bounty/execute.ts+++ b/apps/web/lib/api/workflows/award-bounty/execute.ts@@@ -1,10 -1,6 +1,10 @@@import { evaluateWorkflowConditions } from "@/lib/api/workflows/evaluate-workflow-conditions";+ import { WorkflowContext } from "@/lib/api/workflows/types";+import {+ getEffectiveBountyPeriod,+ isPartnerEligibleForBounty,+} from "@/lib/bounty/api/bounty-availability";import { prisma } from "@/lib/prisma";- import { WorkflowConditionAttribute, WorkflowContext } from "@/lib/types";import { WORKFLOW_ACTION_TYPES } from "@/lib/zod/schemas/workflows";import { sendBatchEmail, sendEmail } from "@dub/email";import BountyCompleted from "@dub/email/templates/bounty-completed";diff --cc apps/web/lib/zod/schemas/bounties.tsindex 64858abb6f,19e9128c85..d6b9e0dfe3--- a/apps/web/lib/zod/schemas/bounties.ts+++ b/apps/web/lib/zod/schemas/bounties.ts@@@ -124,11 -117,9 +118,11 @@@ export const createBountySchema = z.obj.nullish(),submissionRequirements: submissionRequirementsSchema.nullish(),groupIds: z.array(z.string()).nullable(),- performanceCondition: bountyPerformanceConditionSchema.nullish(),+ performanceCondition: awardBountyConditionSchema.nullish(),performanceScope: z.enum(BountyPerformanceScope).nullish(),sendNotificationEmails: z.boolean().optional(),+ startMode: z.enum(BountyStartMode).default(BountyStartMode.absolute),+ endsAfterDays: z.number().int().positive().nullish(),});export const updateBountySchema = createBountySchemadiff --cc apps/web/lib/zod/schemas/partner-profile.tsindex a04b49a8da,baa1d344f7..f55fa8030d--- a/apps/web/lib/zod/schemas/partner-profile.ts+++ b/apps/web/lib/zod/schemas/partner-profile.ts@@@ -166,11 -163,8 +163,9 @@@ export const PartnerBountySchema = Boungroups: true,socialMetricsLastSyncedAt: true,}).extend({+ startsAt: z.date(), // Always resolved to the partner's effective start date (never null)submissions: z.array(partnerBountySubmissionSchema),- performanceCondition: bountyPerformanceConditionSchema- .nullable()- .default(null),+ performanceCondition: awardBountyConditionSchema.nullable().default(null),partner: z.object({totalClicks: z.number(),totalLeads: z.number(),