watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

we Merge branch 'dev' into feat/um-209-implement-reset-date

Browse source
This commit is contained in:
Francis Cao 2023-03-27 15:51:54 -07:00
commit 17c8cc07e4
11 changed files with 234 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,13 +3,16 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import kafka from 'lib/kafka';
import prisma from 'lib/prisma';
import { uuid } from 'lib/crypto';
import { saveEventData } from '../eventData/saveEventData';
import { saveEventData } from 'queries/analytics/eventData/saveEventData';
export async function saveEvent(args: {
id: string;
sessionId: string;
websiteId: string;
urlPath: string;
urlQuery?: string;
referrerPath?: string;
referrerQuery?: string;
referrerDomain?: string;
pageTitle?: string;
eventName?: string;
eventData?: any;
@ -31,7 +34,7 @@ export async function saveEvent(args: {
}
async function relationalQuery(data: {
id: string;
sessionId: string;
websiteId: string;
urlPath: string;
urlQuery?: string;
@ -39,7 +42,7 @@ async function relationalQuery(data: {
eventName?: string;
eventData?: any;
}) {
const { websiteId, id: sessionId, urlPath, urlQuery, eventName, eventData, pageTitle } = data;
const { websiteId, sessionId, urlPath, urlQuery, eventName, eventData, pageTitle } = data;
const websiteEventId = uuid();
const websiteEvent = prisma.client.websiteEvent.create({
@ -49,9 +52,9 @@ async function relationalQuery(data: {
sessionId,
urlPath: urlPath?.substring(0, URL_LENGTH),
urlQuery: urlQuery?.substring(0, URL_LENGTH),
pageTitle: pageTitle,
eventType: EVENT_TYPE.customEvent,
eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
pageTitle,
eventType: eventName ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
eventName: eventName ? eventName?.substring(0, EVENT_NAME_LENGTH) : null,
},
});
@ -70,7 +73,7 @@ async function relationalQuery(data: {
}
async function clickhouseQuery(data: {
id: string;
sessionId: string;
websiteId: string;
urlPath: string;
urlQuery?: string;
@ -90,7 +93,7 @@ async function clickhouseQuery(data: {
}) {
const {
websiteId,
id: sessionId,
sessionId,
urlPath,
urlQuery,
pageTitle,
@ -100,7 +103,6 @@ async function clickhouseQuery(data: {
subdivision1,
subdivision2,
city,
...args
} = data;
const { getDateFormat, sendMessage } = kafka;
const eventId = uuid();
@ -117,10 +119,9 @@ async function clickhouseQuery(data: {
url_path: urlPath?.substring(0, URL_LENGTH),
url_query: urlQuery?.substring(0, URL_LENGTH),
page_title: pageTitle,
event_type: EVENT_TYPE.customEvent,
event_name: eventName?.substring(0, EVENT_NAME_LENGTH),
event_type: eventName ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
event_name: eventName ? eventName?.substring(0, EVENT_NAME_LENGTH) : null,
created_at: createdAt,
...args,
};
await sendMessage(message, 'event');

1
queries/index.js
View file

@ -9,7 +9,6 @@ export * from './analytics/event/saveEvent';
export * from './analytics/pageview/getPageviewMetrics';
export * from './analytics/pageview/getPageviews';
export * from './analytics/pageview/getPageviewStats';
export * from './analytics/pageview/savePageView';
export * from './analytics/session/createSession';
export * from './analytics/session/getSession';
export * from './analytics/session/getSessionMetrics';