Merge branch 'staging' of https://github.com/databuddy-analytics/Databuddy into staging

izadoesdev · izadoesdev · commit 318876f79d38 · 2025-10-23T10:44:04.000+03:00
diff --git a/apps/api/src/routes/query.ts b/apps/api/src/routes/query.ts
@@ -205,15 +205,16 @@ export const query = new Elysia({ prefix: '/v1/query' })
 			query: queryParams,
 		}: {
 			body: CompileRequestType;
-			query: { website_id?: string };
+			query: { website_id?: string; timezone?: string };
 		}) => {
 			try {
 				const { website_id } = queryParams;
+				const timezone = queryParams.timezone || 'UTC';
 				const websiteDomain = website_id
 					? await getWebsiteDomain(website_id)
 					: null;
 
-				const result = compileQuery(body as QueryRequest, websiteDomain);
+				const result = compileQuery(body as QueryRequest, websiteDomain, timezone);
 				return {
 					success: true,
 					...result,
@@ -235,12 +236,12 @@ export const query = new Elysia({ prefix: '/v1/query' })
 		async ({
 			body,
 			query: queryParams,
-			timezone,
 		}: {
 			body: DynamicQueryRequestType | DynamicQueryRequestType[];
-			query: { website_id?: string };
-			timezone: string;
+			query: { website_id?: string; timezone?: string };
 		}) => {
+			const timezone = queryParams.timezone || 'UTC';
+			
 			try {
 				if (Array.isArray(body)) {
 					const uniqueWebsiteIds = [
diff --git a/apps/basket/src/lib/kafka.test.ts b/apps/basket/src/lib/kafka.test.ts
@@ -20,12 +20,18 @@ describe('Kafka Producer and Consumer', () => {
 				initialRetryTime: 100,
 				retries: 8,
 			},
+			sasl: {
+				mechanism: 'scram-sha-256',
+				username: process.env.KAFKA_USER as string,
+				password: process.env.KAFKA_PASSWORD as string,
+			},
 		});
 
 		producer = kafka.producer();
 		consumer = kafka.consumer({ 
 			groupId: TEST_GROUP_ID,
 			sessionTimeout: 10000,
+			allowAutoTopicCreation: true,
 			heartbeatInterval: 3000,
 		});
 
diff --git a/apps/basket/src/lib/producer.test.ts b/apps/basket/src/lib/producer.test.ts
@@ -20,11 +20,17 @@ describe('Producer Module', () => {
 				initialRetryTime: 100,
 				retries: 8,
 			},
+			sasl: {
+				mechanism: 'scram-sha-256',
+				username: process.env.KAFKA_USER as string,
+				password: process.env.KAFKA_PASSWORD as string,
+			},
 		});
 
 		consumer = kafka.consumer({ 
 			groupId: TEST_GROUP_ID,
 			sessionTimeout: 10000,
+			allowAutoTopicCreation: true,
 		});
 
 		await consumer.connect();
diff --git a/apps/basket/src/lib/producer.ts b/apps/basket/src/lib/producer.ts
@@ -66,6 +66,11 @@ if (BROKER) {
 		brokers: [BROKER],
 		connectionTimeout: 5000,
 		requestTimeout: KAFKA_TIMEOUT,
+		sasl: {
+			mechanism: 'scram-sha-256',
+			username: process.env.KAFKA_USER as string,
+			password: process.env.KAFKA_PASSWORD as string,
+		},
 	});
 	producer = kafka.producer({
 		allowAutoTopicCreation: true,
diff --git a/apps/dashboard/app/(main)/websites/[id]/_components/tabs/overview-tab.tsx b/apps/dashboard/app/(main)/websites/[id]/_components/tabs/overview-tab.tsx
@@ -11,8 +11,6 @@ import {
 } from '@phosphor-icons/react';
 import type { ColumnDef } from '@tanstack/react-table';
 import dayjs from 'dayjs';
-import timezone from 'dayjs/plugin/timezone';
-import utc from 'dayjs/plugin/utc';
 import { useAtom } from 'jotai';
 import dynamic from 'next/dynamic';
 import { useCallback, useMemo } from 'react';
@@ -31,7 +29,6 @@ import {
 	createReferrerColumns,
 } from '@/components/table/rows';
 import { useBatchDynamicQuery } from '@/hooks/use-dynamic-query';
-import { getUserTimezone } from '@/lib/timezone';
 import { useDateFilters } from '@/hooks/use-date-filters';
 import {
 	metricVisibilityAtom,
@@ -322,15 +319,13 @@ export function WebsiteOverviewTab({
 	const processedEventsData = useMemo(() => {
 		if (!analytics.events_by_date?.length) return [];
 		
-		const userTimezone = getUserTimezone();
-		const now = dayjs().tz(userTimezone);
+		const now = dayjs();
 		const isHourly = dateRange.granularity === 'hourly';
 
-		// Step 1: Filter future events
 		const filteredEvents = analytics.events_by_date.filter((event: MetricPoint) => {
-			const eventDate = dayjs.utc(event.date).tz(userTimezone);
+			const eventDate = dayjs(event.date);
 
-			if (isHourly) {
+			if (isHourly) {	
 				return eventDate.isBefore(now);
 			}
 
@@ -346,8 +341,8 @@ export function WebsiteOverviewTab({
 		}
 
 		// Step 3: Fill missing dates
-		const startDate = dayjs(dateRange.start_date).tz(userTimezone);
-		const endDate = dayjs(dateRange.end_date).tz(userTimezone);
+		const startDate = dayjs(dateRange.start_date);
+		const endDate = dayjs(dateRange.end_date);
 		const filled: MetricPoint[] = [];
 		let current = startDate;
 
@@ -676,13 +671,10 @@ export function WebsiteOverviewTab({
 		},
 	];
 
-	const userTimezone = getUserTimezone();
-	dayjs.extend(utc);
-	dayjs.extend(timezone);
-	const todayDate = dayjs().tz(userTimezone).format('YYYY-MM-DD');
+	const todayDate = dayjs().format('YYYY-MM-DD');
 	const todayEvent = analytics.events_by_date.find(
 		(event: MetricPoint) =>
-			dayjs(event.date).tz(userTimezone).format('YYYY-MM-DD') === todayDate
+			dayjs(event.date).format('YYYY-MM-DD') === todayDate
 	);
 	const todayVisitors = todayEvent?.visitors ?? 0;
 	const todaySessions = todayEvent?.sessions ?? 0;
diff --git a/apps/dashboard/app/(main)/websites/[id]/_components/utils/analytics-helpers.tsx b/apps/dashboard/app/(main)/websites/[id]/_components/utils/analytics-helpers.tsx
@@ -66,13 +66,11 @@ export const safeParseDate = (
 	}
 };
 
-// Format date for display based on granularity with timezone conversion
 export const formatDateByGranularity = (
 	date: string | Date,
 	granularity: Granularity = 'daily'
 ): string => {
-	const userTimezone = getUserTimezone();
-	const dateObj = dayjs.utc(date).tz(userTimezone);
+	const dateObj = dayjs(date);
 	return granularity === 'hourly'
 		? dateObj.format('MMM D, h:mm A')
 		: dateObj.format('MMM D');
diff --git a/apps/dashboard/hooks/use-date-filters.ts b/apps/dashboard/hooks/use-date-filters.ts
@@ -5,12 +5,10 @@ import {
 	formattedDateRangeAtom,
 	setDateRangeAndAdjustGranularityAtom,
 	timeGranularityAtom,
-	timezoneAtom,
 } from '@/stores/jotai/filterAtoms';
 
 export function useDateFilters() {
 	const [currentDateRange, setCurrentDateRange] = useAtom(dateRangeAtom);
-	const [timezone] = useAtom(timezoneAtom);
 	const [formattedDateRangeState] = useAtom(formattedDateRangeAtom);
 	const [currentGranularity, setCurrentGranularityAtomState] =
 		useAtom(timeGranularityAtom);
@@ -21,9 +19,8 @@ export function useDateFilters() {
 			start_date: formattedDateRangeState.startDate,
 			end_date: formattedDateRangeState.endDate,
 			granularity: currentGranularity,
-			timezone,
 		}),
-		[formattedDateRangeState, currentGranularity, timezone]
+		[formattedDateRangeState, currentGranularity]
 	);
 
 	return {
diff --git a/apps/dashboard/hooks/use-dynamic-query.ts b/apps/dashboard/hooks/use-dynamic-query.ts
@@ -18,7 +18,7 @@ import {
 } from '@tanstack/react-query';
 import { useCallback, useMemo } from 'react';
 import { formatDuration } from '@/lib/utils';
-import { usePreferences } from './use-preferences';
+import { getUserTimezone } from '@/lib/timezone';
 
 const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3001';
 
@@ -70,31 +70,6 @@ const defaultQueryOptions = {
 	placeholderData: undefined, // Don't use placeholder data to ensure loading states show
 };
 
-/**
- * Hook to get the user's effective timezone
- */
-function useUserTimezone(): string {
-	const { preferences } = usePreferences();
-
-	// Get browser timezone as fallback
-	const browserTimezone = useMemo(() => {
-		try {
-			return Intl.DateTimeFormat().resolvedOptions().timeZone;
-		} catch {
-			return 'UTC';
-		}
-	}, []);
-
-	// Return user's preferred timezone or browser timezone if 'auto'
-	if (!preferences) {
-		return browserTimezone;
-	}
-
-	return preferences.timezone === 'auto'
-		? browserTimezone
-		: preferences.timezone;
-}
-
 function transformFilters(filters?: DynamicQueryRequest['filters']) {
 	return filters?.map(({ field, operator, value }) => ({
 		field,
@@ -108,10 +83,9 @@ async function fetchDynamicQuery(
 	websiteId: string,
 	dateRange: DateRange,
 	queryData: DynamicQueryRequest | DynamicQueryRequest[],
-	signal?: AbortSignal,
-	userTimezone?: string
+	signal?: AbortSignal
 ): Promise<DynamicQueryResponse | BatchQueryResponse> {
-	const timezone = userTimezone || 'UTC';
+	const timezone = getUserTimezone();
 	const params = buildParams(websiteId, dateRange, { timezone });
 	const url = `${API_BASE_URL}/v1/query?${params}`;
 
@@ -174,24 +148,21 @@ export function useDynamicQuery<T extends (keyof ParameterDataMap)[]>(
 	queryData: DynamicQueryRequest,
 	options?: Partial<UseQueryOptions<DynamicQueryResponse>>
 ) {
-	const userTimezone = useUserTimezone();
-
 	const fetchData = useCallback(
 		async ({ signal }: { signal?: AbortSignal }) => {
 			const result = await fetchDynamicQuery(
 				websiteId,
 				dateRange,
 				queryData,
-				signal,
-				userTimezone
+				signal
 			);
 			return result as DynamicQueryResponse;
 		},
-		[websiteId, dateRange, queryData, userTimezone]
+		[websiteId, dateRange, queryData]
 	);
 
 	const query = useQuery({
-		queryKey: ['dynamic-query', websiteId, dateRange, queryData, userTimezone],
+		queryKey: ['dynamic-query', websiteId, dateRange, queryData],
 		queryFn: fetchData,
 		...defaultQueryOptions,
 		...options,
@@ -250,21 +221,18 @@ export function useBatchDynamicQuery(
 	queries: DynamicQueryRequest[],
 	options?: Partial<UseQueryOptions<BatchQueryResponse>>
 ) {
-	const userTimezone = useUserTimezone();
-
 	const fetchData = useCallback(
 		async ({ signal }: { signal?: AbortSignal }) => {
 			const result = await fetchDynamicQuery(
 				websiteId,
 				dateRange,
 				queries,
-				signal,
-				userTimezone
+				signal
 			);
 			// Ensure we return a batch query response
 			return result as BatchQueryResponse;
 		},
-		[websiteId, dateRange, queries, userTimezone]
+		[websiteId, dateRange, queries]
 	);
 
 	const query = useQuery({
diff --git a/apps/dashboard/lib/timezone.ts b/apps/dashboard/lib/timezone.ts
@@ -2,8 +2,11 @@
  * Shared timezone utilities for dashboard components
  */
 
-// Get user's timezone
 export const getUserTimezone = (): string => {
-	// Hardcode GMT+2 for testing
-	return 'Europe/Athens';
+	try {
+		const browserTz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+		return browserTz;
+	} catch {
+		return 'UTC';
+	}
 };
diff --git a/infra/ingest/docker-compose.yml b/infra/ingest/docker-compose.yml
@@ -29,8 +29,7 @@ services:
           --smp 2 \
           --memory 2G \
           --reserve-memory 0M \
-          --default-log-level=info \
-          --set "redpanda.superusers=['admin']"
+          --default-log-level=info
     networks:
       - databuddy
     healthcheck:
