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.

update pageview, event save

Francis Cao7596f425455d
diff --git a/queries/analytics/event/saveEvent.ts b/queries/analytics/event/saveEvent.ts
index 60f5348f8..73ecee27d 100644
--- a/queries/analytics/event/saveEvent.ts
+++ b/queries/analytics/event/saveEvent.ts
@@ -8,8 +8,8 @@ import cache from 'lib/cache';
export async function saveEvent(args: {
id: string;
websiteId: string;
- url: string;
- referrer?: string;
+ urlPath: string;
+ urlQuery?: string;
pageTitle?: string;
eventName?: string;
hostname?: string;
@@ -32,20 +32,20 @@ export async function saveEvent(args: {
async function relationalQuery(data: {
id: string;
websiteId: string;
- url: string;
- referrer?: string;
+ urlPath: string;
+ urlQuery?: string;
pageTitle?: string;
eventName?: string;
}) {
- const { websiteId, id: sessionId, url, eventName, referrer, pageTitle } = data;
+ const { websiteId, id: sessionId, urlPath, urlQuery, eventName, pageTitle } = data;
return prisma.client.websiteEvent.create({
data: {
id: uuid(),
websiteId,
sessionId,
- url: url?.substring(0, URL_LENGTH),
- referrer: referrer?.substring(0, URL_LENGTH),
+ 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),
@@ -56,8 +56,8 @@ async function relationalQuery(data: {
async function clickhouseQuery(data: {
id: string;
websiteId: string;
- url: string;
- referrer?: string;
+ urlPath: string;
+ urlQuery?: string;
pageTitle?: string;
eventName?: string;
hostname?: string;
@@ -74,7 +74,8 @@ async function clickhouseQuery(data: {
const {
websiteId,
id: sessionId,
- url,
+ urlPath,
+ urlQuery,
pageTitle,
eventName,
country,
@@ -94,7 +95,8 @@ async function clickhouseQuery(data: {
subdivision1: subdivision1 ? subdivision1 : null,
subdivision2: subdivision2 ? subdivision2 : null,
city: city ? city : null,
- url: url?.substring(0, URL_LENGTH),
+ urlPath: urlPath?.substring(0, URL_LENGTH),
+ urlQuery: urlQuery?.substring(0, URL_LENGTH),
page_title: pageTitle,
event_type: EVENT_TYPE.customEvent,
event_name: eventName?.substring(0, EVENT_NAME_LENGTH),
diff --git a/queries/analytics/pageview/savePageView.ts b/queries/analytics/pageview/savePageView.ts
index 24f45b5ed..9a2a9c9ec 100644
--- a/queries/analytics/pageview/savePageView.ts
+++ b/queries/analytics/pageview/savePageView.ts
@@ -8,8 +8,11 @@ import { uuid } from 'lib/crypto';
export async function savePageView(args: {
id: string;
websiteId: string;
- url: string;
- referrer?: string;
+ urlPath: string;
+ urlQuery?: string;
+ referrerPath?: string;
+ referrerQuery?: string;
+ referrerDomain?: string;
pageTitle?: string;
hostname?: string;
browser?: string;
@@ -31,19 +34,34 @@ export async function savePageView(args: {
async function relationalQuery(data: {
id: string;
websiteId: string;
- url: string;
- referrer?: string;
+ urlPath: string;
+ urlQuery?: string;
+ referrerPath?: string;
+ referrerQuery?: string;
+ referrerDomain?: string;
pageTitle?: string;
}) {
- const { websiteId, id: sessionId, url, referrer, pageTitle } = data;
+ const {
+ websiteId,
+ id: sessionId,
+ urlPath,
+ urlQuery,
+ referrerPath,
+ referrerQuery,
+ referrerDomain,
+ pageTitle,
+ } = data;
return prisma.client.websiteEvent.create({
data: {
id: uuid(),
websiteId,
sessionId,
- url: url?.substring(0, URL_LENGTH),
- referrer: referrer?.substring(0, URL_LENGTH),
+ urlPath: urlPath?.substring(0, URL_LENGTH),
+ urlQuery: urlQuery?.substring(0, URL_LENGTH),
+ referrerPath: referrerPath?.substring(0, URL_LENGTH),
+ referrerQuery: referrerQuery?.substring(0, URL_LENGTH),
+ referrerDomain: referrerDomain?.substring(0, URL_LENGTH),
pageTitle: pageTitle,
eventType: EVENT_TYPE.pageView,
},
@@ -53,8 +71,11 @@ async function relationalQuery(data: {
async function clickhouseQuery(data: {
id: string;
websiteId: string;
- url: string;
- referrer?: string;
+ urlPath: string;
+ urlQuery?: string;
+ referrerPath?: string;
+ referrerQuery?: string;
+ referrerDomain?: string;
pageTitle?: string;
hostname?: string;
browser?: string;
@@ -70,8 +91,11 @@ async function clickhouseQuery(data: {
const {
websiteId,
id: sessionId,
- url,
- referrer,
+ urlPath,
+ urlQuery,
+ referrerPath,
+ referrerQuery,
+ referrerDomain,
pageTitle,
country,
subdivision1,
@@ -90,8 +114,11 @@ async function clickhouseQuery(data: {
subdivision1: subdivision1 ? subdivision1 : null,
subdivision2: subdivision2 ? subdivision2 : null,
city: city ? city : null,
- url: url?.substring(0, URL_LENGTH),
- referrer: referrer?.substring(0, URL_LENGTH),
+ urlPath: urlPath?.substring(0, URL_LENGTH),
+ urlQuery: urlQuery?.substring(0, URL_LENGTH),
+ referrerPath: referrerPath?.substring(0, URL_LENGTH),
+ referrerQuery: referrerQuery?.substring(0, URL_LENGTH),
+ referrerDomain: referrerDomain?.substring(0, URL_LENGTH),
page_title: pageTitle,
event_type: EVENT_TYPE.pageView,
created_at: getDateFormat(new Date()),