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.

Merge branch 'main' into dynamic-bounty-start-date

Kiran Kff27840bf482
diff --cc apps/web/app/(ee)/api/bounties/[bountyId]/route.ts
index 2f35707700,918d6fc54b..f83efe5f5b
--- a/apps/web/app/(ee)/api/bounties/[bountyId]/route.ts
+++ b/apps/web/app/(ee)/api/bounties/[bountyId]/route.ts
@@@ -6,12 -6,12 +6,14 @@@ import { parseRequestBody } from "@/lib
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 { shouldUpsertDraftSubmissionsOnReopen } from "@/lib/bounty/api/upsert-draft-bounty-submissions";
import { validateBounty } from "@/lib/bounty/api/validate-bounty";
+ import { qstash } from "@/lib/cron";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import { prisma } from "@/lib/prisma";
import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
@@@ -20,8 -20,8 +22,8 @@@ import
submissionRequirementsSchema,
updateBountySchema,
} from "@/lib/zod/schemas/bounties";
- import { arrayEqual, deepEqual } from "@dub/utils";
+ import { APP_DOMAIN_WITH_NGROK, arrayEqual, deepEqual } from "@dub/utils";
-import { PartnerGroup, Prisma } from "@prisma/client";
+import { BountyStartMode, PartnerGroup, Prisma } from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import { NextResponse } from "next/server";
@@@ -335,6 -283,15 +346,17 @@@ export const PATCH = withWorkspace
trigger: "bounty.updated",
data: updatedBounty,
}),
+
+ shouldUpsertDraftSubmissions &&
+ qstash.publishJSON({
+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/bounties/upsert-draft-submissions`,
+ body: {
+ bountyId: bounty.id,
+ },
- notBefore: Math.floor(data.startsAt.getTime() / 1000),
++ ...(data.startsAt && {
++ notBefore: Math.floor(data.startsAt.getTime() / 1000),
++ }),
+ }),
]),
);
diff --cc apps/web/app/(ee)/api/cron/bounties/upsert-draft-submissions/route.ts
index 7045b11542,376771ba8e..21dea4b9e5
--- a/apps/web/app/(ee)/api/cron/bounties/upsert-draft-submissions/route.ts
+++ b/apps/web/app/(ee)/api/cron/bounties/upsert-draft-submissions/route.ts
@@@ -108,13 -95,12 +109,10 @@@ export async function POST(req: Request
},
}),
status: {
- in: [
- ProgramEnrollmentStatus.approved,
- ProgramEnrollmentStatus.invited,
- ],
+ in: COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES,
},
},
- select: {
- partnerId: true,
- totalCommissions: true,
+ include: {
links: {
select: {
clicks: true,