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.

Add optional id to reward modifiers for activity log comparison

Kiran K1abd601fb9ba
diff --git a/apps/web/lib/zod/schemas/rewards.ts b/apps/web/lib/zod/schemas/rewards.ts
index 903f6c763e..b72eea5546 100644
--- a/apps/web/lib/zod/schemas/rewards.ts
+++ b/apps/web/lib/zod/schemas/rewards.ts
@@ -259,6 +259,7 @@ export const FLAT_REWARD_AMOUNT_SCHEMA = z
});
export const rewardConditionsSchema = z.object({
+ id: z.string().optional(),
operator: z.enum(["AND", "OR"]).default("AND"),
conditions: z.array(rewardConditionSchema).min(1),
amountInCents: FLAT_REWARD_AMOUNT_SCHEMA.optional(),
diff --git a/apps/web/scripts/migrations/backfill-reward-modifier-ids.ts b/apps/web/scripts/migrations/backfill-reward-modifier-ids.ts
new file mode 100644
index 0000000000..84dd65a3eb
--- /dev/null
+++ b/apps/web/scripts/migrations/backfill-reward-modifier-ids.ts
@@ -0,0 +1,49 @@
+import { RewardConditions } from "@/lib/types";
+import { prisma } from "@dub/prisma";
+import { Prisma } from "@dub/prisma/client";
+import "dotenv-flow/config";
+import { randomUUID } from "node:crypto";
+
+async function main() {
+ const rewards = await prisma.reward.findMany({
+ where: {
+ modifiers: {
+ not: Prisma.DbNull,
+ },
+ },
+ select: {
+ id: true,
+ modifiers: true,
+ },
+ });
+
+ if (rewards.length === 0) {
+ return;
+ }
+
+ for (const reward of rewards) {
+ const modifiers = reward.modifiers as RewardConditions[];
+
+ const hasMissingId = modifiers.some(
+ (m: { id?: string }) => m && typeof m === "object" && m.id == null,
+ );
+
+ if (!hasMissingId) {
+ continue;
+ }
+
+ const updatedModifiers = modifiers.map((m: RewardConditions) => {
+ return {
+ ...m,
+ id: m.id ?? randomUUID(),
+ };
+ });
+
+ await prisma.reward.update({
+ where: { id: reward.id },
+ data: { modifiers: updatedModifiers },
+ });
+ }
+}
+
+main();
diff --git a/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx b/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
index fa5dc6bcca..0ca72d50a1 100644
--- a/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
+++ b/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
@@ -99,6 +99,7 @@ export const getRewardPayload = ({ data }: { data: FormData }) => {
return {
...m,
+ id: m.id ?? crypto.randomUUID(),
conditions: m.conditions.map((c) => ({
...c,
value:
diff --git a/apps/web/ui/partners/rewards/rewards-logic.tsx b/apps/web/ui/partners/rewards/rewards-logic.tsx
index 64a98e3c31..ddcd205fa8 100644
--- a/apps/web/ui/partners/rewards/rewards-logic.tsx
+++ b/apps/web/ui/partners/rewards/rewards-logic.tsx
@@ -113,6 +113,7 @@ export function RewardsLogic({
const type = getValues("type");
appendModifier({
+ id: crypto.randomUUID(),
operator: "AND",
conditions: [{}],
amountInCents: