Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

refactor: include all documents that are uploaded

Marc Seitz4cff8b7ff37c
diff --git a/app/(ee)/api/links/[id]/upload/route.ts b/app/(ee)/api/links/[id]/upload/route.ts
index ce10665f..1a14b1c5 100644
--- a/app/(ee)/api/links/[id]/upload/route.ts
+++ b/app/(ee)/api/links/[id]/upload/route.ts
@@ -333,8 +333,8 @@ export async function POST(
}
// 5. Notify other dataroom visitors about the new upload (each visitor gets their own email)
- // Uses cancel-and-retrigger as a debounce: the delayed task queries
- // DocumentUpload at runtime to batch all recent uploads into one notification.
+ // Uses cancel-and-retrigger as a debounce: cancelled runs' document IDs
+ // are accumulated into the new run so no uploads are lost.
if (link.dataroom?.enableVisitorUploadChangeNotifications) {
try {
const existingChangeRuns = await runs.list({
@@ -350,13 +350,25 @@ export async function POST(
run.tags?.includes(`visitor_upload_${viewerId}`),
);
+ let accumulatedDocIds: string[] = [newDataroomDocument.id];
+ for (const run of matchingChangeRuns) {
+ const fullRun = await runs.retrieve(run.id);
+ const existingIds = (
+ fullRun.payload as { dataroomDocumentIds?: string[] } | undefined
+ )?.dataroomDocumentIds;
+ if (Array.isArray(existingIds)) {
+ accumulatedDocIds.push(...existingIds);
+ }
+ }
+ accumulatedDocIds = [...new Set(accumulatedDocIds)];
+
await Promise.all(matchingChangeRuns.map((run) => runs.cancel(run.id)));
waitUntil(
sendDataroomChangeNotificationTask.trigger(
{
dataroomId,
- uploaderViewerId: viewerId,
+ dataroomDocumentIds: accumulatedDocIds,
senderUserId: null,
teamId: link.teamId,
excludeViewerId: viewerId,
diff --git a/lib/trigger/dataroom-change-notification.ts b/lib/trigger/dataroom-change-notification.ts
index bd1b2d67..4dd87b9c 100644
--- a/lib/trigger/dataroom-change-notification.ts
+++ b/lib/trigger/dataroom-change-notification.ts
@@ -5,70 +5,31 @@ import prisma from "@/lib/prisma";
import { queueNotification } from "@/lib/redis/dataroom-notification-queue";
import { ZViewerNotificationPreferencesSchema } from "@/lib/zod/schemas/notifications";
-const NotificationPayloadSchema = z
- .object({
- dataroomId: z.string().cuid(),
- dataroomDocumentId: z.string().cuid().optional(),
- uploaderViewerId: z.string().cuid().optional(),
- senderUserId: z.string().cuid().nullable(),
- teamId: z.string().cuid(),
- excludeViewerId: z.string().cuid().optional(),
- })
- .refine(
- (data) =>
- Boolean(data.dataroomDocumentId) !== Boolean(data.uploaderViewerId),
- {
- message:
- "Exactly one of dataroomDocumentId or uploaderViewerId must be provided",
- },
- );
+const NotificationPayloadSchema = z.object({
+ dataroomId: z.string().cuid(),
+ dataroomDocumentIds: z.array(z.string().cuid()).min(1),
+ senderUserId: z.string().cuid().nullable(),
+ teamId: z.string().cuid(),
+ excludeViewerId: z.string().cuid().optional(),
+});
export const sendDataroomChangeNotificationTask = schemaTask({
id: "send-dataroom-change-notification",
schema: NotificationPayloadSchema,
retry: { maxAttempts: 3 },
run: async (payload) => {
- // --- Resolve document IDs ---
- let dataroomDocumentIds: string[];
-
- if (payload.uploaderViewerId) {
- const fifteenMinutesAgo = new Date(Date.now() - 15 * 60 * 1000);
- const recentUploads = await prisma.documentUpload.findMany({
- where: {
- dataroomId: payload.dataroomId,
- viewerId: payload.uploaderViewerId,
- uploadedAt: { gte: fifteenMinutesAgo },
- },
- select: { dataroomDocumentId: true },
- orderBy: { uploadedAt: "desc" },
- });
- dataroomDocumentIds = recentUploads
- .map((u) => u.dataroomDocumentId)
- .filter((id): id is string => id !== null);
- } else if (payload.dataroomDocumentId) {
- dataroomDocumentIds = [payload.dataroomDocumentId];
- } else {
- logger.error("Either dataroomDocumentId or uploaderViewerId is required");
- return;
- }
-
- if (dataroomDocumentIds.length === 0) {
- logger.info("No documents to notify about", {
- dataroomId: payload.dataroomId,
- });
- return;
- }
-
const dataroomDocuments = await prisma.dataroomDocument.findMany({
where: {
- id: { in: dataroomDocumentIds },
+ id: { in: payload.dataroomDocumentIds },
dataroomId: payload.dataroomId,
},
select: { id: true, folderId: true },
});
if (dataroomDocuments.length === 0) {
- logger.error("Dataroom documents not found", { dataroomDocumentIds });
+ logger.error("Dataroom documents not found", {
+ dataroomDocumentIds: payload.dataroomDocumentIds,
+ });
return;
}
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts
index f0296014..781adf95 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts
@@ -284,21 +284,38 @@ export default async function handle(
// Check if the team has the dataroom change notification enabled
if (dataroomDocument.dataroom.enableChangeNotifications) {
// Get all delayed and queued runs for this dataroom
- const allRuns = await runs.list({
+ const existingChangeRuns = await runs.list({
taskIdentifier: ["send-dataroom-change-notification"],
- tag: [`dataroom_${dataroomId}`],
+ tag: [`dataroom_${dataroomId}`, `user_upload_${userId}`],
status: ["DELAYED", "QUEUED"],
- period: "10m",
+ period: "15m",
});
- // Cancel any existing unsent notification runs for this dataroom
- await Promise.all(allRuns.data.map((run) => runs.cancel(run.id)));
+ const matchingChangeRuns = existingChangeRuns.data.filter(
+ (run) =>
+ run.tags?.includes(`dataroom_${dataroomId}`) &&
+ run.tags?.includes(`user_upload_${userId}`),
+ );
+
+ let accumulatedDocIds: string[] = [dataroomDocument.id];
+ for (const run of matchingChangeRuns) {
+ const fullRun = await runs.retrieve(run.id);
+ const existingIds = (
+ fullRun.payload as { dataroomDocumentIds?: string[] } | undefined
+ )?.dataroomDocumentIds;
+ if (Array.isArray(existingIds)) {
+ accumulatedDocIds.push(...existingIds);
+ }
+ }
+ accumulatedDocIds = [...new Set(accumulatedDocIds)];
+
+ await Promise.all(matchingChangeRuns.map((run) => runs.cancel(run.id)));
waitUntil(
sendDataroomChangeNotificationTask.trigger(
{
dataroomId,
- dataroomDocumentId: dataroomDocument.id,
+ dataroomDocumentIds: accumulatedDocIds,
senderUserId: userId,
teamId,
},
@@ -308,6 +325,7 @@ export default async function handle(
`team_${teamId}`,
`dataroom_${dataroomId}`,
`document_${dataroomDocument.id}`,
+ `user_upload_${userId}`,
],
delay: new Date(Date.now() + 10 * 60 * 1000), // 10 minute delay
},