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.

concatenate subdivision saves

Francis Cao9dd9ab1325ff
diff --git a/queries/analytics/event/saveEvent.ts b/queries/analytics/event/saveEvent.ts
index 332b349c6..2dcb88495 100644
--- a/queries/analytics/event/saveEvent.ts
+++ b/queries/analytics/event/saveEvent.ts
@@ -137,7 +137,7 @@ async function clickhouseQuery(data: {
session_id: sessionId,
event_id: eventId,
country: country ? country : null,
- subdivision1: subdivision1 ? subdivision1 : null,
+ subdivision1: subdivision1 ? country.concat('-', subdivision1) : null,
subdivision2: subdivision2 ? subdivision2 : null,
city: city ? city : null,
url_path: urlPath?.substring(0, URL_LENGTH),
diff --git a/queries/analytics/session/createSession.ts b/queries/analytics/session/createSession.ts
index d2657d60d..7286cb970 100644
--- a/queries/analytics/session/createSession.ts
+++ b/queries/analytics/session/createSession.ts
@@ -18,7 +18,37 @@ export async function createSession(args: Prisma.SessionCreateInput) {
}
async function relationalQuery(data: Prisma.SessionCreateInput) {
- return prisma.client.session.create({ data });
+ const {
+ id,
+ websiteId,
+ hostname,
+ browser,
+ os,
+ device,
+ screen,
+ language,
+ country,
+ subdivision1,
+ subdivision2,
+ city,
+ } = data;
+
+ return prisma.client.session.create({
+ data: {
+ id,
+ websiteId,
+ hostname,
+ browser,
+ os,
+ device,
+ screen,
+ language,
+ country,
+ subdivision1: country.concat('-', subdivision1),
+ subdivision2,
+ city,
+ },
+ });
}
async function clickhouseQuery(data: {