fix: custom events schema

Author: izadoesdev

apps/basket/src/routes/basket.ts

@@ -321,7 +321,7 @@ async function insertCustomEvent(
 		customData.eventId,
 		VALIDATION_LIMITS.SHORT_STRING_MAX_LENGTH
 	);
-	q;
+
 	if (!eventId) {
 		eventId = randomUUID();
 	}
@@ -841,8 +841,12 @@ const app = new Elysia()
 						errors: parseResult.error.issues,
 					};
 				}
-				insertCustomEvent(body, clientId, userAgent, ip);
-				return { status: 'success', type: 'custom' };
+
+				const eventId = body.eventId || randomUUID();
+				const customEventWithId = { ...body, eventId };
+
+				await insertCustomEvent(customEventWithId, clientId, userAgent, ip);
+				return { status: 'success', type: 'custom', eventId };
 			}
 
 			if (eventType === 'outgoing_link') {
@@ -1132,11 +1136,15 @@ const app = new Elysia()
 						};
 					}
 					try {
-						await insertCustomEvent(event, clientId, userAgent, ip);
+						// Generate eventId if not provided
+						const eventId = event.eventId || randomUUID();
+						const customEventWithId = { ...event, eventId };
+
+						await insertCustomEvent(customEventWithId, clientId, userAgent, ip);
 						return {
 							status: 'success',
 							type: 'custom',
-							eventId: event.eventId,
+							eventId,
 						};
 					} catch (error) {
 						return {

apps/dashboard/app/custom-events-test/actions.ts

@@ -0,0 +1,87 @@
+'use server';
+
+interface CustomEventData {
+	clientId: string;
+	name: string;
+	anonymousId?: string;
+	sessionId?: string;
+	timestamp?: number;
+	properties?: Record<string, any>;
+}
+
+export async function sendCustomEvent(data: CustomEventData) {
+	try {
+		const payload = {
+			type: 'custom',
+			name: data.name,
+			...(data.anonymousId && { anonymousId: data.anonymousId }),
+			...(data.sessionId && { sessionId: data.sessionId }),
+			...(data.timestamp && { timestamp: data.timestamp }),
+			...(data.properties && { properties: data.properties }),
+		};
+
+		const response = await fetch(
+			`https://basket.databuddy.cc/?client_id=${data.clientId}`,
+			{
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json',
+				},
+				body: JSON.stringify(payload),
+			}
+		);
+
+		const result = await response.json();
+
+		if (!response.ok) {
+			throw new Error(
+				result.message || `HTTP ${response.status}: ${response.statusText}`
+			);
+		}
+
+		return result;
+	} catch (error) {
+		console.error('Failed to send custom event:', error);
+		throw error;
+	}
+}
+
+export async function sendBatchCustomEvents(
+	clientId: string,
+	events: CustomEventData[]
+) {
+	try {
+		const payload = events.map((event) => ({
+			type: 'custom',
+			name: event.name,
+			...(event.anonymousId && { anonymousId: event.anonymousId }),
+			...(event.sessionId && { sessionId: event.sessionId }),
+			...(event.timestamp && { timestamp: event.timestamp }),
+			...(event.properties && { properties: event.properties }),
+		}));
+
+		const response = await fetch(
+			`https://basket.databuddy.cc/batch?client_id=${clientId}`,
+			{
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json',
+				},
+				body: JSON.stringify(payload),
+			}
+		);
+
+		const result = await response.json();
+
+		if (!response.ok) {
+			throw new Error(
+				result.message || `HTTP ${response.status}: ${response.statusText}`
+			);
+		}
+
+		return result;
+	} catch (error) {
+		console.error('Failed to send batch custom events:', error);
+		throw error;
+	}
+}