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.

improve commission table indexes

Steven Teyff19c094fa3e
diff --git a/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts b/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts
index 416b202325..1c70ad288b 100644
--- a/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts
+++ b/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts
@@ -32,10 +32,10 @@ export async function getCommissionsTimeseries({
SUM(earnings) AS commissions
FROM Commission
WHERE
- ${programId ? Prisma.sql`programId = ${programId}` : Prisma.sql`programId != ${ACME_PROGRAM_ID}`}
- AND createdAt >= ${startDate}
+ createdAt >= ${startDate}
AND createdAt < ${endDate}
AND status IN ("pending", "processed", "paid")
+ AND ${programId ? Prisma.sql`programId = ${programId}` : Prisma.sql`programId != ${ACME_PROGRAM_ID}`}
GROUP BY start
ORDER BY start ASC;`;
diff --git a/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts b/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts
index 1989042ae0..0f6586f0bb 100644
--- a/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts
+++ b/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts
@@ -16,9 +16,6 @@ export async function getTopProgramsByCommissions({
earnings: true,
},
where: {
- programId: programId || {
- not: ACME_PROGRAM_ID,
- },
createdAt: {
gte: startDate,
lte: endDate,
@@ -26,6 +23,9 @@ export async function getTopProgramsByCommissions({
status: {
in: ["pending", "processed", "paid"],
},
+ programId: programId || {
+ not: ACME_PROGRAM_ID,
+ },
},
orderBy: {
_sum: {
diff --git a/packages/prisma/schema/commission.prisma b/packages/prisma/schema/commission.prisma
index 1e9e398e69..63c12f2d85 100644
--- a/packages/prisma/schema/commission.prisma
+++ b/packages/prisma/schema/commission.prisma
@@ -38,7 +38,7 @@ model Commission {
program Program @relation(fields: [programId], references: [id])
partner Partner @relation(fields: [partnerId], references: [id])
- programEnrollment ProgramEnrollment @relation(fields: [programId, partnerId], references: [programId, partnerId]) // used in cron/payouts/aggregate-due-commissions
+ programEnrollment ProgramEnrollment @relation(fields: [programId, partnerId], references: [programId, partnerId])
payout Payout? @relation(fields: [payoutId], references: [id])
link Link? @relation(fields: [linkId], references: [id])
customer Customer? @relation(fields: [customerId], references: [id])
@@ -46,8 +46,10 @@ model Commission {
bountySubmission BountySubmission?
@@unique([invoiceId, programId])
- @@index([earnings, programId, partnerId, status])
- @@index([programId, createdAt, status, amount, earnings])
+ @@index([earnings, programId, partnerId, status]) // old index
+ @@index([programId, partnerId]) // for programEnrollment relation (used in cron/payouts/aggregate-due-commissions)
+ @@index([programId, status, createdAt, amount, earnings]) // for program/commissions (scoped by programId)
+ @@index([createdAt, status, programId, earnings]) // for admin/commissions
@@index([partnerId, customerId])
@@index(payoutId)
@@index(customerId)
diff --git a/packages/prisma/schema/notification.prisma b/packages/prisma/schema/notification.prisma
index 43d8adae2c..1889efe568 100644
--- a/packages/prisma/schema/notification.prisma
+++ b/packages/prisma/schema/notification.prisma
@@ -39,8 +39,6 @@ model UserNotificationPreferences {
partnerAccount Boolean @default(true)
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
-
- @@index(userId)
}
// TODO: update this to WorkspaceNotificationPreferences