Merge pull request #4519 from umami-software/testing
Add API integration test suite with Postgres and ClickHouse coverage
This commit is contained in:
59 files changed
+9022
-28
No files matched your search
+39
-14
@@ -62,17 +62,36 @@ function getUTCString(date?: Date | string | number) {
|
||||
return formatInTimeZone(date || new Date(), 'UTC', 'yyyy-MM-dd HH:mm:ss');
|
||||
}
|
||||
|
||||
// ClickHouse time zone names are case-sensitive: several callers default to the
|
||||
// lowercase "utc" that Postgres accepts but ClickHouse rejects. Intl accepts any
|
||||
// casing and returns the canonical IANA name.
|
||||
function normalizeTimezone(timezone?: string) {
|
||||
if (!timezone) {
|
||||
return timezone;
|
||||
}
|
||||
|
||||
try {
|
||||
return Intl.DateTimeFormat(undefined, { timeZone: timezone }).resolvedOptions().timeZone;
|
||||
} catch {
|
||||
return timezone;
|
||||
}
|
||||
}
|
||||
|
||||
function getDateStringSQL(data: any, unit: string = 'utc', timezone?: string) {
|
||||
if (timezone) {
|
||||
return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}', '${timezone}')`;
|
||||
const tz = normalizeTimezone(timezone);
|
||||
|
||||
if (tz) {
|
||||
return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}', '${tz}')`;
|
||||
}
|
||||
|
||||
return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}')`;
|
||||
}
|
||||
|
||||
function getDateSQL(field: string, unit: string, timezone?: string) {
|
||||
if (timezone) {
|
||||
return `toDateTime(date_trunc('${unit}', ${field}, '${timezone}'), '${timezone}')`;
|
||||
const tz = normalizeTimezone(timezone);
|
||||
|
||||
if (tz) {
|
||||
return `toDateTime(date_trunc('${unit}', ${field}, '${tz}'), '${tz}')`;
|
||||
}
|
||||
return `toDateTime(date_trunc('${unit}', ${field}))`;
|
||||
}
|
||||
@@ -236,21 +255,27 @@ function getQueryParams(filters: Record<string, any>) {
|
||||
};
|
||||
}
|
||||
|
||||
function parseFilters(filters: Record<string, any>, options?: QueryOptions) {
|
||||
function parseFilters(rawFilters: Record<string, any>, options?: QueryOptions) {
|
||||
const filters = rawFilters.timezone
|
||||
? { ...rawFilters, timezone: normalizeTimezone(rawFilters.timezone) }
|
||||
: rawFilters;
|
||||
const cohortFilters = Object.fromEntries(
|
||||
Object.entries(filters).filter(([key]) => key.startsWith('cohort_')),
|
||||
);
|
||||
const {
|
||||
sql: eventPropertyFilterQuery,
|
||||
params: eventPropertyFilterParams,
|
||||
} = getEventPropertyFilterQuery((filters as QueryFilters).eventPropertyFilters, filters.timezone);
|
||||
const {
|
||||
sql: sessionPropertyFilterQuery,
|
||||
params: sessionPropertyFilterParams,
|
||||
} = getSessionPropertyFilterQuery((filters as QueryFilters).sessionPropertyFilters, filters.timezone);
|
||||
const { sql: eventPropertyFilterQuery, params: eventPropertyFilterParams } =
|
||||
getEventPropertyFilterQuery((filters as QueryFilters).eventPropertyFilters, filters.timezone);
|
||||
const { sql: sessionPropertyFilterQuery, params: sessionPropertyFilterParams } =
|
||||
getSessionPropertyFilterQuery(
|
||||
(filters as QueryFilters).sessionPropertyFilters,
|
||||
filters.timezone,
|
||||
);
|
||||
|
||||
return {
|
||||
filterQuery: [getFilterQuery(filters, options), eventPropertyFilterQuery, sessionPropertyFilterQuery]
|
||||
filterQuery: [
|
||||
getFilterQuery(filters, options),
|
||||
eventPropertyFilterQuery,
|
||||
sessionPropertyFilterQuery,
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join('\n'),
|
||||
dateQuery: getDateQuery(filters),
|
||||
|
||||
@@ -123,7 +123,7 @@ async function clickhouseQuery(
|
||||
website_revenue.created_at,
|
||||
website_revenue.revenue
|
||||
from website_revenue
|
||||
any inner join filtered_sessions
|
||||
inner join filtered_sessions
|
||||
on filtered_sessions.website_id = website_revenue.website_id
|
||||
and filtered_sessions.session_id = website_revenue.session_id
|
||||
where website_revenue.website_id = {websiteId:UUID}
|
||||
|
||||
@@ -210,8 +210,8 @@ async function relationalQuery(
|
||||
we.utm_medium ilike '%ppc%' OR
|
||||
we.utm_medium ilike '%retargeting%' OR
|
||||
we.utm_medium ilike '%paid%' then 'paid' else 'organic' end AS prefix,
|
||||
we.referrer_domain,
|
||||
we.url_query,
|
||||
coalesce(we.referrer_domain, '') as referrer_domain,
|
||||
coalesce(we.url_query, '') as url_query,
|
||||
we.utm_medium,
|
||||
we.utm_source,
|
||||
we.hostname,
|
||||
@@ -293,7 +293,7 @@ async function clickhouseQuery(
|
||||
website_revenue.created_at,
|
||||
website_revenue.revenue
|
||||
from website_revenue
|
||||
any inner join filtered_sessions
|
||||
inner join filtered_sessions
|
||||
on filtered_sessions.website_id = website_revenue.website_id
|
||||
and filtered_sessions.session_id = website_revenue.session_id
|
||||
where website_revenue.website_id = {websiteId:UUID}
|
||||
@@ -312,7 +312,7 @@ async function clickhouseQuery(
|
||||
filtered_sessions.country as "name",
|
||||
sum(filtered_revenue.revenue) as "value"
|
||||
from filtered_revenue
|
||||
any inner join filtered_sessions
|
||||
inner join filtered_sessions
|
||||
on filtered_sessions.website_id = filtered_revenue.website_id
|
||||
and filtered_sessions.session_id = filtered_revenue.session_id
|
||||
group by filtered_sessions.country
|
||||
@@ -333,7 +333,7 @@ async function clickhouseQuery(
|
||||
filtered_sessions.region as "name",
|
||||
sum(filtered_revenue.revenue) as "value"
|
||||
from filtered_revenue
|
||||
any inner join filtered_sessions
|
||||
inner join filtered_sessions
|
||||
on filtered_sessions.website_id = filtered_revenue.website_id
|
||||
and filtered_sessions.session_id = filtered_revenue.session_id
|
||||
group by 1, 2
|
||||
@@ -354,7 +354,7 @@ async function clickhouseQuery(
|
||||
website_revenue.session_id,
|
||||
sum(website_revenue.revenue) as "value"
|
||||
from website_revenue
|
||||
any inner join filtered_sessions
|
||||
inner join filtered_sessions
|
||||
on filtered_sessions.website_id = website_revenue.website_id
|
||||
and filtered_sessions.session_id = website_revenue.session_id
|
||||
where website_revenue.website_id = {websiteId:UUID}
|
||||
@@ -409,7 +409,7 @@ async function clickhouseQuery(
|
||||
website_revenue.session_id,
|
||||
sum(website_revenue.revenue) as "value"
|
||||
from website_revenue
|
||||
any inner join filtered_sessions
|
||||
inner join filtered_sessions
|
||||
on filtered_sessions.website_id = website_revenue.website_id
|
||||
and filtered_sessions.session_id = website_revenue.session_id
|
||||
where website_revenue.website_id = {websiteId:UUID}
|
||||
|
||||
@@ -112,7 +112,7 @@ async function clickhouseQuery(
|
||||
filtered_revenue as (
|
||||
select website_revenue.website_id, website_revenue.session_id, website_revenue.event_id, website_revenue.revenue
|
||||
from website_revenue
|
||||
any inner join filtered_sessions
|
||||
inner join filtered_sessions
|
||||
on filtered_sessions.website_id = website_revenue.website_id
|
||||
and filtered_sessions.session_id = website_revenue.session_id
|
||||
where website_revenue.website_id = {websiteId:UUID}
|
||||
|
||||
@@ -75,7 +75,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
||||
session.country,
|
||||
session.region,
|
||||
session.city
|
||||
order by max(website_event.created_at) desc
|
||||
order by max(website_event.created_at) desc, session.session_id
|
||||
`,
|
||||
queryParams,
|
||||
filters,
|
||||
@@ -138,7 +138,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
|
||||
${normalizedFilterQuery}
|
||||
${searchQuery}
|
||||
group by session_id
|
||||
order by lastAt desc
|
||||
order by lastAt desc, id
|
||||
`;
|
||||
} else {
|
||||
sql = `
|
||||
@@ -168,7 +168,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
|
||||
${normalizedFilterQuery}
|
||||
${searchQuery}
|
||||
group by session_id
|
||||
order by lastAt desc
|
||||
order by lastAt desc, id
|
||||
`;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user