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.

missed a few spots

Steven Tey394dc343dcfa
diff --git a/apps/web/lib/partners/create-partner-commission.ts b/apps/web/lib/partners/create-partner-commission.ts
index 3cd95e3568..bec91708f0 100644
--- a/apps/web/lib/partners/create-partner-commission.ts
+++ b/apps/web/lib/partners/create-partner-commission.ts
@@ -22,6 +22,7 @@ import { Session } from "../auth";
import { RewardContext, RewardProps } from "../types";
import { sendWorkspaceWebhook } from "../webhook/publish";
import { CommissionWebhookSchema } from "../zod/schemas/commissions";
+import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
import { aggregatePartnerLinksStats } from "./aggregate-partner-links-stats";
import { determinePartnerReward } from "./determine-partner-reward";
import { getRewardAmount } from "./get-reward-amount";
@@ -285,7 +286,6 @@ export const createPartnerCommission = async ({
name: true,
slug: true,
logo: true,
- holdingPeriodDays: true,
supportEmail: true,
workspace: {
select: {
@@ -295,6 +295,17 @@ export const createPartnerCommission = async ({
webhookEnabled: true,
},
},
+ // if no partner group is found, need to fetch default group to fallback to
+ ...(!programEnrollment.partnerGroup && {
+ groups: {
+ select: {
+ holdingPeriodDays: true,
+ },
+ where: {
+ slug: DEFAULT_PARTNER_GROUP.slug,
+ },
+ },
+ }),
},
});
@@ -321,7 +332,8 @@ export const createPartnerCommission = async ({
!isClawback &&
notifyPartnerCommission({
program,
- group: programEnrollment.partnerGroup ?? { holdingPeriodDays: 0 },
+ // fallback to default group if no partner group is found
+ group: programEnrollment.partnerGroup ?? program.groups[0],
workspace,
commission,
}),
diff --git a/apps/web/lib/rewardful/import-campaigns.ts b/apps/web/lib/rewardful/import-campaigns.ts
index 0f8621f5d0..14bc0de6b1 100644
--- a/apps/web/lib/rewardful/import-campaigns.ts
+++ b/apps/web/lib/rewardful/import-campaigns.ts
@@ -155,7 +155,6 @@ export async function importCampaigns(payload: RewardfulImportPayload) {
},
data: {
minPayoutAmount: minimum_payout_cents,
- holdingPeriodDays: days_until_commissions_are_due,
},
});
console.log(
diff --git a/apps/web/scripts/migrations/backfill-group-settings.ts b/apps/web/scripts/migrations/backfill-group-settings.ts
index 31b4eed772..81a09dfa13 100644
--- a/apps/web/scripts/migrations/backfill-group-settings.ts
+++ b/apps/web/scripts/migrations/backfill-group-settings.ts
@@ -1,3 +1,5 @@
+// @ts-nocheck - old migration script
+
import { prisma } from "@dub/prisma";
import "dotenv-flow/config";
diff --git a/apps/web/scripts/migrations/revert-due-commission-aggregation.ts b/apps/web/scripts/migrations/revert-due-commission-aggregation.ts
deleted file mode 100644
index c7c5d6e573..0000000000
--- a/apps/web/scripts/migrations/revert-due-commission-aggregation.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import { prisma } from "@dub/prisma";
-import { chunk } from "@dub/utils";
-import "dotenv-flow/config";
-
-async function main() {
- const programsByHoldingPeriod = await prisma.program.groupBy({
- by: ["holdingPeriodDays"],
- _count: {
- id: true,
- },
- orderBy: {
- _count: {
- id: "desc",
- },
- },
- });
-
- for (const { holdingPeriodDays } of programsByHoldingPeriod) {
- if (holdingPeriodDays === 0) {
- console.log("no need to process for program with holding period days: 0");
- continue;
- }
- const programs = await prisma.program.findMany({
- where: {
- holdingPeriodDays,
- },
- select: {
- id: true,
- name: true,
- },
- });
- const shouldBePendingCommissions = await prisma.commission.findMany({
- where: {
- status: "processed",
- programId: {
- in: programs.map((p) => p.id),
- },
- type: {
- not: "custom",
- },
- createdAt: {
- gte: new Date(Date.now() - holdingPeriodDays * 24 * 60 * 60 * 1000),
- },
- },
- take: 5000,
- });
- console.log(
- `Found ${shouldBePendingCommissions.length} should be pending commissions for programs with holding period days: ${holdingPeriodDays}`,
- );
- const res = await prisma.commission.updateMany({
- where: {
- id: {
- in: shouldBePendingCommissions.map((c) => c.id),
- },
- },
- data: {
- status: "pending",
- payoutId: null,
- },
- });
- console.log(`Updated ${res.count} commissions to have status "pending"`);
- const payoutsToUpdate = shouldBePendingCommissions.reduce(
- (acc, commission) => {
- if (commission.payoutId) {
- acc.push(commission.payoutId);
- }
- return acc;
- },
- [] as string[],
- );
- console.log(`Payouts to update: ${payoutsToUpdate.join(", ")}`);
- const groupedByPayouts = await prisma.commission.groupBy({
- by: ["payoutId"],
- where: {
- status: "processed",
- payoutId: {
- in: payoutsToUpdate,
- },
- },
- _sum: {
- earnings: true,
- },
- });
-
- console.log(
- `Grouped by payouts: ${JSON.stringify(groupedByPayouts, null, 2)}`,
- );
- const chunks = chunk(groupedByPayouts, 50);
- for (const chunk of chunks) {
- await Promise.allSettled(
- chunk.map(async ({ payoutId, _sum }) => {
- if (!payoutId || !_sum.earnings) {
- console.log(
- `Missing values: ${JSON.stringify({ payoutId, _sum }, null, 2)}`,
- );
- return;
- }
- await prisma.payout.update({
- where: { id: payoutId },
- data: {
- amount: _sum.earnings,
- },
- });
- console.log(
- `Updated payout ${payoutId} with amount ${_sum.earnings}`,
- );
- }),
- );
- }
-
- const emptyPayoutsToDelete = payoutsToUpdate.filter((payoutId) => {
- const payout = groupedByPayouts.find((p) => p.payoutId === payoutId);
- return !payout || payout._sum.earnings === 0;
- });
- const deletedPayouts = await prisma.payout.deleteMany({
- where: {
- id: {
- in: emptyPayoutsToDelete,
- },
- },
- });
- console.log(`Deleted ${deletedPayouts.count} payouts with no commissions`);
- }
-}
-
-main();