Skip to content

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

fix: improve user agent data mapping in export-visits API

Marc Seitzbdaf5f3e42f0
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/export-visits.ts b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/export-visits.ts
index 4c154743..0547d997 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/export-visits.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/export-visits.ts
@@ -253,22 +253,33 @@ export default async function handler(
].join(","),
);
- // Get user agent data for all views
- const userAgentData = await Promise.all(
+ // Create a map of viewId to userAgent data for efficient lookup
+ const userAgentDataMap = new Map();
+
+ await Promise.all(
documentViews.map(async (view) => {
const result = await getViewUserAgent({
viewId: view.id,
});
+ let userAgentResult;
if (!result || result.rows === 0) {
- return getViewUserAgent_v2({
- documentId: view.document?.id!,
- viewId: view.id,
- since: 0,
- });
+ // Only call v2 if document and its id exist
+ if (view.document?.id) {
+ userAgentResult = await getViewUserAgent_v2({
+ documentId: view.document.id,
+ viewId: view.id,
+ since: 0,
+ });
+ } else {
+ // Set default empty result if document/id is missing
+ userAgentResult = { data: [] };
+ }
+ } else {
+ userAgentResult = result;
}
- return result;
+ userAgentDataMap.set(view.id, userAgentResult);
}),
);
@@ -303,7 +314,16 @@ export default async function handler(
);
} else {
// Add a row for each document view
- view.documentViews.forEach((docView, index) => {
+ view.documentViews.forEach((docView) => {
+ // Find the corresponding document view to get the correct viewId
+ const correspondingDocView = documentViews.find(
+ (dv) => dv.viewedAt.toISOString() === docView.viewedAt,
+ );
+
+ const userAgentData = correspondingDocView
+ ? userAgentDataMap.get(correspondingDocView.id)
+ : { data: [] };
+
csvRows.push(
[
view.dataroomViewedAt,
@@ -322,11 +342,11 @@ export default async function handler(
(docView.duration / 1000).toFixed(1),
docView.completionRate,
docView.documentVersion,
- userAgentData[index]?.data[0]?.browser || "NaN",
- userAgentData[index]?.data[0]?.os || "NaN",
- userAgentData[index]?.data[0]?.device || "NaN",
- userAgentData[index]?.data[0]?.country || "NaN",
- userAgentData[index]?.data[0]?.city || "NaN",
+ userAgentData?.data[0]?.browser || "NaN",
+ userAgentData?.data[0]?.os || "NaN",
+ userAgentData?.data[0]?.device || "NaN",
+ userAgentData?.data[0]?.country || "NaN",
+ userAgentData?.data[0]?.city || "NaN",
].join(","),
);
});