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.

Add activity logs for partner status changes (#3746)

Kiran K41113545aba1
diff --git a/apps/web/lib/actions/partners/archive-partner.ts b/apps/web/lib/actions/partners/archive-partner.ts
index 6cc1f09fba..2d1e92211f 100644
--- a/apps/web/lib/actions/partners/archive-partner.ts
+++ b/apps/web/lib/actions/partners/archive-partner.ts
@@ -1,6 +1,6 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { archivePartnerSchema } from "@/lib/zod/schemas/partners";
@@ -29,7 +29,7 @@ export const archivePartnerAction = authActionClient
include: {},
});
- const { status, partner } = await prisma.programEnrollment.update({
+ const { status } = await prisma.programEnrollment.update({
where: {
partnerId_programId: {
partnerId,
@@ -46,19 +46,19 @@ export const archivePartnerAction = authActionClient
});
waitUntil(
- recordAuditLog({
+ trackActivityLog({
workspaceId: workspace.id,
programId,
+ resourceType: "partner",
+ resourceId: partnerId,
+ userId: user.id,
action: status === "archived" ? "partner.archived" : "partner.approved",
- description: `Partner ${partnerId} ${status}`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partnerId,
- metadata: partner,
+ changeSet: {
+ status: {
+ old: programEnrollment.status,
+ new: status,
},
- ],
+ },
}),
);
});
diff --git a/apps/web/lib/actions/partners/ban-partner.ts b/apps/web/lib/actions/partners/ban-partner.ts
index 72bb3c075b..308d95cd65 100644
--- a/apps/web/lib/actions/partners/ban-partner.ts
+++ b/apps/web/lib/actions/partners/ban-partner.ts
@@ -1,6 +1,6 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { DubApiError } from "@/lib/api/errors";
import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
@@ -115,19 +115,19 @@ export const banPartner = async ({
waitUntil(
Promise.allSettled([
- recordAuditLog({
+ trackActivityLog({
workspaceId: workspace.id,
programId,
+ resourceType: "partner",
+ resourceId: partnerId,
+ userId: user.id,
action: "partner.banned",
- description: `Partner ${partnerId} banned`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partnerId,
- metadata: programEnrollment.partner,
+ changeSet: {
+ status: {
+ old: programEnrollment.status,
+ new: "banned",
},
- ],
+ },
}),
queue.enqueueJSON({
diff --git a/apps/web/lib/actions/partners/bulk-approve-partners.ts b/apps/web/lib/actions/partners/bulk-approve-partners.ts
index 8030fdacc2..ff912cc40d 100644
--- a/apps/web/lib/actions/partners/bulk-approve-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-approve-partners.ts
@@ -1,6 +1,6 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { triggerWorkflows } from "@/lib/cron/qstash-workflow";
@@ -102,20 +102,20 @@ export const bulkApprovePartnersAction = authActionClient
});
await Promise.allSettled([
- recordAuditLog(
- updatedEnrollments.map(({ partner }) => ({
+ trackActivityLog(
+ updatedEnrollments.map(({ partnerId }) => ({
workspaceId: workspace.id,
programId: program.id,
- action: "partner_application.approved",
- description: `Partner application approved for ${partner.id}`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partner.id,
- metadata: partner,
+ resourceType: "partner",
+ resourceId: partnerId,
+ userId: user.id,
+ action: "partner.approved",
+ changeSet: {
+ status: {
+ old: "pending",
+ new: "approved",
},
- ],
+ },
})),
),
diff --git a/apps/web/lib/actions/partners/bulk-archive-partners.ts b/apps/web/lib/actions/partners/bulk-archive-partners.ts
index fffa0db594..0b4d8cfead 100644
--- a/apps/web/lib/actions/partners/bulk-archive-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-archive-partners.ts
@@ -1,6 +1,6 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import {
ACTIVE_ENROLLMENT_STATUSES,
@@ -36,6 +36,8 @@ export const bulkArchivePartnersAction = authActionClient
},
select: {
id: true,
+ partnerId: true,
+ status: true,
partner: {
select: {
id: true,
@@ -63,20 +65,20 @@ export const bulkArchivePartnersAction = authActionClient
});
waitUntil(
- recordAuditLog(
- programEnrollments.map(({ partner }) => ({
+ trackActivityLog(
+ programEnrollments.map(({ partnerId, status }) => ({
workspaceId: workspace.id,
programId,
+ resourceType: "partner",
+ resourceId: partnerId,
+ userId: user.id,
action: "partner.archived",
- description: `Partner ${partner.id} archived`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partner.id,
- metadata: partner,
+ changeSet: {
+ status: {
+ old: status,
+ new: "archived",
},
- ],
+ },
})),
),
);
diff --git a/apps/web/lib/actions/partners/bulk-ban-partners.ts b/apps/web/lib/actions/partners/bulk-ban-partners.ts
index aa4ca613a9..e8a41b51b9 100644
--- a/apps/web/lib/actions/partners/bulk-ban-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-ban-partners.ts
@@ -1,6 +1,6 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
@@ -42,6 +42,7 @@ export const bulkBanPartnersAction = authActionClient
id: true,
programId: true,
partnerId: true,
+ status: true,
partner: {
select: {
id: true,
@@ -89,20 +90,20 @@ export const bulkBanPartnersAction = authActionClient
waitUntil(
Promise.allSettled([
- recordAuditLog(
- programEnrollments.map(({ partner }) => ({
+ trackActivityLog(
+ programEnrollments.map(({ partnerId, status }) => ({
workspaceId: workspace.id,
programId,
+ resourceType: "partner",
+ resourceId: partnerId,
+ userId: user.id,
action: "partner.banned",
- description: `Partner ${partner.id} banned`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partner.id,
- metadata: partner,
+ changeSet: {
+ status: {
+ old: status,
+ new: "banned",
},
- ],
+ },
})),
),
diff --git a/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts b/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts
index 31d94e3267..1e51ffe38b 100644
--- a/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts
+++ b/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts
@@ -1,6 +1,6 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { bulkRejectPartnersSchema } from "@/lib/zod/schemas/partners";
@@ -87,20 +87,20 @@ export const bulkRejectPartnerApplicationsAction = authActionClient
waitUntil(
(async () => {
await Promise.allSettled([
- recordAuditLog(
+ trackActivityLog(
programEnrollments.map(({ partner }) => ({
workspaceId: workspace.id,
programId,
+ resourceType: "partner",
+ resourceId: partner.id,
+ userId: user.id,
action: "partner_application.rejected",
- description: `Partner application rejected for ${partner.id}`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partner.id,
- metadata: partner,
+ changeSet: {
+ status: {
+ old: "pending",
+ new: "rejected",
},
- ],
+ },
})),
),
diff --git a/apps/web/lib/actions/partners/reactivate-partner.ts b/apps/web/lib/actions/partners/reactivate-partner.ts
index 1d3d637777..e712cd1946 100644
--- a/apps/web/lib/actions/partners/reactivate-partner.ts
+++ b/apps/web/lib/actions/partners/reactivate-partner.ts
@@ -1,6 +1,6 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
import { linkCache } from "@/lib/api/links/cache";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
@@ -85,19 +85,20 @@ export const reactivatePartnerAction = authActionClient
await Promise.allSettled([
// TODO send email to partner
linkCache.expireMany(links),
- recordAuditLog({
+
+ trackActivityLog({
workspaceId: workspace.id,
programId,
+ resourceType: "partner",
+ resourceId: partnerId,
+ userId: user.id,
action: "partner.reactivated",
- description: `Partner ${partnerId} reactivated`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partnerId,
- metadata: programEnrollment.partner,
+ changeSet: {
+ status: {
+ old: "deactivated",
+ new: "approved",
},
- ],
+ },
}),
]);
})(),
diff --git a/apps/web/lib/actions/partners/reject-partner-application.ts b/apps/web/lib/actions/partners/reject-partner-application.ts
index 3cb91b54e9..c237853575 100644
--- a/apps/web/lib/actions/partners/reject-partner-application.ts
+++ b/apps/web/lib/actions/partners/reject-partner-application.ts
@@ -1,6 +1,6 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { getProgramApplicationRejectionReasonLabel } from "@/lib/partners/program-application-rejection";
@@ -98,19 +98,19 @@ export const rejectPartnerApplicationAction = authActionClient
waitUntil(
(async () => {
await Promise.allSettled([
- recordAuditLog({
+ trackActivityLog({
workspaceId: workspace.id,
programId,
+ resourceType: "partner",
+ resourceId: partnerId,
+ userId: user.id,
action: "partner_application.rejected",
- description: `Partner application rejected (${partnerId})`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partnerId,
- metadata: programEnrollment.partner,
+ changeSet: {
+ status: {
+ old: "pending",
+ new: "rejected",
},
- ],
+ },
}),
// Automatically resolve all pending fraud events for this partner in the current program
diff --git a/apps/web/lib/actions/partners/unban-partner.ts b/apps/web/lib/actions/partners/unban-partner.ts
index 1fb08df267..ed2b0d6b5f 100644
--- a/apps/web/lib/actions/partners/unban-partner.ts
+++ b/apps/web/lib/actions/partners/unban-partner.ts
@@ -1,6 +1,6 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";
import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
import { linkCache } from "@/lib/api/links/cache";
@@ -152,19 +152,19 @@ export const unbanPartnerAction = authActionClient
newStatus: "pending",
}),
- recordAuditLog({
+ trackActivityLog({
workspaceId: workspace.id,
programId,
+ resourceType: "partner",
+ resourceId: partnerId,
+ userId: user.id,
action: "partner.unbanned",
- description: `Partner ${partnerId} unbanned`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partnerId,
- metadata: programEnrollment.partner,
+ changeSet: {
+ status: {
+ old: "banned",
+ new: "approved",
},
- ],
+ },
}),
]);
diff --git a/apps/web/lib/api/partners/bulk-reactivate-partners.ts b/apps/web/lib/api/partners/bulk-reactivate-partners.ts
index 77f7b534e3..11e69c22ed 100644
--- a/apps/web/lib/api/partners/bulk-reactivate-partners.ts
+++ b/apps/web/lib/api/partners/bulk-reactivate-partners.ts
@@ -2,6 +2,8 @@ import { sendBatchEmail } from "@dub/email";
import PartnerReactivated from "@dub/email/templates/partner-reactivated";
import { prisma } from "@dub/prisma";
import { Partner, Program, ProgramEnrollment } from "@dub/prisma/client";
+import { waitUntil } from "@vercel/functions";
+import { trackActivityLog } from "../activity-log/track-activity-log";
import { linkCache } from "../links/cache";
type ProgramEnrollmentWithPartner = Pick<
@@ -123,6 +125,24 @@ export async function bulkReactivatePartners({
});
}
+ waitUntil(
+ trackActivityLog(
+ programEnrollments.map(({ partnerId }) => ({
+ workspaceId: program.workspaceId,
+ programId: program.id,
+ resourceType: "partner",
+ resourceId: partnerId,
+ action: "partner.reactivated",
+ changeSet: {
+ status: {
+ old: "deactivated",
+ new: "approved",
+ },
+ },
+ })),
+ ),
+ );
+
// Send email notifications
const emailResponse = await sendBatchEmail(
programEnrollments.map(({ partner }) => ({
diff --git a/apps/web/lib/api/partners/process-partner-deactivation.ts b/apps/web/lib/api/partners/process-partner-deactivation.ts
index 75da2c94a2..72ed3f4566 100644
--- a/apps/web/lib/api/partners/process-partner-deactivation.ts
+++ b/apps/web/lib/api/partners/process-partner-deactivation.ts
@@ -1,10 +1,10 @@
import { Session } from "@/lib/auth";
import { qstash } from "@/lib/cron";
import { prisma } from "@dub/prisma";
-import { Partner } from "@dub/prisma/client";
+import { Partner, ProgramEnrollmentStatus } from "@dub/prisma/client";
import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
import { waitUntil } from "@vercel/functions";
-import { recordAuditLog } from "../audit-logs/record-audit-log";
+import { trackActivityLog } from "../activity-log/track-activity-log";
interface ProcessPartnerDeactivationParams {
workspaceId: string;
@@ -29,6 +29,24 @@ export async function processPartnerDeactivation({
const partnerIds = partners.map((p) => p.id);
+ // Capture old statuses for activity logging
+ const oldEnrollments = await prisma.programEnrollment.findMany({
+ where: {
+ programId,
+ partnerId: {
+ in: partnerIds,
+ },
+ },
+ select: {
+ partnerId: true,
+ status: true,
+ },
+ });
+
+ const oldStatusByPartnerId = new Map<string, ProgramEnrollmentStatus>(
+ oldEnrollments.map((e) => [e.partnerId, e.status]),
+ );
+
await prisma.$transaction([
prisma.link.updateMany({
where: {
@@ -66,23 +84,20 @@ export async function processPartnerDeactivation({
if (user) {
waitUntil(
- recordAuditLog(
+ trackActivityLog(
partners.map((partner) => ({
workspaceId,
programId,
+ resourceType: "partner",
+ resourceId: partner.id,
+ userId: user.id,
action: "partner.deactivated",
- description: `Partner ${partner.id} deactivated`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partner.id,
- metadata: {
- name: partner.name,
- email: partner.email,
- },
+ changeSet: {
+ status: {
+ old: oldStatusByPartnerId.get(partner.id),
+ new: "deactivated",
},
- ],
+ },
})),
),
);
diff --git a/apps/web/lib/partners/approve-partner-enrollment.ts b/apps/web/lib/partners/approve-partner-enrollment.ts
index accd01f553..0ee3726c9d 100644
--- a/apps/web/lib/partners/approve-partner-enrollment.ts
+++ b/apps/web/lib/partners/approve-partner-enrollment.ts
@@ -1,6 +1,6 @@
import { prisma } from "@dub/prisma";
import { waitUntil } from "@vercel/functions";
-import { recordAuditLog } from "../api/audit-logs/record-audit-log";
+import { trackActivityLog } from "../api/activity-log/track-activity-log";
import { getGroupOrThrow } from "../api/groups/get-group-or-throw";
import { triggerWorkflows } from "../cron/qstash-workflow";
@@ -75,44 +75,30 @@ export async function approvePartnerEnrollment({
});
waitUntil(
- (async () => {
- const user = await prisma.user.findUniqueOrThrow({
- where: {
- id: userId,
- },
- select: {
- id: true,
- name: true,
+ Promise.allSettled([
+ trackActivityLog({
+ workspaceId: program.workspace.id,
+ programId,
+ resourceType: "partner",
+ resourceId: partnerId,
+ userId,
+ action: "partner.approved",
+ changeSet: {
+ status: {
+ old: "pending",
+ new: programEnrollment.status,
+ },
},
- });
-
- const { partner } = programEnrollment;
+ }),
- await Promise.allSettled([
- recordAuditLog({
- workspaceId: program.workspace.id,
+ triggerWorkflows({
+ workflowId: "partner-approved",
+ body: {
programId,
- action: "partner_application.approved",
- description: `Partner application approved for ${partner.id}`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partner.id,
- metadata: partner,
- },
- ],
- }),
-
- triggerWorkflows({
- workflowId: "partner-approved",
- body: {
- programId,
- partnerId,
- userId,
- },
- }),
- ]);
- })(),
+ partnerId,
+ userId,
+ },
+ }),
+ ]),
);
}
diff --git a/apps/web/lib/zod/schemas/activity-log.ts b/apps/web/lib/zod/schemas/activity-log.ts
index b9fae24532..3049484be4 100644
--- a/apps/web/lib/zod/schemas/activity-log.ts
+++ b/apps/web/lib/zod/schemas/activity-log.ts
@@ -21,6 +21,13 @@ export const activityLogActionSchema = z.enum([
"referral.closedLost",
"partner.groupChanged",
+ "partner.approved",
+ "partner_application.rejected",
+ "partner.banned",
+ "partner.unbanned",
+ "partner.deactivated",
+ "partner.reactivated",
+ "partner.archived",
"commission.updated",