m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into analytics

Browse Source
This commit is contained in:
Brian Cao 2023-08-25 18:40:40 -07:00
commit 5dd3aa6c67
2 changed files with 3 additions and 3 deletions
src/queries/analytics
events
saveEvent.ts
sessions
createSession.ts

4
src/queries/analytics/events/saveEvent.ts
View File

@ -138,8 +138,8 @@ async function clickhouseQuery(data: {
session_id: sessionId,
event_id: uuid(),
country: country ? country : null,
subdivision1: country && subdivision1 ? `${country}-${subdivision1}` : null,
subdivision2: subdivision2 ? subdivision2 : null,
subdivision1: subdivision1 ?? null,
subdivision2: subdivision2 ?? null,
city: city ? city : null,
url_path: urlPath?.substring(0, URL_LENGTH),
url_query: urlQuery?.substring(0, URL_LENGTH),

2
src/queries/analytics/sessions/createSession.ts
View File

@ -30,7 +30,7 @@ export async function createSession(data: Prisma.SessionCreateInput) {
screen,
language,
country,
subdivision1: country && subdivision1 ? `${country}-${subdivision1}` : null,
subdivision1,
subdivision2,
city,
},