mirror of
https://github.com/umami-software/umami.git
synced 2026-02-15 18:15:35 +01:00
update api to new CH columns
This commit is contained in:
parent
36edbe2f4c
commit
96add409b6
19 changed files with 74 additions and 48 deletions
|
|
@ -36,7 +36,7 @@ async function relationalQuery(
|
|||
}
|
||||
|
||||
async function clickhouseQuery(
|
||||
website_id,
|
||||
website_uuid,
|
||||
start_at,
|
||||
end_at,
|
||||
timezone = 'UTC',
|
||||
|
|
@ -44,7 +44,7 @@ async function clickhouseQuery(
|
|||
filters = {},
|
||||
) {
|
||||
const { rawQuery, getDateQuery, getBetweenDates, getFilterQuery } = clickhouse;
|
||||
const params = [website_id];
|
||||
const params = [website_uuid];
|
||||
|
||||
return rawQuery(
|
||||
`select
|
||||
|
|
|
|||
|
|
@ -25,19 +25,23 @@ function relationalQuery(websites, start_at) {
|
|||
}
|
||||
|
||||
function clickhouseQuery(websites, start_at) {
|
||||
const { rawQuery, getDateFormat } = clickhouse;
|
||||
const { rawQuery, getDateFormat, getCommaSeparatedStringFormat } = clickhouse;
|
||||
|
||||
return rawQuery(
|
||||
`select
|
||||
event_uuid,
|
||||
event_id,
|
||||
website_id,
|
||||
session_uuid,
|
||||
session_id,
|
||||
created_at,
|
||||
url,
|
||||
event_name
|
||||
from event
|
||||
where event_name != ''
|
||||
and ${websites && websites.length > 0 ? `website_id in (${websites.join(',')})` : '0 = 0'}
|
||||
and ${
|
||||
websites && websites.length > 0
|
||||
? `website_id in (${getCommaSeparatedStringFormat(websites, websites.website_uuid)})`
|
||||
: '0 = 0'
|
||||
}
|
||||
and created_at >= ${getDateFormat(start_at)}`,
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@ async function relationalQuery(website_id, { session_id, url, event_name, event_
|
|||
}
|
||||
|
||||
async function clickhouseQuery(
|
||||
website_id,
|
||||
website_uuid,
|
||||
{ session: { country, ...sessionArgs }, event_uuid, url, event_name, event_data },
|
||||
) {
|
||||
const { getDateFormat, sendMessage } = kafka;
|
||||
|
||||
const params = {
|
||||
event_uuid,
|
||||
website_id,
|
||||
website_uuid,
|
||||
created_at: getDateFormat(new Date()),
|
||||
url: url?.substring(0, URL_LENGTH),
|
||||
event_name: event_name?.substring(0, EVENT_NAME_LENGTH),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue