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.

Fix `restoreCanceledCommissions` logic

Steven Tey9d688f824b72
diff --git a/apps/web/lib/jobs/handlers/unban-partner-job.ts b/apps/web/lib/jobs/handlers/unban-partner-job.ts
index 3fcdb09a75..d97553aabc 100644
--- a/apps/web/lib/jobs/handlers/unban-partner-job.ts
+++ b/apps/web/lib/jobs/handlers/unban-partner-job.ts
@@ -168,6 +168,7 @@ async function restoreCanceledCommissions({
amount: true,
earnings: true,
status: true,
+ payoutId: true,
},
orderBy: {
id: "asc",
@@ -179,26 +180,57 @@ async function restoreCanceledCommissions({
break;
}
- const { count } = await prisma.commission.updateMany({
- where: {
- id: {
- in: commissions.map(({ id }) => id),
- },
- status: CommissionStatus.canceled,
- },
- data: {
- status: CommissionStatus.pending,
- },
- });
+ const commissionsWithPayouts = commissions.filter(
+ (commission) => commission.payoutId,
+ );
- await trackCommissionStatusUpdate({
- workspaceId,
- programId,
- commissions,
- newStatus: CommissionStatus.pending,
- });
+ if (commissionsWithPayouts.length > 0) {
+ const { count: restoredProcessedCommissions } =
+ await prisma.commission.updateMany({
+ where: {
+ id: {
+ in: commissionsWithPayouts.map(({ id }) => id),
+ },
+ status: CommissionStatus.canceled,
+ },
+ data: {
+ status: CommissionStatus.processed,
+ },
+ });
+ restoredCommissions += restoredProcessedCommissions;
+
+ await trackCommissionStatusUpdate({
+ workspaceId,
+ programId,
+ commissions,
+ newStatus: CommissionStatus.processed,
+ });
+ }
+
+ const commissionsWithoutPayouts = commissions.filter(
+ (commission) => !commission.payoutId,
+ );
+ if (commissionsWithoutPayouts.length > 0) {
+ const { count: restoredPendingCommissions } =
+ await prisma.commission.updateMany({
+ where: {
+ id: {
+ in: commissionsWithoutPayouts.map(({ id }) => id),
+ },
+ },
+ data: {
+ status: CommissionStatus.pending,
+ },
+ });
+ restoredCommissions += restoredPendingCommissions;
- restoredCommissions += count;
+ await trackCommissionStatusUpdate({
+ workspaceId,
+ programId,
+ commissions: commissionsWithoutPayouts,
+ newStatus: CommissionStatus.pending,
+ });
+ }
}
console.info(