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 commission update actions

Steven Tey231516acbafa
diff --git a/apps/web/lib/actions/partners/mark-commission-duplicate.ts b/apps/web/lib/actions/partners/mark-commission-duplicate.ts
index 832cd05fb7..d7e6c02588 100644
--- a/apps/web/lib/actions/partners/mark-commission-duplicate.ts
+++ b/apps/web/lib/actions/partners/mark-commission-duplicate.ts
@@ -43,30 +43,31 @@ export const markCommissionDuplicateAction = authActionClient
throw new Error("You cannot mark a paid commission as duplicate.");
}
- // there is a payout associated with this sale
- // we need to update the payout amount if the sale is being marked as duplicate
- if (commission.payout) {
- const earnings = commission.earnings;
- const revisedAmount = commission.payout.amount - earnings;
-
- await prisma.payout.update({
+ await prisma.$transaction(async (tx) => {
+ await tx.commission.update({
where: {
- id: commission.payout.id,
+ id: commission.id,
},
data: {
- amount: revisedAmount,
+ status: "duplicate",
+ payoutId: null,
},
});
- }
- await prisma.commission.update({
- where: {
- id: commission.id,
- },
- data: {
- status: "duplicate",
- payoutId: null,
- },
+ // if there is a payout associated with this commission
+ // we need to update the payout amount if the commission is being marked as duplicate
+ if (commission.payout) {
+ const earnings = commission.earnings;
+ const revisedAmount = commission.payout.amount - earnings;
+
+ if (revisedAmount === 0) {
+ return tx.payout.delete({ where: { id: commission.payout.id } });
+ }
+ return tx.payout.update({
+ where: { id: commission.payout.id },
+ data: { amount: revisedAmount },
+ });
+ }
});
waitUntil(
diff --git a/apps/web/lib/actions/partners/mark-commission-fraud-or-canceled.ts b/apps/web/lib/actions/partners/mark-commission-fraud-or-canceled.ts
index 30bcef0a86..c811b8d238 100644
--- a/apps/web/lib/actions/partners/mark-commission-fraud-or-canceled.ts
+++ b/apps/web/lib/actions/partners/mark-commission-fraud-or-canceled.ts
@@ -82,31 +82,27 @@ export const markCommissionFraudOrCanceledAction = authActionClient
>,
);
- await prisma.$transaction(
- Object.values(payoutUpdates).map(
- ({ payoutId, currentAmount, earningsToDeduct }) =>
- prisma.payout.update({
- where: {
- id: payoutId,
- },
- data: {
- amount: currentAmount - earningsToDeduct,
- },
- }),
+ await prisma.$transaction([
+ ...Object.values(payoutUpdates).map(
+ ({ payoutId, currentAmount, earningsToDeduct }) => {
+ if (currentAmount - earningsToDeduct === 0) {
+ return prisma.payout.delete({ where: { id: payoutId } });
+ }
+ return prisma.payout.update({
+ where: { id: payoutId },
+ data: { amount: currentAmount - earningsToDeduct },
+ });
+ },
),
- );
-
- await prisma.commission.updateMany({
- where: {
- id: {
- in: commissions.map((commission) => commission.id),
+ prisma.commission.updateMany({
+ where: {
+ id: {
+ in: commissions.map((commission) => commission.id),
+ },
},
- },
- data: {
- status,
- payoutId: null,
- },
- });
+ data: { status, payoutId: null },
+ }),
+ ]);
waitUntil(
(async () => {