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.

Just use subdivision-1.

Brian Caoe422fc1ecd28
diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index 51087a59d..59bacd99b 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -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),
diff --git a/src/queries/analytics/sessions/createSession.ts b/src/queries/analytics/sessions/createSession.ts
index 4fd36d2e0..65dbd7948 100644
--- a/src/queries/analytics/sessions/createSession.ts
+++ b/src/queries/analytics/sessions/createSession.ts
@@ -30,7 +30,7 @@ export async function createSession(data: Prisma.SessionCreateInput) {
screen,
language,
country,
- subdivision1: country && subdivision1 ? `${country}-${subdivision1}` : null,
+ subdivision1,
subdivision2,
city,
},