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.

Persist selected group reward and discount ids on links (#4532)

Kiran Kbc81d5e69c81
diff --git a/apps/web/app/(ee)/api/partners/links/route.ts b/apps/web/app/(ee)/api/partners/links/route.ts
index 455d74b668..4f1c89151e 100644
--- a/apps/web/app/(ee)/api/partners/links/route.ts
+++ b/apps/web/app/(ee)/api/partners/links/route.ts
@@ -5,7 +5,7 @@ import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-progr
import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";
import {
hasRewardAssignment,
- omitGroupDefaultRewardIds,
+ pickDefinedRewardIds,
toPartnerLinkRewardIdFields,
} from "@/lib/api/rewards/reward-overrides";
import { throwIfInvalidRewards } from "@/lib/api/rewards/throw-if-invalid-rewards";
@@ -192,15 +192,13 @@ export const POST = withWorkspace(
partnerName: partner.partner.name,
});
- // Validate link-level rewards
- const linkRewardInput = omitGroupDefaultRewardIds({
- rewardIds: {
- clickRewardId,
- leadRewardId,
- saleRewardId,
- discountId,
- },
- groupDefaults: partnerGroup,
+ // Validate link-level rewards. Persist the selected ids as-is, including
+ // the group default — link-level null inherits the partner override.
+ const linkRewardInput = pickDefinedRewardIds({
+ clickRewardId,
+ leadRewardId,
+ saleRewardId,
+ discountId,
});
const hasLinkLevelReward = hasRewardAssignment(linkRewardInput);
diff --git a/apps/web/lib/api/partners/update-partner-link.ts b/apps/web/lib/api/partners/update-partner-link.ts
index fa4975fa99..0f5e6d54a2 100644
--- a/apps/web/lib/api/partners/update-partner-link.ts
+++ b/apps/web/lib/api/partners/update-partner-link.ts
@@ -6,7 +6,7 @@ import { notifyPartnerRewardOverride } from "@/lib/api/partners/notify-partner-r
import {
hasRewardAssignment,
hasRewardIdsInput,
- omitGroupDefaultRewardIds,
+ pickDefinedRewardIds,
RewardOverrideIdsInput,
toPartnerLinkRewardIdFields,
} from "@/lib/api/rewards/reward-overrides";
@@ -112,11 +112,7 @@ export async function updatePartnerLink({
const { partnerGroup } = programEnrollment;
- // Group defaults are inherited; only persist real link-level overrides.
- const linkRewardInput = omitGroupDefaultRewardIds({
- rewardIds: body,
- groupDefaults: partnerGroup,
- });
+ const linkRewardInput = pickDefinedRewardIds(body);
await throwIfInvalidRewards({
programId,
diff --git a/apps/web/lib/api/rewards/reward-overrides.ts b/apps/web/lib/api/rewards/reward-overrides.ts
index 8c2e1c0d91..b23b5ea0c5 100644
--- a/apps/web/lib/api/rewards/reward-overrides.ts
+++ b/apps/web/lib/api/rewards/reward-overrides.ts
@@ -18,22 +18,11 @@ export const REWARD_OVERRIDE_ID_KEYS = [
"discountId",
] as const;
-// Group defaults are inherited; only persist real link-level overrides.
-const omitGroupDefault = ({
- value,
- groupDefaultId,
-}: {
- value: string | null | undefined;
- groupDefaultId: string | null | undefined;
-}) => (value && value === groupDefaultId ? null : value);
-
-export const omitGroupDefaultRewardIds = ({
- rewardIds,
- groupDefaults,
-}: {
- rewardIds: RewardOverrideIdsInput;
- groupDefaults: Partial<RewardOverrideIds> | null | undefined;
-}): RewardOverrideIdsInput => {
+// Keep explicit ids, including the group default. Link-level null means inherit
+// from the partner, so a selected group default must be stored as that id.
+export const pickDefinedRewardIds = (
+ rewardIds: RewardOverrideIdsInput,
+): RewardOverrideIdsInput => {
const result: RewardOverrideIdsInput = {};
for (const key of REWARD_OVERRIDE_ID_KEYS) {
@@ -42,10 +31,7 @@ export const omitGroupDefaultRewardIds = ({
continue;
}
- result[key] = omitGroupDefault({
- value,
- groupDefaultId: groupDefaults?.[key],
- });
+ result[key] = value;
}
return result;
diff --git a/apps/web/ui/modals/edit-partner-discount-modal.tsx b/apps/web/ui/modals/edit-partner-discount-modal.tsx
index 5d7d7221ea..eb5f9a2d82 100644
--- a/apps/web/ui/modals/edit-partner-discount-modal.tsx
+++ b/apps/web/ui/modals/edit-partner-discount-modal.tsx
@@ -61,22 +61,6 @@ function getEffectiveDiscountId({
);
}
-/**
- * Selecting the group default means no partner-specific override.
- * Preserve current persist behavior: write the group default id (not a different id).
- */
-function getDiscountIdToPersist({
- selectedDiscountId,
- groupDefaultDiscountId,
-}: {
- selectedDiscountId: string;
- groupDefaultDiscountId: string | null | undefined;
-}) {
- return selectedDiscountId === groupDefaultDiscountId
- ? groupDefaultDiscountId ?? null
- : selectedDiscountId;
-}
-
interface EditPartnerDiscountModalProps {
showModal: boolean;
setShowModal: (showModal: boolean) => void;
@@ -217,8 +201,6 @@ function EditPartnerDiscountModal({
return;
}
- const isGroupSelection = selectedDiscountId === groupDefaultDiscountId;
-
if (target.type === "partner") {
if (!workspaceId) {
return;
@@ -227,10 +209,7 @@ function EditPartnerDiscountModal({
await updateEnrollment({
workspaceId,
partnerId: partner.id,
- discountId: getDiscountIdToPersist({
- selectedDiscountId,
- groupDefaultDiscountId,
- }),
+ discountId: selectedDiscountId,
});
return;
}
@@ -238,7 +217,7 @@ function EditPartnerDiscountModal({
await updatePartnerLink(`/api/partners/links/${target.link.id}`, {
method: "PATCH",
body: {
- discountId: isGroupSelection ? null : selectedDiscountId,
+ discountId: selectedDiscountId,
},
onSuccess: async () => {
setShowModal(false);
@@ -256,7 +235,6 @@ function EditPartnerDiscountModal({
updatePartnerLink,
target,
partner.id,
- groupDefaultDiscountId,
],
);
diff --git a/apps/web/ui/modals/edit-partner-reward-modal.tsx b/apps/web/ui/modals/edit-partner-reward-modal.tsx
index e5c5eb9e7a..7474119a75 100644
--- a/apps/web/ui/modals/edit-partner-reward-modal.tsx
+++ b/apps/web/ui/modals/edit-partner-reward-modal.tsx
@@ -234,7 +234,6 @@ function EditPartnerRewardModal({
const persistOverride = useCallback(
async (activityDescription?: string) => {
const rewardIdColumn = REWARD_EVENT_COLUMN_MAPPING[event];
- const isGroupSelection = resolvedSelectedId === groupRewardId;
if (target.type === "partner") {
if (!workspaceId) {
@@ -244,9 +243,7 @@ function EditPartnerRewardModal({
await updateEnrollment({
workspaceId,
partnerId: partner.id,
- [rewardIdColumn]: isGroupSelection
- ? groupRewardId ?? null
- : resolvedSelectedId,
+ [rewardIdColumn]: resolvedSelectedId,
activityDescription,
});
return;
@@ -255,7 +252,7 @@ function EditPartnerRewardModal({
await updatePartnerLink(`/api/partners/links/${target.link.id}`, {
method: "PATCH",
body: {
- [rewardIdColumn]: isGroupSelection ? null : resolvedSelectedId,
+ [rewardIdColumn]: resolvedSelectedId,
activityDescription,
},
onSuccess: async () => {
@@ -269,7 +266,6 @@ function EditPartnerRewardModal({
workspaceId,
event,
resolvedSelectedId,
- groupRewardId,
updateEnrollment,
updatePartnerLink,
target,