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.

Remove groupJoinedAt field

Kiran K26dce41f270a
diff --git a/apps/web/app/(ee)/api/bounties/[bountyId]/sync-social-metrics/route.ts b/apps/web/app/(ee)/api/bounties/[bountyId]/sync-social-metrics/route.ts
index 4090e76021..956b6d41c9 100644
--- a/apps/web/app/(ee)/api/bounties/[bountyId]/sync-social-metrics/route.ts
+++ b/apps/web/app/(ee)/api/bounties/[bountyId]/sync-social-metrics/route.ts
@@ -56,7 +56,6 @@ export const POST = withWorkspace(
partner: true,
programEnrollment: {
select: {
- groupJoinedAt: true,
createdAt: true,
},
},
diff --git a/apps/web/app/(ee)/api/cron/bounties/sync-social-metrics/route.ts b/apps/web/app/(ee)/api/cron/bounties/sync-social-metrics/route.ts
index 31f8e274fd..a99496993e 100644
--- a/apps/web/app/(ee)/api/cron/bounties/sync-social-metrics/route.ts
+++ b/apps/web/app/(ee)/api/cron/bounties/sync-social-metrics/route.ts
@@ -78,7 +78,6 @@ export const POST = withCron(async ({ rawBody }) => {
},
programEnrollment: {
select: {
- groupJoinedAt: true,
createdAt: true,
},
},
diff --git a/apps/web/lib/actions/partners/accept-program-invite.ts b/apps/web/lib/actions/partners/accept-program-invite.ts
index 516d5c2711..447806269d 100644
--- a/apps/web/lib/actions/partners/accept-program-invite.ts
+++ b/apps/web/lib/actions/partners/accept-program-invite.ts
@@ -34,7 +34,6 @@ export const acceptProgramInviteAction = authPartnerActionClient
data: {
status: "approved",
createdAt: now,
- groupJoinedAt: now,
},
include: {
links: true,
diff --git a/apps/web/lib/actions/partners/bulk-approve-partners.ts b/apps/web/lib/actions/partners/bulk-approve-partners.ts
index e5b5e12b74..0466c3562d 100644
--- a/apps/web/lib/actions/partners/bulk-approve-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-approve-partners.ts
@@ -62,7 +62,6 @@ export const bulkApprovePartnersAction = authActionClient
data: {
status: "approved",
createdAt: now,
- groupJoinedAt: now,
groupId: group.id,
clickRewardId: group.clickRewardId,
leadRewardId: group.leadRewardId,
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 cfbc9090c1..bded179de3 100644
--- a/apps/web/lib/api/groups/move-partners-to-group.ts
+++ b/apps/web/lib/api/groups/move-partners-to-group.ts
@@ -82,7 +82,6 @@ export async function movePartnersToGroup({
},
data: {
groupId: group.id,
- groupJoinedAt: new Date(),
clickRewardId: group.clickRewardId,
leadRewardId: group.leadRewardId,
saleRewardId: group.saleRewardId,
diff --git a/apps/web/lib/api/partners/applications/approve-partner.ts b/apps/web/lib/api/partners/applications/approve-partner.ts
index eec659b2fb..2509e3fc1d 100644
--- a/apps/web/lib/api/partners/applications/approve-partner.ts
+++ b/apps/web/lib/api/partners/applications/approve-partner.ts
@@ -94,7 +94,6 @@ export async function approvePartner({
data: {
status: "approved",
createdAt: now,
- groupJoinedAt: now,
groupId: group.id,
clickRewardId: group.clickRewardId,
leadRewardId: group.leadRewardId,
diff --git a/apps/web/lib/api/partners/create-and-enroll-partner.ts b/apps/web/lib/api/partners/create-and-enroll-partner.ts
index 40325e3830..a30ad9585f 100644
--- a/apps/web/lib/api/partners/create-and-enroll-partner.ts
+++ b/apps/web/lib/api/partners/create-and-enroll-partner.ts
@@ -158,9 +158,6 @@ export const createAndEnrollPartner = async ({
...(enrolledAt && {
createdAt: enrolledAt,
}),
- ...(status === "approved" && {
- groupJoinedAt: enrolledAt ?? new Date(),
- }),
},
},
};
diff --git a/apps/web/lib/bounty/api/bounty-availability.ts b/apps/web/lib/bounty/api/bounty-availability.ts
index 35edd04832..0fcc8e9c5c 100644
--- a/apps/web/lib/bounty/api/bounty-availability.ts
+++ b/apps/web/lib/bounty/api/bounty-availability.ts
@@ -26,7 +26,7 @@ type PartnerBountyEligibilityInput = {
};
programEnrollment: Pick<
ProgramEnrollment,
- "groupJoinedAt" | "createdAt" | "groupId" | "status"
+ "createdAt" | "groupId" | "status"
>;
};
@@ -95,18 +95,16 @@ export function getEffectiveBountyPeriod({
programEnrollment,
bounty,
}: {
- programEnrollment: Pick<ProgramEnrollment, "groupJoinedAt" | "createdAt">;
+ programEnrollment: Pick<ProgramEnrollment, "createdAt">;
bounty: Pick<Bounty, "startsAt" | "endsAt" | "endsAfterDays" | "startMode">;
}) {
- const { createdAt, groupJoinedAt } = programEnrollment;
+ const { createdAt } = programEnrollment;
const { startsAt, endsAt, endsAfterDays, startMode } = bounty;
// If startMode is absolute, use the startsAt (Assumed to be set).
- // If startMode is relative, use the groupJoinedAt or createdAt.
+ // If startMode is relative, use the program enrollment createdAt.
const bountyStartDate =
- startMode === BountyStartMode.absolute
- ? startsAt!
- : groupJoinedAt || createdAt;
+ startMode === BountyStartMode.absolute ? startsAt! : createdAt;
return {
startsAt: bountyStartDate,
@@ -136,14 +134,11 @@ export function isPartnerEligibleForBounty({
return false;
}
- // Relative bounties are for new partners only (joined on/after bounty creation)
+ // Relative bounties are for new partners only (enrolled on/after bounty creation)
if (bounty.startMode === BountyStartMode.relative) {
- const partnerJoinedAt =
- programEnrollment.groupJoinedAt || programEnrollment.createdAt;
-
- if (partnerJoinedAt < bounty.createdAt) {
+ if (programEnrollment.createdAt < bounty.createdAt) {
console.log(
- `Partner joined before relative bounty ${bounty.id} was created.`,
+ `Partner enrolled before relative bounty ${bounty.id} was created.`,
);
return false;
}
diff --git a/apps/web/lib/bounty/api/get-bounties-for-partner.ts b/apps/web/lib/bounty/api/get-bounties-for-partner.ts
index ecc65517f6..467244f872 100644
--- a/apps/web/lib/bounty/api/get-bounties-for-partner.ts
+++ b/apps/web/lib/bounty/api/get-bounties-for-partner.ts
@@ -16,12 +16,7 @@ import {
type GetBountiesForPartnerParams = Pick<
ProgramEnrollment,
- | "groupId"
- | "partnerId"
- | "totalCommissions"
- | "groupJoinedAt"
- | "createdAt"
- | "status"
+ "groupId" | "partnerId" | "totalCommissions" | "createdAt" | "status"
> & {
links: PartnerLink[];
program: Pick<Program, "id" | "defaultGroupId">;
@@ -32,8 +27,7 @@ export async function getBountiesForPartner({
links,
...programEnrollment
}: GetBountiesForPartnerParams) {
- const { groupId, partnerId, totalCommissions, createdAt, groupJoinedAt } =
- programEnrollment;
+ const { groupId, partnerId, totalCommissions, createdAt } = programEnrollment;
const partnerGroupId = groupId || program.defaultGroupId;
@@ -100,7 +94,6 @@ export async function getBountiesForPartner({
const { startsAt, endsAt } = getEffectiveBountyPeriod({
programEnrollment: {
createdAt,
- groupJoinedAt,
},
bounty,
});
diff --git a/apps/web/lib/bounty/api/get-bounty-submission-upload-url.ts b/apps/web/lib/bounty/api/get-bounty-submission-upload-url.ts
index be4749878b..d5231a5caa 100644
--- a/apps/web/lib/bounty/api/get-bounty-submission-upload-url.ts
+++ b/apps/web/lib/bounty/api/get-bounty-submission-upload-url.ts
@@ -17,12 +17,7 @@ type GetBountySubmissionUploadUrlParams = {
contentLength: number;
programEnrollment: Pick<
ProgramEnrollment,
- | "programId"
- | "partnerId"
- | "groupId"
- | "status"
- | "createdAt"
- | "groupJoinedAt"
+ "programId" | "partnerId" | "groupId" | "status" | "createdAt"
>;
};
diff --git a/apps/web/lib/firstpromoter/import-partners.ts b/apps/web/lib/firstpromoter/import-partners.ts
index 3693fb052e..025071d336 100644
--- a/apps/web/lib/firstpromoter/import-partners.ts
+++ b/apps/web/lib/firstpromoter/import-partners.ts
@@ -183,7 +183,6 @@ async function createPartnerAndLinks({
partnerId: partner.id,
status: "approved",
groupId: group.id,
- groupJoinedAt: new Date(),
clickRewardId: group.clickRewardId,
leadRewardId: group.leadRewardId,
saleRewardId: group.saleRewardId,
diff --git a/apps/web/lib/partnerstack/import-partners.ts b/apps/web/lib/partnerstack/import-partners.ts
index 6a81d151fd..a6f3eb65de 100644
--- a/apps/web/lib/partnerstack/import-partners.ts
+++ b/apps/web/lib/partnerstack/import-partners.ts
@@ -182,7 +182,6 @@ async function createPartner({
partnerId,
status: "approved",
groupId: group.id,
- groupJoinedAt: new Date(),
clickRewardId: group.clickRewardId,
leadRewardId: group.leadRewardId,
saleRewardId: group.saleRewardId,
diff --git a/apps/web/lib/rewardful/import-partners.ts b/apps/web/lib/rewardful/import-partners.ts
index 5871a0c774..c982377c2a 100644
--- a/apps/web/lib/rewardful/import-partners.ts
+++ b/apps/web/lib/rewardful/import-partners.ts
@@ -196,7 +196,6 @@ async function createPartnerAndLinks({
programId: program.id,
partnerId: partner.id,
status: "approved",
- groupJoinedAt: new Date(),
...defaultGroupAttributes,
},
update: {
diff --git a/apps/web/lib/tapfiliate/import-partners.ts b/apps/web/lib/tapfiliate/import-partners.ts
index 5b595cd7bc..a4e1cce782 100644
--- a/apps/web/lib/tapfiliate/import-partners.ts
+++ b/apps/web/lib/tapfiliate/import-partners.ts
@@ -226,7 +226,6 @@ async function createPartnerAndLinks({
partnerId: partner.id,
status: "approved",
groupId: group.id,
- groupJoinedAt: new Date(),
clickRewardId: group.clickRewardId,
leadRewardId: group.leadRewardId,
saleRewardId: group.saleRewardId,
diff --git a/apps/web/lib/tolt/import-partners.ts b/apps/web/lib/tolt/import-partners.ts
index a97e8c3721..8055d55fb3 100644
--- a/apps/web/lib/tolt/import-partners.ts
+++ b/apps/web/lib/tolt/import-partners.ts
@@ -160,7 +160,6 @@ async function createPartner({
programId: program.id,
partnerId: partner.id,
status: "approved",
- groupJoinedAt: new Date(),
...defaultGroupAttributes,
},
update: {
diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.ts
index 42d1adaf64..4e6ef170b9 100644
--- a/apps/web/lib/types.ts
+++ b/apps/web/lib/types.ts
@@ -867,12 +867,7 @@ export interface WorkflowContext {
};
programEnrollment?: Pick<
ProgramEnrollment,
- | "groupId"
- | "createdAt"
- | "groupJoinedAt"
- | "partnerId"
- | "programId"
- | "status"
+ "groupId" | "createdAt" | "partnerId" | "programId" | "status"
>;
}
diff --git a/apps/web/prisma/schema/program.prisma b/apps/web/prisma/schema/program.prisma
index 5fff2bd916..7d88029486 100644
--- a/apps/web/prisma/schema/program.prisma
+++ b/apps/web/prisma/schema/program.prisma
@@ -143,7 +143,6 @@ model ProgramEnrollment {
customerDataSharingEnabledAt DateTime?
groupMoveDisabledAt DateTime?
bannedAt DateTime?
- groupJoinedAt DateTime? // date when the partner joined their current group
bannedReason PartnerBannedReason?
reapplicationTimeframe ReapplicationTimeframe @default(standard)
riskMonitoringDisabledAt DateTime?
diff --git a/apps/web/scripts/migrations/backfill-group-joined-at.ts b/apps/web/scripts/migrations/backfill-group-joined-at.ts
deleted file mode 100644
index bf4e3091b5..0000000000
--- a/apps/web/scripts/migrations/backfill-group-joined-at.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import "dotenv-flow/config";
-
-import { prisma } from "@/lib/prisma";
-
-// Backfill ProgramEnrollment.groupJoinedAt for enrollments that have a groupId
-// but no groupJoinedAt yet.
-
-// Resolution order:
-// 1. Latest partner.groupChanged activity log for that partner + program
-// 2. Program application reviewedAt (approval/review time)
-// 3. Enrollment createdAt
-async function main() {
- while (true) {
- const programEnrollments = await prisma.programEnrollment.findMany({
- where: {
- groupId: {
- not: null,
- },
- groupJoinedAt: null,
- },
- select: {
- id: true,
- partnerId: true,
- programId: true,
- createdAt: true,
- application: {
- select: {
- reviewedAt: true,
- },
- },
- },
- take: 100,
- orderBy: {
- createdAt: "asc",
- },
- });
-
- if (programEnrollments.length === 0) {
- console.log("No more program enrollments to backfill, skipping...");
- break;
- }
-
- const partnerIds = programEnrollments.map(({ partnerId }) => partnerId);
- const programIds = [
- ...new Set(programEnrollments.map(({ programId }) => programId)),
- ];
-
- const activityLogs = await prisma.activityLog.findMany({
- where: {
- action: "partner.groupChanged",
- resourceType: "partner",
- resourceId: {
- in: partnerIds,
- },
- programId: {
- in: programIds,
- },
- },
- select: {
- programId: true,
- resourceId: true,
- createdAt: true,
- },
- orderBy: {
- createdAt: "desc",
- },
- });
-
- const latestGroupChangeByEnrollment = new Map<string, Date>();
-
- for (const log of activityLogs) {
- const key = `${log.programId}:${log.resourceId}`;
- if (!latestGroupChangeByEnrollment.has(key)) {
- latestGroupChangeByEnrollment.set(key, log.createdAt);
- }
- }
-
- let fromActivity = 0;
- let fromReviewedAt = 0;
- let fromCreatedAt = 0;
-
- await Promise.all(
- programEnrollments.map((enrollment) => {
- const key = `${enrollment.programId}:${enrollment.partnerId}`;
- const latestGroupChange = latestGroupChangeByEnrollment.get(key);
-
- let groupJoinedAt: Date;
-
- if (latestGroupChange) {
- groupJoinedAt = latestGroupChange;
- fromActivity++;
- } else if (enrollment.application?.reviewedAt) {
- groupJoinedAt = enrollment.application.reviewedAt;
- fromReviewedAt++;
- } else {
- groupJoinedAt = enrollment.createdAt;
- fromCreatedAt++;
- }
-
- return prisma.programEnrollment.update({
- where: {
- id: enrollment.id,
- },
- data: {
- groupJoinedAt,
- },
- });
- }),
- );
-
- await new Promise((resolve) => setTimeout(resolve, 1000));
-
- console.log(
- `Backfilled ${programEnrollments.length} enrollments (activity: ${fromActivity}, reviewedAt: ${fromReviewedAt}, createdAt: ${fromCreatedAt})...`,
- );
- }
-}
-
-main()
- .catch((error) => {
- console.error(error);
- process.exit(1);
- })
- .finally(async () => {
- await prisma.$disconnect();
- });