Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
chore: improvement
Ashish Viradiya37f75ecb07f2
diff --git a/lib/swr/use-viewer.ts b/lib/swr/use-viewer.tsindex f8524e20..891ed287 100644--- a/lib/swr/use-viewer.ts+++ b/lib/swr/use-viewer.ts@@ -49,11 +49,15 @@ export default function useViewer(const { id } = router.query;- const paginationParam = `page=${page}&pageSize=${pageSize}`;- const sortingParam = `&sortBy=${sortBy}&sortOrder=${sortOrder}`;+ const queryParams = new URLSearchParams();+ queryParams.append('page', page.toString());+ queryParams.append('pageSize', pageSize.toString());+ queryParams.append('sortBy', sortBy);+ queryParams.append('sortOrder', sortOrder);+ const queryString = queryParams.toString();const { data: viewer, error } = useSWR<ViewerWithViews>(- teamId && id ? `/api/teams/${teamId}/viewers/${id}?${paginationParam}${sortingParam}` : null,+ teamId && id ? `/api/teams/${teamId}/viewers/${id}?${queryString}` : null,fetcher,{revalidateOnFocus: false,@@ -62,11 +66,11 @@ export default function useViewer(});- const shouldFetchDurations = viewer && viewer.views && viewer.views.length > 0;+ const shouldFetchDurations = (viewer?.views?.length ?? 0) > 0;const { data: durationsResponse, isLoading: loadingDurations, error: durationsError } = useSWR<{ durations: Record<string, number> }>(shouldFetchDurations- ? `/api/teams/${teamId}/viewers/${id}?${paginationParam}${sortingParam}&withDuration=true`+ ? `/api/teams/${teamId}/viewers/${id}?${queryString}&withDuration=true`: null,fetcher,{diff --git a/lib/swr/use-viewers.ts b/lib/swr/use-viewers.tsindex 8d99e980..583ebd19 100644--- a/lib/swr/use-viewers.ts+++ b/lib/swr/use-viewers.ts@@ -41,12 +41,20 @@ export default function useViewers(const teamInfo = useTeam();const teamId = teamInfo?.currentTeam?.id;- const queryParams = router.query;- const searchQuery = queryParams["search"];+ const routerQuery = router.query;+ const searchQuery = routerQuery["search"];- const searchParam = searchQuery ? `&query=${searchQuery}` : "";- const paginationParam = `page=${page}&pageSize=${pageSize}`;- const sortingParam = `&sortBy=${sortBy}&sortOrder=${sortOrder}`;+ const queryParams = new URLSearchParams();+ queryParams.append('page', page.toString());+ queryParams.append('pageSize', pageSize.toString());+ queryParams.append('sortBy', sortBy);+ queryParams.append('sortOrder', sortOrder);++ if (searchQuery && typeof searchQuery === 'string') {+ queryParams.append('query', searchQuery);+ }++ const queryString = queryParams.toString();const {data: response,@@ -54,7 +62,7 @@ export default function useViewers(error,} = useSWR<ViewersResponse>(teamId- ? `/api/teams/${teamId}/viewers?${paginationParam}${searchParam}${sortingParam}`+ ? `/api/teams/${teamId}/viewers?${queryString}`: null,fetcher,{diff --git a/pages/api/teams/[teamId]/viewers/[id]/index.ts b/pages/api/teams/[teamId]/viewers/[id]/index.tsindex 5f20b26e..b1bfc773 100644--- a/pages/api/teams/[teamId]/viewers/[id]/index.ts+++ b/pages/api/teams/[teamId]/viewers/[id]/index.ts@@ -10,6 +10,55 @@ import { getDocumentDurationPerViewer } from "@/lib/tinybird";import { CustomUser } from "@/lib/types";import { Prisma } from "@prisma/client";+async function fetchAndCacheDurations(+ groupedViews: Array<{ documentId: string; viewIds: string[] }>,+ teamId: string,+ viewerId: string,+ cacheKey: string+): Promise<Record<string, number>> {+ let durationsMap: Record<string, number> = {};+ const cachedDurations = await redis.get(cacheKey);++ if (cachedDurations) {+ const parsedDurations = typeof cachedDurations === 'string' ? JSON.parse(cachedDurations) : cachedDurations;+ durationsMap = parsedDurations;+ } else {+ const batchSize = 5;++ for (let i = 0; i < groupedViews.length; i += batchSize) {+ const batch = groupedViews.slice(i, i + batchSize);++ const batchPromises = batch.map(async (view) => {+ try {+ const durationResult = await getDocumentDurationPerViewer({+ documentId: view.documentId,+ viewIds: view.viewIds.join(","),+ });+ return {+ documentId: view.documentId,+ totalDuration: durationResult.data[0]?.sum_duration || 0,+ };+ } catch (error) {+ console.error(`Error fetching duration for document ${view.documentId}:`, error);+ return {+ documentId: view.documentId,+ totalDuration: 0,+ };+ }+ });++ const batchResults = await Promise.all(batchPromises);+ batchResults.forEach(result => {+ durationsMap[result.documentId] = result.totalDuration;+ });+ }++ await redis.set(cacheKey, JSON.stringify(durationsMap), { ex: 600 });+ }++ return durationsMap;+}+export default async function handle(req: NextApiRequest,res: NextApiResponse,@@ -91,46 +140,7 @@ export default async function handle(// Try to get cached durations from Redisconst durationCacheKey = `durations:${teamId}:${id}:${currentPage}:${limit}:${sort}:${order}`;- let durationsMap: Record<string, number> = {};- const cachedDurations = await redis.get(durationCacheKey);-- if (cachedDurations) {- const parsedDurations = typeof cachedDurations === 'string' ? JSON.parse(cachedDurations) : cachedDurations;- durationsMap = parsedDurations;- } else {- // Process durations in smaller batches- const batchSize = 5;-- for (let i = 0; i < groupedViews.length; i += batchSize) {- const batch = groupedViews.slice(i, i + batchSize);-- const batchPromises = batch.map(async (view: any) => {- try {- const durationResult = await getDocumentDurationPerViewer({- documentId: view.documentId,- viewIds: view.viewIds.join(","),- });- return {- documentId: view.documentId,- totalDuration: durationResult.data[0]?.sum_duration || 0,- };- } catch (error) {- console.error(`Error fetching duration for document ${view.documentId}:`, error);- return {- documentId: view.documentId,- totalDuration: 0,- };- }- });-- const batchResults = await Promise.all(batchPromises);- batchResults.forEach(result => {- durationsMap[result.documentId] = result.totalDuration;- });- }-- await redis.set(durationCacheKey, JSON.stringify(durationsMap), { ex: 600 });- }+ const durationsMap = await fetchAndCacheDurations(groupedViews, teamId, id, durationCacheKey);return res.status(200).json({ durations: durationsMap });@@ -181,38 +191,12 @@ export default async function handle(// Check for cached durations in Redis for totalDuration sortingconst durationCacheKey = `durations:${teamId}:${id}:all:${sort}:${order}`;- let documentsWithDurations;- const cachedDurations = await redis.get(durationCacheKey);-- if (cachedDurations) {- const parsedDurations = typeof cachedDurations === 'string' ? JSON.parse(cachedDurations) : cachedDurations;- documentsWithDurations = allDocuments.map(doc => ({- ...doc,- totalDuration: parsedDurations[doc.documentId] || 0- }));- } else {- documentsWithDurations = await Promise.all(- allDocuments.map(async (doc) => {- try {- const durationResult = await getDocumentDurationPerViewer({- documentId: doc.documentId,- viewIds: doc.viewIds.join(","),- });- const totalDuration = durationResult.data[0]?.sum_duration || 0;- return { ...doc, totalDuration };- } catch (error) {- console.error(`Error fetching duration for document ${doc.documentId}:`, error);- return { ...doc, totalDuration: 0 };- }- })- );+ const durationsMap = await fetchAndCacheDurations(allDocuments, teamId, id, durationCacheKey);- // Cache durations to Redis for 10 minutes- const durationsMap = Object.fromEntries(- documentsWithDurations.map(doc => [doc.documentId, doc.totalDuration])- );- await redis.set(durationCacheKey, JSON.stringify(durationsMap), { ex: 600 });- }+ const documentsWithDurations = allDocuments.map(doc => ({+ ...doc,+ totalDuration: durationsMap[doc.documentId] || 0+ }));// Sort by durationdocumentsWithDurations.sort((a, b) => {@@ -285,46 +269,7 @@ export default async function handle(if (withDuration === "true") {try {const durationCacheKey = `durations:${teamId}:${id}:${currentPage}:${limit}:${sort}:${order}`;- let durationsMap: Record<string, number> = {};- const cachedDurations = await redis.get(durationCacheKey);-- if (cachedDurations) {- const parsedDurations = typeof cachedDurations === 'string' ? JSON.parse(cachedDurations) : cachedDurations;- durationsMap = parsedDurations;- } else {- const batchSize = 5;-- for (let i = 0; i < groupedViews.length; i += batchSize) {- const batch = groupedViews.slice(i, i + batchSize);-- const batchPromises = batch.map(async (view) => {- try {- const durationResult = await getDocumentDurationPerViewer({- documentId: view.documentId,- viewIds: view.viewIds.join(","),- });- return {- documentId: view.documentId,- totalDuration: durationResult.data[0]?.sum_duration || 0,- };- } catch (error) {- console.error(`Error fetching duration for document ${view.documentId}:`, error);- return {- documentId: view.documentId,- totalDuration: 0,- };- }- });-- const batchResults = await Promise.all(batchPromises);- batchResults.forEach(result => {- durationsMap[result.documentId] = result.totalDuration;- });- }-- // Cache durations to Redis- await redis.set(durationCacheKey, JSON.stringify(durationsMap), { ex: 600 });- }+ const durationsMap = await fetchAndCacheDurations(groupedViews, teamId, id, durationCacheKey);return res.status(200).json({ durations: durationsMap });diff --git a/pages/api/teams/[teamId]/viewers/index.ts b/pages/api/teams/[teamId]/viewers/index.tsindex 7b3d92a6..e5d481f3 100644--- a/pages/api/teams/[teamId]/viewers/index.ts+++ b/pages/api/teams/[teamId]/viewers/index.ts@@ -56,8 +56,6 @@ export default async function handle(return res.status(404).json({ error: "Team not found" });}- const orderDirection = order?.toUpperCase() || "DESC";-const searchCondition = query? Prisma.sql`AND LOWER(v.email) LIKE LOWER(${`%${query}%`})`: Prisma.empty;@@ -71,10 +69,19 @@ export default async function handle(lastViewed: Date | null;}>;- // Optimized query - only get essential data- const orderClause = sort === "lastViewed"- ? `view_stats."lastViewed" ${orderDirection} NULLS LAST`- : `COALESCE(view_stats."totalVisits", 0) ${orderDirection}, v."createdAt" DESC`;+ const getOrderClause = (sortField: string, sortOrder: string): Prisma.Sql => {+ const key = `${sortField}_${sortOrder}`;++ const orderByWhitelist: Record<string, Prisma.Sql> = {+ lastViewed_asc: Prisma.sql`view_stats."lastViewed" ASC NULLS LAST`,+ lastViewed_desc: Prisma.sql`view_stats."lastViewed" DESC NULLS LAST`,+ totalVisits_asc: Prisma.sql`COALESCE(view_stats."totalVisits", 0) ASC, v."createdAt" DESC`,+ totalVisits_desc: Prisma.sql`COALESCE(view_stats."totalVisits", 0) DESC, v."createdAt" DESC`,+ };++ return orderByWhitelist[key] || orderByWhitelist.lastViewed_desc;+ };+ const orderClause = getOrderClause(sort || 'lastViewed', order || 'desc');viewers = await prisma.$queryRaw`SELECT@@ -96,7 +103,7 @@ export default async function handle() view_stats ON v.id = view_stats."viewerId"WHERE v."teamId" = ${teamId}${searchCondition}- ORDER BY ${Prisma.raw(orderClause)}+ ORDER BY ${orderClause}LIMIT ${limit}OFFSET ${offset}`;