watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-19 12:05:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: clickhouse query

Browse source
This commit is contained in:
Viet-Tien Ngoc 2024-08-28 17:20:19 +07:00
parent 99d5e7cb41
commit 7e9c4b7c73
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/queries/analytics/sessions/getSessionData.ts
View file

@ -1,6 +1,6 @@
import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
export async function getSessionData(...args: [websiteId: string, sessionId: string]) {
return runQuery({
@ -46,7 +46,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
number_value as numberValue,
date_value as dateValue,
created_at as createdAt
from session_data final
from session_data
where website_id = {websiteId:UUID}
and session_id = {sessionId:UUID}
order by data_key asc

4
src/queries/analytics/sessions/getSessionDataProperties.ts
View file

@ -1,6 +1,6 @@
import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
import { QueryFilters, WebsiteEventData } from 'lib/types';
export async function getSessionDataProperties(
@ -52,7 +52,7 @@ async function clickhouseQuery(
select
data_key as propertyName,
count(*) as total
from session_data final
from session_data
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}

4
src/queries/analytics/sessions/getSessionDataValues.ts
View file

@ -1,6 +1,6 @@
import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
import { QueryFilters, WebsiteEventData } from 'lib/types';
export async function getSessionDataValues(
@ -55,7 +55,7 @@ async function clickhouseQuery(
data_type = 4, toString(date_trunc('hour', date_value)),
string_value) as "value",
count(*) as "total"
from session_data final
from session_data
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
and data_key = {propertyName:String}