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.

improve implementation

Steven Tey8328e0bf55e8
diff --git 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
index a8d2022e8d..c7d4c14ba2 100644
--- 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
@@ -24,7 +24,7 @@ const schema = z.object({
const MAX_PAGE_SIZE = 100;
// POST /api/cron/bounties/upsert-draft-submissions
-// Create or update draft/submitted bounty submissions for lifetime performance bounties
+// Create OR update draft bounty submissions for lifetime performance bounties
export async function POST(req: Request) {
try {
const rawBody = await req.text();
@@ -148,24 +148,30 @@ export async function POST(req: Request) {
},
);
- const existingSubmissions = await prisma.bountySubmission.findMany({
+ const existingDraftSubmissions = await prisma.bountySubmission.findMany({
where: {
bountyId: bounty.id,
partnerId: {
in: partners.map((partner) => partner.id),
},
- periodNumber: 1,
+ periodNumber: 1, // only one submission is allowed for performance based bounties
+ status: "draft",
},
select: {
id: true,
partnerId: true,
- status: true,
+ performanceCount: true,
},
});
const { toCreate, toUpdate } = planDraftBountySubmissionUpserts({
partners,
- existingSubmissions,
+ existingDraftSubmissions: existingDraftSubmissions.map((submission) => ({
+ ...submission,
+ performanceCount: submission.performanceCount
+ ? Number(submission.performanceCount)
+ : 0,
+ })),
condition,
programId: bounty.programId,
bountyId: bounty.id,
@@ -183,12 +189,12 @@ export async function POST(req: Request) {
: { count: 0 };
if (toUpdate.length > 0) {
- await prisma.$transaction(
+ await Promise.allSettled(
toUpdate.map((update) =>
- prisma.bountySubmission.updateMany({
+ prisma.bountySubmission.update({
where: {
id: update.id,
- status: update.expectedStatus,
+ status: "draft", // in case of race condition, we don't want to update an already submitted entry
},
data: {
performanceCount: update.performanceCount,
diff --git a/apps/web/lib/bounty/api/upsert-draft-bounty-submissions.ts b/apps/web/lib/bounty/api/upsert-draft-bounty-submissions.ts
index 5e6d096fb0..bc3a0a29b8 100644
--- a/apps/web/lib/bounty/api/upsert-draft-bounty-submissions.ts
+++ b/apps/web/lib/bounty/api/upsert-draft-bounty-submissions.ts
@@ -1,12 +1,7 @@
import { createId } from "@/lib/api/create-id";
import { awardBountyConditionSchema } from "@/lib/api/workflows/award-bounty/schema";
import { evaluateWorkflowConditions } from "@/lib/api/workflows/evaluate-workflow-conditions";
-import {
- BountyPerformanceScope,
- BountySubmissionStatus,
- BountyType,
- Prisma,
-} from "@prisma/client";
+import { BountyPerformanceScope, BountyType, Prisma } from "@prisma/client";
import * as z from "zod/v4";
type AwardBountyCondition = z.infer<typeof awardBountyConditionSchema>;
@@ -22,14 +17,13 @@ export type PartnerLifetimeStats = {
export type ExistingBountySubmission = {
id: string;
partnerId: string;
- status: BountySubmissionStatus;
+ performanceCount: number;
};
export type DraftBountySubmissionUpdate = {
id: string;
performanceCount: number;
promoteToSubmitted: boolean;
- expectedStatus: "draft" | "submitted";
};
export function shouldUpsertDraftSubmissionsOnReopen({
@@ -61,13 +55,13 @@ export function shouldUpsertDraftSubmissionsOnReopen({
export function planDraftBountySubmissionUpserts({
partners,
- existingSubmissions,
+ existingDraftSubmissions,
condition,
programId,
bountyId,
}: {
partners: PartnerLifetimeStats[];
- existingSubmissions: ExistingBountySubmission[];
+ existingDraftSubmissions: ExistingBountySubmission[];
condition: AwardBountyCondition;
programId: string;
bountyId: string;
@@ -76,7 +70,10 @@ export function planDraftBountySubmissionUpserts({
toUpdate: DraftBountySubmissionUpdate[];
} {
const existingByPartnerId = new Map(
- existingSubmissions.map((submission) => [submission.partnerId, submission]),
+ existingDraftSubmissions.map((submission) => [
+ submission.partnerId,
+ submission,
+ ]),
);
const toCreate: Prisma.BountySubmissionCreateManyInput[] = [];
@@ -86,20 +83,8 @@ export function planDraftBountySubmissionUpserts({
const performanceCount = partner[condition.attribute];
const existing = existingByPartnerId.get(partner.id);
+ // skip if no performanceCount
if (performanceCount <= 0) {
- if (!existing) {
- continue;
- }
-
- if (existing.status === "draft" || existing.status === "submitted") {
- toUpdate.push({
- id: existing.id,
- performanceCount,
- promoteToSubmitted: false,
- expectedStatus: existing.status,
- });
- }
-
continue;
}
@@ -125,22 +110,11 @@ export function planDraftBountySubmissionUpserts({
continue;
}
- if (existing.status === "draft") {
+ if (existing.performanceCount !== performanceCount) {
toUpdate.push({
id: existing.id,
performanceCount,
promoteToSubmitted: conditionMet,
- expectedStatus: "draft",
- });
- continue;
- }
-
- if (existing.status === "submitted") {
- toUpdate.push({
- id: existing.id,
- performanceCount,
- promoteToSubmitted: false,
- expectedStatus: "submitted",
});
}
}