watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 06:37:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Resolve issues in event data

Browse source
This commit is contained in:
Francis Cao 2023-08-16 08:49:22 -07:00
parent 38445fce7a
commit c3e261fc50
8 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
queries/analytics/eventData/getEventDataEvents.ts
View file

@ -1,11 +1,11 @@
import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import { QueryFilters, WebsiteEventDataFields } from 'lib/types';
import { QueryFilters, WebsiteEventData } from 'lib/types';
export async function getEventDataEvents(
...args: [websiteId: string, filters: QueryFilters]
): Promise<WebsiteEventDataFields[]> {
): Promise<WebsiteEventData[]> {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
@ -24,7 +24,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
website_event.event_name as "eventName",
event_data.event_key as "fieldName",
event_data.data_type as "dataType",
event_data.string_value as "value",
event_data.string_value as "fieldValue",
count(*) as "total"
from event_data
inner join website_event
@ -71,7 +71,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
event_name as eventName,
event_key as fieldName,
data_type as dataType,
string_value as value,
string_value as fieldValue,
count(*) as total
from event_data
where website_id = {websiteId:UUID}