watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-11 16:17:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added lib/types.

Browse source
This commit is contained in:
Mike Cao 2022-12-02 14:15:24 -08:00
parent 06bebadbb9
commit 4781a0cc8c
12 changed files with 247 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

6
queries/analytics/event/getEventData.ts
View file

@ -3,7 +3,7 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
import cache from 'lib/cache';
import { WebsiteMetric } from 'interface/api/models';
import { UmamiApi } from 'lib/constants';
import { EventType } from 'lib/types';
export async function getEventData(
...args: [
@ -47,7 +47,7 @@ async function relationalQuery(
from website_event
where website_id ='${websiteId}'
and created_at between $1 and $2
and event_type = ${UmamiApi.EventType.Event}
and event_type = ${EventType.Event}
${eventName ? `and eventName = ${eventName}` : ''}
${
Object.keys(filters).length > 0
@ -80,7 +80,7 @@ async function clickhouseQuery(
from event
where website_id = $1
and rev_id = $2
and event_type = ${UmamiApi.EventType.Event}
and event_type = ${EventType.Event}
${eventName ? `and eventName = ${eventName}` : ''}
and ${getBetweenDates('created_at', startDate, endDate)}
${

6
queries/analytics/event/getEventMetrics.ts
View file

@ -3,7 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache';
import { WebsiteEventMetric } from 'interface/api/models';
import { UmamiApi } from 'lib/constants';
import { EventType } from 'lib/types';
export async function getEventMetrics(
...args: [
@ -56,7 +56,7 @@ async function relationalQuery(
from website_event
where website_id='${websiteId}'
and created_at between $1 and $2
and event_type = ${UmamiApi.EventType.Event}
and event_type = ${EventType.Event}
${getFilterQuery(filters, params)}
group by 1, 2
order by 2`,
@ -95,7 +95,7 @@ async function clickhouseQuery(
from event
where website_id = $1
and rev_id = $2
and event_type = ${UmamiApi.EventType.Event}
and event_type = ${EventType.Event}
and ${getBetweenDates('created_at', startDate, endDate)}
${getFilterQuery(filters, params)}
group by x, t

6
queries/analytics/event/saveEvent.ts
View file

@ -4,7 +4,7 @@ import kafka from 'lib/kafka';
import prisma from 'lib/prisma';
import { uuid } from 'lib/crypto';
import cache from 'lib/cache';
import { UmamiApi } from 'lib/constants';
import { EventType } from 'lib/types';
export async function saveEvent(args: {
id: string;
@ -43,7 +43,7 @@ async function relationalQuery(data: {
sessionId,
url: url?.substring(0, URL_LENGTH),
referrer: referrer?.substring(0, URL_LENGTH),
eventType: UmamiApi.EventType.Event,
eventType: EventType.Event,
eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
eventData,
};
@ -77,7 +77,7 @@ async function clickhouseQuery(data: {
session_id: sessionId,
event_id: uuid(),
url: url?.substring(0, URL_LENGTH),
event_type: UmamiApi.EventType.Event,
event_type: EventType.Event,
event_name: eventName?.substring(0, EVENT_NAME_LENGTH),
event_data: eventData ? JSON.stringify(eventData) : null,
rev_id: website?.revId || 0,