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.

Null discount groupId on group delete and fix related soft-delete guards.

Kiran K0b34e7eb0631
diff --git a/apps/web/lib/api/groups/delete-group.ts b/apps/web/lib/api/groups/delete-group.ts
index 61dfe7d9e4..fd36e72723 100644
--- a/apps/web/lib/api/groups/delete-group.ts
+++ b/apps/web/lib/api/groups/delete-group.ts
@@ -58,6 +58,7 @@ export async function deletePartnerGroup(
},
data: {
programId: null,
+ groupId: null,
},
});
diff --git a/apps/web/lib/api/groups/move-partners-to-group.ts b/apps/web/lib/api/groups/move-partners-to-group.ts
index 6a1ffb8909..2e9abdfb6f 100644
--- a/apps/web/lib/api/groups/move-partners-to-group.ts
+++ b/apps/web/lib/api/groups/move-partners-to-group.ts
@@ -69,9 +69,7 @@ export async function movePartnersToGroup({
in: partnerIds,
},
programId,
- groupId: {
- not: group.id,
- },
+ OR: [{ groupId: { not: group.id } }, { groupId: null }],
};
const programEnrollmentsBefore = await tx.programEnrollment.findMany({
diff --git a/apps/web/lib/discounts/create-discount-code.ts b/apps/web/lib/discounts/create-discount-code.ts
index c70f2148a3..3d9a95431b 100644
--- a/apps/web/lib/discounts/create-discount-code.ts
+++ b/apps/web/lib/discounts/create-discount-code.ts
@@ -29,6 +29,13 @@ export async function createDiscountCode({
discount,
code,
}: CreateDiscountCodeArgs) {
+ if (!discount.programId) {
+ throw new DubApiError({
+ code: "not_found",
+ message: `Discount ${discount.id} not found.`,
+ });
+ }
+
const finalCode =
code ||
constructDiscountCode({
@@ -134,19 +141,12 @@ async function createDiscountCodeRecord({
canRetry: boolean;
discountProvider: ReturnType<typeof getDiscountProvider>;
}): Promise<CreateDiscountCodeRecordResult> {
- if (!discount.programId) {
- throw new DubApiError({
- code: "not_found",
- message: `Discount ${discount.id} not found.`,
- });
- }
-
try {
const discountCode = await prisma.discountCode.create({
data: {
id: createId({ prefix: "dcode_" }),
code,
- programId: discount.programId,
+ programId: discount.programId!,
partnerId: partner.id,
linkId: link.id,
discountId: discount.id,
diff --git a/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts b/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts
index a1ffe50a66..12ba91a71f 100644
--- a/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts
+++ b/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts
@@ -43,7 +43,7 @@ export const publishDiscountCodesCreationJob = defineJob({
return;
}
- if (!discount.programId || !discount.groupId) {
+ if (!discount.programId) {
console.info(`Discount ${discountId} is soft-deleted. Skipping...`);
return;
}