cleanup overview tab, moveed shared stuff out, added support for date ranges within parameters with filters, IDs to seperate queries

Author: izadoesdev

apps/api/src/routes/query.ts

@@ -99,7 +99,13 @@ export const query = new Elysia({ prefix: '/v1/query' })
 			try {
 				if (Array.isArray(body)) {
 					const uniqueWebsiteIds = [
-						...new Set(body.flatMap((req) => req.parameters)),
+						...new Set(
+							body.flatMap((req) =>
+								req.parameters.map((param) =>
+									typeof param === 'string' ? param : param.name
+								)
+							)
+						),
 					];
 					const domainCache = await getCachedWebsiteDomain(uniqueWebsiteIds);
 
@@ -201,18 +207,48 @@ async function executeDynamicQuery(
 	}
 
 	async function processParameter(
-		parameter: string,
+		parameterInput:
+			| string
+			| {
+					name: string;
+					start_date?: string;
+					end_date?: string;
+					granularity?: string;
+					id?: string;
+			  },
 		dynamicRequest: DynamicQueryRequestType,
 		params: QueryParams,
 		siteId: string | undefined,
-		start: string | undefined,
-		end: string | undefined,
+		defaultStart: string | undefined,
+		defaultEnd: string | undefined,
 		domain: string | null
 	) {
-		const validation = validateParameterRequest(parameter, siteId, start, end);
+		const isObject = typeof parameterInput === 'object';
+		const parameterName = isObject ? parameterInput.name : parameterInput;
+		const customId =
+			isObject && parameterInput.id ? parameterInput.id : parameterName;
+		const paramStart =
+			isObject && parameterInput.start_date
+				? parameterInput.start_date
+				: defaultStart;
+		const paramEnd =
+			isObject && parameterInput.end_date
+				? parameterInput.end_date
+				: defaultEnd;
+		const paramGranularity =
+			isObject && parameterInput.granularity
+				? parameterInput.granularity
+				: dynamicRequest.granularity;
+
+		const validation = validateParameterRequest(
+			parameterName,
+			siteId,
+			paramStart,
+			paramEnd
+		);
 		if (!validation.success) {
 			return {
-				parameter,
+				parameter: customId,
 				success: false,
 				error: validation.error,
 				data: [],
@@ -222,10 +258,10 @@ async function executeDynamicQuery(
 		try {
 			const queryRequest = {
 				projectId: validation.siteId,
-				type: parameter,
+				type: parameterName,
 				from: validation.start,
 				to: validation.end,
-				timeUnit: getTimeUnit(dynamicRequest.granularity),
+				timeUnit: getTimeUnit(paramGranularity),
 				filters: dynamicRequest.filters || [],
 				limit: dynamicRequest.limit || 100,
 				offset: dynamicRequest.page
@@ -237,13 +273,13 @@ async function executeDynamicQuery(
 			const data = await executeQuery(queryRequest, domain, params.timezone);
 
 			return {
-				parameter,
+				parameter: customId,
 				success: true,
 				data: data || [],
 			};
 		} catch (error) {
 			return {
-				parameter,
+				parameter: customId,
 				success: false,
 				error: error instanceof Error ? error.message : 'Query failed',
 				data: [],
@@ -252,7 +288,7 @@ async function executeDynamicQuery(
 	}
 
 	const parameterResults = await Promise.all(
-		request.parameters.map((param: string) => {
+		request.parameters.map((param) => {
 			return processParameter(
 				param,
 				request,

apps/api/src/schemas/query-schemas.ts

@@ -23,9 +23,24 @@ export const FilterSchema = t.Object({
 	]),
 });
 
+export const ParameterWithDatesSchema = t.Object({
+	name: t.String(),
+	start_date: t.Optional(t.String()),
+	end_date: t.Optional(t.String()),
+	granularity: t.Optional(
+		t.Union([
+			t.Literal('hourly'),
+			t.Literal('daily'),
+			t.Literal('hour'),
+			t.Literal('day'),
+		])
+	),
+	id: t.Optional(t.String()),
+});
+
 export const DynamicQueryRequestSchema = t.Object({
 	id: t.Optional(t.String()),
-	parameters: t.Array(t.String()),
+	parameters: t.Array(t.Union([t.String(), ParameterWithDatesSchema])),
 	limit: t.Optional(t.Number()),
 	page: t.Optional(t.Number()),
 	filters: t.Optional(t.Array(FilterSchema)),
@@ -70,9 +85,17 @@ export type FilterType = {
 	value: string | number | Array<string | number>;
 };
 
+export type ParameterWithDatesType = {
+	name: string;
+	start_date?: string;
+	end_date?: string;
+	granularity?: 'hourly' | 'daily' | 'hour' | 'day';
+	id?: string;
+};
+
 export type DynamicQueryRequestType = {
 	id?: string;
-	parameters: string[];
+	parameters: (string | ParameterWithDatesType)[];
 	limit?: number;
 	page?: number;
 	filters?: FilterType[];