revert getWebsiteEvent

This commit is contained in:
Francis Cao committed 2026-08-05 10:54:08 -07:00
1 parent ff08111ef1
commit 69cd0941ad
2 files changed
+61 -179

No files matched your search

+41 -51
View File
@@ -139,69 +139,59 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
: `select count(*) as num from (${eventQuery}) t`;
const count = await rawQuery(countQuery, queryParams).then(res => res[0].num);
const pagedEventRows = await rawQuery<{ event_id: string; created_at: string }[]>(
const data = await rawQuery(
`
${eventQuery}
order by created_at desc
limit ${size} offset ${offset}
`,
queryParams,
FUNCTION_NAME,
);
const eventIds = pagedEventRows.map(({ event_id }) => event_id);
if (!eventIds.length) {
return {
data: [],
count,
page: +page,
pageSize: size,
orderBy,
search,
isCapped: !!maxResults && +count >= +maxResults,
};
}
const dataQuery = `
with paged_events as (
select
event_id as id,
website_id as websiteId,
session_id as sessionId,
created_at as createdAt,
hostname,
url_path as urlPath,
url_query as urlQuery,
referrer_path as referrerPath,
referrer_query as referrerQuery,
referrer_domain as referrerDomain,
country,
city,
device,
os,
browser,
page_title as pageTitle,
event_type as eventType,
event_name as eventName
from website_event
${cohortQuery}
where website_id = {websiteId:UUID}
and event_type != ${EVENT_TYPE.performance}
${dateQuery}
${filterQuery}
${searchQuery}
order by created_at desc
limit ${size} offset ${offset}
),
paged_event_data as (
select
event_id,
toUInt8(1) as has_data
from umami.event_data_pivot
inner join paged_events on paged_events.id = event_data_pivot.event_id
where website_id = {websiteId:UUID}
and event_id in {eventIds:Array(UUID)}
${hasDataDateQuery}
group by event_id
)
select
website_event.event_id as id,
website_event.website_id as websiteId,
website_event.session_id as sessionId,
website_event.created_at as createdAt,
website_event.hostname,
website_event.url_path as urlPath,
website_event.url_query as urlQuery,
website_event.referrer_path as referrerPath,
website_event.referrer_query as referrerQuery,
website_event.referrer_domain as referrerDomain,
website_event.country,
website_event.city,
website_event.device,
website_event.os,
website_event.browser,
website_event.page_title as pageTitle,
website_event.event_type as eventType,
website_event.event_name as eventName,
paged_events.*,
ifNull(paged_event_data.has_data, 0) as hasData
from website_event
left join paged_event_data on paged_event_data.event_id = website_event.event_id
where website_event.website_id = {websiteId:UUID}
and website_event.event_id in {eventIds:Array(UUID)}
order by indexOf({eventIds:Array(UUID)}, website_event.event_id)
`;
const data = await rawQuery(dataQuery, { ...queryParams, eventIds }, FUNCTION_NAME);
from paged_events
left join paged_event_data on paged_event_data.event_id = paged_events.id
order by paged_events.createdAt desc
`,
queryParams,
FUNCTION_NAME,
);
return {
data,