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.

update getPartnerEnrollmentInfo

Steven Tey1105359734db
diff --git a/apps/web/lib/api/groups/get-groups.ts b/apps/web/lib/api/groups/get-groups.ts
index 626e9d0d7d..23fc46f663 100644
--- a/apps/web/lib/api/groups/get-groups.ts
+++ b/apps/web/lib/api/groups/get-groups.ts
@@ -7,19 +7,6 @@ type GroupFilters = z.infer<typeof getGroupsQuerySchema> & {
programId: string;
};
-// secondary sort column
-const secondarySortColumnMap = {
- createdAt: "totalClicks",
- totalPartners: "totalSaleAmount",
- totalClicks: "totalLeads",
- totalLeads: "totalConversions",
- totalConversions: "totalSaleAmount",
- totalSales: "totalSaleAmount",
- totalSaleAmount: "totalLeads",
- totalCommissions: "totalSaleAmount",
- netRevenue: "totalSaleAmount",
-};
-
export async function getGroups(filters: GroupFilters) {
const {
search,
@@ -87,7 +74,7 @@ export async function getGroups(filters: GroupFilters) {
${search ? Prisma.sql`AND (pg.name LIKE ${`%${search}%`} OR pg.slug LIKE ${`%${search}%`})` : Prisma.sql``}
${groupIds && groupIds.length > 0 ? Prisma.sql`AND pg.id IN (${Prisma.join(groupIds)})` : Prisma.sql``}
GROUP BY pg.id
- ORDER BY ${Prisma.raw(sortBy === "createdAt" ? "pg.createdAt" : sortBy)} ${Prisma.raw(sortOrder)}, ${Prisma.raw(secondarySortColumnMap[sortBy])} ${Prisma.raw(sortOrder)}
+ ORDER BY ${Prisma.raw(sortBy === "createdAt" ? "pg.createdAt" : sortBy)} ${Prisma.raw(sortOrder)}
LIMIT ${pageSize} OFFSET ${(page - 1) * pageSize}
`) satisfies Array<any>;
diff --git a/apps/web/lib/api/links/create-link.ts b/apps/web/lib/api/links/create-link.ts
index d603a38ab7..caec292ba2 100644
--- a/apps/web/lib/api/links/create-link.ts
+++ b/apps/web/lib/api/links/create-link.ts
@@ -141,7 +141,7 @@ export async function createLink(link: ProcessedLinkProps) {
waitUntil(
(async () => {
- const { partner, discount, group } = await getPartnerEnrollmentInfo({
+ const { partner, discount } = await getPartnerEnrollmentInfo({
programId: response.programId,
partnerId: response.partnerId,
});
@@ -157,7 +157,9 @@ export async function createLink(link: ProcessedLinkProps) {
// Record link in Tinybird
recordLink({
...response,
- ...(group && { programEnrollment: { groupId: group.id } }),
+ ...(partner?.groupId && {
+ programEnrollment: { groupId: partner.groupId },
+ }),
}),
// Upload image to R2 and update the link with the uploaded image URL when
diff --git a/apps/web/lib/api/links/update-link.ts b/apps/web/lib/api/links/update-link.ts
index 1b077a3a7c..1189c7c334 100644
--- a/apps/web/lib/api/links/update-link.ts
+++ b/apps/web/lib/api/links/update-link.ts
@@ -170,7 +170,7 @@ export async function updateLink({
waitUntil(
(async () => {
- const { partner, discount, group } = await getPartnerEnrollmentInfo({
+ const { partner, discount } = await getPartnerEnrollmentInfo({
programId: response.programId,
partnerId: response.partnerId,
});
@@ -186,7 +186,9 @@ export async function updateLink({
// Record link in Tinybird
recordLink({
...response,
- ...(group && { programEnrollment: { groupId: group.id } }),
+ ...(partner?.groupId && {
+ programEnrollment: { groupId: partner.groupId },
+ }),
}),
// If key is changed: delete the old key in Redis
diff --git a/apps/web/lib/planetscale/get-partner-enrollment-info.ts b/apps/web/lib/planetscale/get-partner-enrollment-info.ts
index ed64a5dee8..e8cb305afe 100644
--- a/apps/web/lib/planetscale/get-partner-enrollment-info.ts
+++ b/apps/web/lib/planetscale/get-partner-enrollment-info.ts
@@ -11,6 +11,7 @@ interface QueryResult {
couponId: string | null;
couponTestId: string | null;
groupId: string | null;
+ tenantId: string | null;
}
// Get enrollment info for a partner in a program
@@ -24,7 +25,6 @@ export const getPartnerEnrollmentInfo = async ({
if (!partnerId || !programId) {
return {
partner: null,
- group: null,
discount: null,
};
}
@@ -40,7 +40,8 @@ export const getPartnerEnrollmentInfo = async ({
Discount.maxDuration,
Discount.couponId,
Discount.couponTestId,
- ProgramEnrollment.groupId
+ ProgramEnrollment.groupId,
+ ProgramEnrollment.tenantId
FROM ProgramEnrollment
LEFT JOIN Partner ON Partner.id = ProgramEnrollment.partnerId
LEFT JOIN Discount ON Discount.id = ProgramEnrollment.discountId
@@ -64,9 +65,8 @@ export const getPartnerEnrollmentInfo = async ({
id: result.id,
name: result.name,
image: result.image,
- },
- group: {
- id: result.groupId,
+ groupId: result.groupId,
+ tenantId: result.tenantId,
},
discount: result.discountId
? {
diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.ts
index d5c530f6b1..2c277898aa 100644
--- a/apps/web/lib/types.ts
+++ b/apps/web/lib/types.ts
@@ -188,7 +188,10 @@ export interface RedisLinkProps {
webhookIds?: string[];
programId?: string;
partnerId?: string;
- partner?: Pick<PartnerProps, "id" | "name" | "image">;
+ partner?: Pick<PartnerProps, "id" | "name" | "image"> & {
+ groupId?: string | null;
+ tenantId?: string | null;
+ };
discount?: Pick<
DiscountProps,
"id" | "amount" | "type" | "maxDuration" | "couponId" | "couponTestId"