OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
fix(api): filter events by profileId for export route
Carl-Gerhard Lindesvärdce184b157f36
diff --git a/apps/api/src/controllers/export.controller.ts b/apps/api/src/controllers/export.controller.tsindex 1f3cde444..6c9a36edc 100644--- a/apps/api/src/controllers/export.controller.ts+++ b/apps/api/src/controllers/export.controller.ts@@ -65,6 +65,7 @@ async function getProjectId(const eventsScheme = z.object({project_id: z.string().optional(),projectId: z.string().optional(),+ profileId: z.string().optional(),event: z.union([z.string(), z.array(z.string())]).optional(),start: z.coerce.string().optional(),end: z.coerce.string().optional(),@@ -109,6 +110,7 @@ export async function events(endDate: query.data.end ? new Date(query.data.end) : undefined,cursor,take,+ profileId: query.data.profileId,select: {profile: false,meta: false,diff --git a/apps/api/src/routes/export.router.ts b/apps/api/src/routes/export.router.tsindex 368d8517b..3dafb42b8 100644--- a/apps/api/src/routes/export.router.ts+++ b/apps/api/src/routes/export.router.ts@@ -7,7 +7,7 @@ import type { FastifyPluginCallback, FastifyRequest } from 'fastify';const exportRouter: FastifyPluginCallback = async (fastify) => {await activateRateLimiter({fastify,- max: 10,+ max: 100,timeWindow: '10 seconds',});diff --git a/packages/db/src/services/event.service.ts b/packages/db/src/services/event.service.tsindex acca5861f..753ce6400 100644--- a/packages/db/src/services/event.service.ts+++ b/packages/db/src/services/event.service.ts@@ -506,7 +506,7 @@ export async function getEventList({}if (profileId) {- sb.where.deviceId = `(device_id IN (SELECT device_id as did FROM ${TABLE_NAMES.events} WHERE device_id != '' AND profile_id = ${escape(profileId)} group by did) OR profile_id = ${escape(profileId)})`;+ sb.where.deviceId = `(device_id IN (SELECT device_id as did FROM ${TABLE_NAMES.events} WHERE project_id = ${escape(projectId)} AND device_id != '' AND profile_id = ${escape(profileId)} group by did) OR profile_id = ${escape(profileId)})`;}if (startDate && endDate) {@@ -527,10 +527,6 @@ export async function getEventList({};}- // if (cursor) {- // sb.where.cursor = `created_at <= '${formatClickhouseDate(cursor)}'`;- // }-sb.orderBy.created_at ='toDate(created_at) DESC, created_at DESC, profile_id DESC, name DESC';