From e422fc1ecd289cc50d050d026ed9efbbbb68461d Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Fri, 25 Aug 2023 18:40:02 -0700
Subject: [PATCH] Just use subdivision-1.

---
 src/queries/analytics/events/saveEvent.ts       | 4 ++--
 src/queries/analytics/sessions/createSession.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index 51087a59..59bacd99 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 4fd36d2e..65dbd794 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,
       },