fix: export data

Author: izadoesdev

apps/api/src/lib/export/data-fetcher.ts

@@ -1,6 +1,7 @@
 // Data fetching logic for exports
 
 import { chQuery } from "@databuddy/db";
+import { logger } from "../logger";
 import {
 	buildDateFilter,
 	getErrorsQuery,
@@ -14,11 +15,11 @@ import type {
 	SanitizedWebVitals,
 } from "./types";
 
-export interface ExportData {
+export type ExportData = {
 	events: SanitizedEvent[];
 	errors: SanitizedError[];
 	webVitals: SanitizedWebVitals[];
-}
+};
 
 export async function fetchExportData(
 	request: ExportRequest
@@ -29,30 +30,71 @@ export async function fetchExportData(
 		end_date: endDate,
 	} = request;
 
-	// Build secure date filter with parameters
-	const { filter: dateFilter, params: dateParams } = buildDateFilter(
-		startDate,
-		endDate
-	);
-
-	// Prepare queries
-	const eventsQuery = getEventsQuery(dateFilter);
-	const errorsQuery = getErrorsQuery(dateFilter);
-	const webVitalsQuery = getWebVitalsQuery(dateFilter);
-
-	// Combine parameters: websiteId + date parameters
-	const queryParams = { websiteId, ...dateParams };
-
-	// Execute queries in parallel with secure parameters
-	const [events, errors, webVitals] = await Promise.all([
-		chQuery<SanitizedEvent>(eventsQuery, queryParams),
-		chQuery<SanitizedError>(errorsQuery, queryParams),
-		chQuery<SanitizedWebVitals>(webVitalsQuery, queryParams),
-	]);
-
-	return {
-		events,
-		errors,
-		webVitals,
-	};
+	try {
+		// Build secure date filter with parameters
+		const { filter: dateFilter, params: dateParams } = buildDateFilter(
+			startDate,
+			endDate
+		);
+
+		// Prepare queries
+		const eventsQuery = getEventsQuery(dateFilter);
+		const errorsQuery = getErrorsQuery(dateFilter);
+		const webVitalsQuery = getWebVitalsQuery(dateFilter);
+
+		// Combine parameters: websiteId + date parameters
+		const queryParams = { websiteId, ...dateParams };
+
+		// Execute queries in parallel with secure parameters
+		const [events, errors, webVitals] = await Promise.all([
+			chQuery<SanitizedEvent>(eventsQuery, queryParams).catch((error) => {
+				logger.error({
+					message: "Failed to fetch events for export",
+					websiteId,
+					error: error instanceof Error ? error.message : String(error),
+				});
+				throw new Error(
+					`Failed to fetch events: ${error instanceof Error ? error.message : String(error)}`
+				);
+			}),
+			chQuery<SanitizedError>(errorsQuery, queryParams).catch((error) => {
+				logger.error({
+					message: "Failed to fetch errors for export",
+					websiteId,
+					error: error instanceof Error ? error.message : String(error),
+				});
+				throw new Error(
+					`Failed to fetch errors: ${error instanceof Error ? error.message : String(error)}`
+				);
+			}),
+			chQuery<SanitizedWebVitals>(webVitalsQuery, queryParams).catch(
+				(error) => {
+					logger.error({
+						message: "Failed to fetch web vitals for export",
+						websiteId,
+						error: error instanceof Error ? error.message : String(error),
+					});
+					throw new Error(
+						`Failed to fetch web vitals: ${error instanceof Error ? error.message : String(error)}`
+					);
+				}
+			),
+		]);
+
+		return {
+			events,
+			errors,
+			webVitals,
+		};
+	} catch (error) {
+		logger.error({
+			message: "Export data fetch failed",
+			websiteId,
+			startDate,
+			endDate,
+			error: error instanceof Error ? error.message : String(error),
+			stack: error instanceof Error ? error.stack : undefined,
+		});
+		throw error;
+	}
 }

apps/api/src/lib/export/queries.ts

@@ -60,10 +60,7 @@ export function getEventsQuery(dateFilter: string): string {
 			time_on_page,
 			scroll_depth,
 			interaction_count,
-			exit_intent,
 			page_count,
-			is_bounce,
-			page_size,
 			utm_source,
 			utm_medium,
 			utm_campaign,
@@ -72,12 +69,6 @@ export function getEventsQuery(dateFilter: string): string {
 			load_time,
 			dom_ready_time,
 			ttfb,
-			connection_time,
-			request_time,
-			render_time,
-			fcp,
-			lcp,
-			cls,
 			properties,
 			toString(created_at) as created_at
 		FROM analytics.events 
@@ -88,8 +79,8 @@ export function getEventsQuery(dateFilter: string): string {
 }
 
 export function getErrorsQuery(dateFilter: string): string {
-	// Replace 'time' with 'timestamp' for errors table
-	const errorDateFilter = dateFilter.replace(/time/g, "timestamp");
+	// Replace 'time' with 'timestamp' for errors table (only in the filter conditions)
+	const errorDateFilter = dateFilter.replace(/\btime\b/g, "timestamp");
 	return `
 		SELECT 
 			id,
@@ -121,8 +112,8 @@ export function getErrorsQuery(dateFilter: string): string {
 }
 
 export function getWebVitalsQuery(dateFilter: string): string {
-	// Replace 'time' with 'timestamp' for web_vitals table
-	const vitalsDateFilter = dateFilter.replace(/time/g, "timestamp");
+	// Replace 'time' with 'timestamp' for web_vitals table (only in the filter conditions)
+	const vitalsDateFilter = dateFilter.replace(/\btime\b/g, "timestamp");
 	return `
 		SELECT 
 			id,

apps/api/src/lib/export/types.ts

@@ -2,19 +2,19 @@
 
 export type ExportFormat = "csv" | "json" | "txt" | "proto";
 
-export interface ExportRequest {
+export type ExportRequest = {
 	website_id: string;
 	start_date?: string;
 	end_date?: string;
 	format?: ExportFormat;
-}
+};
 
-export interface ExportFile {
+export type ExportFile = {
 	name: string;
 	content: string;
-}
+};
 
-export interface ExportMetadata {
+export type ExportMetadata = {
 	export_date: string;
 	website_id: string;
 	date_range: {
@@ -27,7 +27,7 @@ export interface ExportMetadata {
 		errors: number;
 		web_vitals: number;
 	};
-}
+};
 
 // Sanitized data interfaces (excluding sensitive fields like IP, user_agent)
 export interface SanitizedEvent extends Record<string, unknown> {
@@ -60,10 +60,7 @@ export interface SanitizedEvent extends Record<string, unknown> {
 	time_on_page?: number;
 	scroll_depth?: number;
 	interaction_count?: number;
-	exit_intent: number;
 	page_count: number;
-	is_bounce: number;
-	page_size?: number;
 	utm_source?: string;
 	utm_medium?: string;
 	utm_campaign?: string;
@@ -72,12 +69,6 @@ export interface SanitizedEvent extends Record<string, unknown> {
 	load_time?: number;
 	dom_ready_time?: number;
 	ttfb?: number;
-	connection_time?: number;
-	request_time?: number;
-	render_time?: number;
-	fcp?: number;
-	lcp?: number;
-	cls?: number;
 	properties: string;
 	created_at: string;
 }

apps/api/src/routes/export.ts

@@ -7,19 +7,9 @@ import { Elysia, t } from "elysia";
 import { type ExportRequest, processExport } from "../lib/export";
 import { logger } from "../lib/logger";
 
-import { createRateLimitMiddleware } from "../middleware/rate-limit";
 
 dayjs.extend(utc);
 
-const _exportRateLimit = createRateLimitMiddleware({
-	type: "expensive",
-	identifier: "export",
-	customConfig: {
-		requests: 10,
-		window: "1m",
-	},
-	skipAuth: false,
-});
 
 const getWebsiteById = cacheable(
 	async (id: string) => {
@@ -90,7 +80,6 @@ async function authorizeWebsiteAccess(
 }
 
 export const exportRoute = new Elysia({ prefix: "/v1/export" })
-	// .use(exportRateLimit)
 	.post(
 		"/data",
 		async ({ body, request }) => {

apps/dashboard/app/(main)/websites/[id]/settings/export/page.tsx

@@ -1,6 +1,12 @@
 "use client";
 
-import { CheckIcon, DownloadIcon } from "@phosphor-icons/react";
+import {
+	CheckIcon,
+	DownloadIcon,
+	FileCodeIcon,
+	TableIcon,
+	FileTextIcon,
+} from "@phosphor-icons/react";
 import dayjs from "dayjs";
 import { useParams } from "next/navigation";
 import { useCallback, useMemo, useState } from "react";
@@ -36,19 +42,19 @@ export default function ExportPage() {
 				value: "json" as const,
 				label: "JSON",
 				description: "Structured data for developers",
-				icon: "📄",
+				icon: FileCodeIcon,
 			},
 			{
 				value: "csv" as const,
 				label: "CSV",
 				description: "Works with spreadsheets",
-				icon: "📊",
+				icon: TableIcon,
 			},
 			{
 				value: "txt" as const,
 				label: "TXT",
 				description: "Plain text export",
-				icon: "📝",
+				icon: FileTextIcon,
 			},
 		],
 		[]
@@ -129,8 +135,8 @@ export default function ExportPage() {
 									onClick={() => setSelectedFormat(format.value)}
 									type="button"
 								>
-									<div className="flex h-8 w-8 items-center justify-center rounded-md bg-muted text-lg">
-										{format.icon}
+									<div className="flex h-8 w-8 items-center justify-center rounded-md bg-muted">
+										<format.icon className="h-5 w-5" />
 									</div>
 									<div className="min-w-0 flex-1">
 										<div className="mb-1 flex items-center gap-2">