github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use uuid

Browse Source
This commit is contained in:
Brian Cao
2022-10-31 23:42:37 -07:00
parent 246e4e5f4f
commit 17041efaae
73 changed files with 491 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
queries/analytics/pageview/getPageviewMetrics.js
View File

@@ -24,7 +24,7 @@ async function relationalQuery(websiteId, { startDate, endDate, column, table, f
from ${table}
${` join website on ${table}.website_id = website.website_id`}
${joinSession}
where website.website_uuid='${websiteId}'
where website.website_id='${websiteId}'
and ${table}.created_at between $1 and $2
${pageviewQuery}
${joinSession && sessionQuery}

2
queries/analytics/pageview/getPageviewParams.js
View File

@@ -24,7 +24,7 @@ async function relationalQuery(websiteId, start_at, end_at, column, table, filte
from ${table}
${` join website on ${table}.website_id = website.website_id`}
${joinSession}
where website.website_uuid='${websiteId}'
where website.website_id='${websiteId}'
and ${table}.created_at between $1 and $2
and ${table}.url like '%?%'
${pageviewQuery}

2
queries/analytics/pageview/getPageviewStats.js
View File

@@ -37,7 +37,7 @@ async function relationalQuery(
join website
on pageview.website_id = website.website_id
${joinSession}
where website.website_uuid='${websiteId}'
where website.website_id='${websiteId}'
and pageview.created_at between $1 and $2
${pageviewQuery}
${sessionQuery}

2
queries/analytics/pageview/getPageviews.js
View File

@@ -13,7 +13,7 @@ async function relationalQuery(websites, start_at) {
return prisma.client.pageview.findMany({
where: {
website: {
websiteUuid: {
id: {
in: websites,
},
},

12
queries/analytics/pageview/savePageView.js
View File

@@ -10,9 +10,13 @@ export async function savePageView(...args) {
});
}
async function relationalQuery({ websiteId }, { session: { id: sessionId }, url, referrer }) {
async function relationalQuery(
websiteId,
{ pageViewId, session: { id: sessionId }, url, referrer },
) {
return prisma.client.pageview.create({
data: {
id: pageViewId,
websiteId,
sessionId,
url: url?.substring(0, URL_LENGTH),
@@ -22,12 +26,12 @@ async function relationalQuery({ websiteId }, { session: { id: sessionId }, url,
}
async function clickhouseQuery(
{ websiteUuid: websiteId },
{ session: { country, sessionUuid, ...sessionArgs }, url, referrer },
websiteId,
{ session: { country, id: sessionId, ...sessionArgs }, url, referrer },
) {
const { getDateFormat, sendMessage } = kafka;
const params = {
session_uuid: sessionUuid,
session_id: sessionId,
website_id: websiteId,
created_at: getDateFormat(new Date()),
url: url?.substring(0, URL_LENGTH),