Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Removed output parsing for clickhouse.

Mike Cao7a0575e33a2c
diff --git a/src/app/api/send/route.ts b/src/app/api/send/route.ts
index 415b5a8ee..2892eefde 100644
--- a/src/app/api/send/route.ts
+++ b/src/app/api/send/route.ts
@@ -194,5 +194,5 @@ export async function POST(request: Request) {
const token = createToken({ websiteId, sessionId, visitId, iat }, secret());
- return json({ cache: token, websiteId, sessionId, visitId, iat });
+ return json({ cache: token });
}
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 13abde9de..3c8b7bbfb 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -95,7 +95,7 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})
arr.push(`and ${mapFilter(column, operator, name)}`);
if (name === 'referrer') {
- arr.push('and referrer_domain != {websiteDomain:String}');
+ arr.push('and referrer_domain != hostname');
}
}
@@ -157,7 +157,7 @@ async function pagedQuery(
) {
const { page = 1, pageSize, orderBy, sortDescending = false } = pageParams;
const size = +pageSize || DEFAULT_PAGE_SIZE;
- const offset = +size * (page - 1);
+ const offset = +size * (+page - 1);
const direction = sortDescending ? 'desc' : 'asc';
const statements = [
diff --git a/src/queries/sql/events/getEventMetrics.ts b/src/queries/sql/events/getEventMetrics.ts
index d06789f43..c961c55be 100644
--- a/src/queries/sql/events/getEventMetrics.ts
+++ b/src/queries/sql/events/getEventMetrics.ts
@@ -86,9 +86,5 @@ async function clickhouseQuery(
`;
}
- return rawQuery(sql, params).then(a => {
- return Object.values(a).map(a => {
- return { x: a.x, t: a.t, y: Number(a.y) };
- });
- });
+ return rawQuery(sql, params);
}
diff --git a/src/queries/sql/events/getEventUsage.ts b/src/queries/sql/events/getEventUsage.ts
index 0e1806d68..9ff69a071 100644
--- a/src/queries/sql/events/getEventUsage.ts
+++ b/src/queries/sql/events/getEventUsage.ts
@@ -30,9 +30,5 @@ function clickhouseQuery(
startDate,
endDate,
},
- ).then(a => {
- return Object.values(a).map(a => {
- return { websiteId: a.websiteId, count: Number(a.count) };
- });
- });
+ );
}
diff --git a/src/queries/sql/events/getWebsiteEvents.ts b/src/queries/sql/events/getWebsiteEvents.ts
index 5559d5bd1..6fe7a0a15 100644
--- a/src/queries/sql/events/getWebsiteEvents.ts
+++ b/src/queries/sql/events/getWebsiteEvents.ts
@@ -14,7 +14,7 @@ export function getWebsiteEvents(
async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
const { pagedRawQuery, parseFilters } = prisma;
- const { query } = pageParams;
+ const { search } = pageParams;
const { filterQuery, params } = await parseFilters(websiteId, {
...filters,
});
@@ -43,16 +43,16 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
and created_at between {{startDate}} and {{endDate}}
${filterQuery}
${
- query
- ? `and ((event_name ${like} {{query}} and event_type = 2)
- or (url_path ${like} {{query}} and event_type = 1))`
+ search
+ ? `and ((event_name ${like} {{search}} and event_type = 2)
+ or (url_path ${like} {{search}} and event_type = 1))`
: ''
}
order by created_at desc
limit 1000)
select * from events
`,
- { ...params, query: `%${query}%` },
+ { ...params, query: `%${search}%` },
pageParams,
);
}
@@ -60,7 +60,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
const { pagedQuery, parseFilters } = clickhouse;
const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
- const { query } = pageParams;
+ const { search } = pageParams;
return pagedQuery(
`
@@ -83,16 +83,16 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
${dateQuery}
${filterQuery}
${
- query
- ? `and ((positionCaseInsensitive(event_name, {query:String}) > 0 and event_type = 2)
- or (positionCaseInsensitive(url_path, {query:String}) > 0 and event_type = 1))`
+ search
+ ? `and ((positionCaseInsensitive(event_name, {search:String}) > 0 and event_type = 2)
+ or (positionCaseInsensitive(url_path, {search:String}) > 0 and event_type = 1))`
: ''
}
order by created_at desc
limit 1000)
select * from events
`,
- { ...params, query },
+ { ...params, search },
pageParams,
);
}
diff --git a/src/queries/sql/getChannelMetrics.ts b/src/queries/sql/getChannelMetrics.ts
index a7591a809..a22238704 100644
--- a/src/queries/sql/getChannelMetrics.ts
+++ b/src/queries/sql/getChannelMetrics.ts
@@ -51,9 +51,5 @@ async function clickhouseQuery(
order by visitors desc
`;
- return rawQuery(sql, params).then(a => {
- return Object.values(a).map(a => {
- return { ...a, visitors: Number(a.visitors) };
- });
- });
+ return rawQuery(sql, params);
}
diff --git a/src/queries/sql/pageviews/getPageviewMetrics.ts b/src/queries/sql/pageviews/getPageviewMetrics.ts
index f60419297..4a0d3361e 100644
--- a/src/queries/sql/pageviews/getPageviewMetrics.ts
+++ b/src/queries/sql/pageviews/getPageviewMetrics.ts
@@ -40,7 +40,7 @@ async function relationalQuery(
let entryExitQuery = '';
let excludeDomain = '';
if (column === 'referrer_domain') {
- excludeDomain = `and website_event.referrer_domain != {{websiteDomain}}
+ excludeDomain = `and website_event.referrer_domain != website_event.hostname
and website_event.referrer_domain is not null`;
}
@@ -175,9 +175,5 @@ async function clickhouseQuery(
`;
}
- return rawQuery(sql, params).then((result: any) => {
- return Object.values(result).map((a: any) => {
- return { x: a.x, y: Number(a.y) };
- });
- });
+ return rawQuery(sql, params);
}
diff --git a/src/queries/sql/reports/getInsights.ts b/src/queries/sql/reports/getInsights.ts
index 7178072e3..d7cdc283f 100644
--- a/src/queries/sql/reports/getInsights.ts
+++ b/src/queries/sql/reports/getInsights.ts
@@ -115,18 +115,7 @@ async function clickhouseQuery(
limit 500
`,
params,
- ).then(a => {
- return Object.values(a).map(a => {
- return {
- ...a,
- views: Number(a.views),
- visitors: Number(a.visitors),
- visits: Number(a.visits),
- bounces: Number(a.bounces),
- totaltime: Number(a.totaltime),
- };
- });
- });
+ );
}
function parseFields(fields: { name: any }[]) {
diff --git a/src/queries/sql/sessions/getSessionMetrics.ts b/src/queries/sql/sessions/getSessionMetrics.ts
index e3bd1bba2..010989b5d 100644
--- a/src/queries/sql/sessions/getSessionMetrics.ts
+++ b/src/queries/sql/sessions/getSessionMetrics.ts
@@ -115,9 +115,5 @@ async function clickhouseQuery(
`;
}
- return rawQuery(sql, params).then(a => {
- return Object.values(a).map(a => {
- return { x: a.x, y: Number(a.y), country: a.country };
- });
- });
+ return rawQuery(sql, params);
}