Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Update session stats from event

Uku Taht52067803df91
diff --git a/lib/plausible/session/store.ex b/lib/plausible/session/store.ex
index 64afc08f8b..b515290e65 100644
--- a/lib/plausible/session/store.ex
+++ b/lib/plausible/session/store.ex
@@ -91,6 +91,39 @@ defmodule Plausible.Session.Store do
duration: Timex.diff(event.timestamp, session.start, :second) |> abs,
pageviews:
if(event.name == "pageview", do: session.pageviews + 1, else: session.pageviews),
+ country_code:
+ if(session.country_code == "", do: event.country_code, else: session.country_code),
+ subdivision1_code:
+ if(session.subdivision1_code == "",
+ do: event.subdivision1_code,
+ else: session.subdivision1_code
+ ),
+ subdivision2_code:
+ if(session.subdivision2_code == "",
+ do: event.subdivision2_code,
+ else: session.subdivision2_code
+ ),
+ city_geoname_id:
+ if(session.city_geoname_id == 0,
+ do: event.city_geoname_id,
+ else: session.city_geoname_id
+ ),
+ operating_system:
+ if(session.operating_system == "",
+ do: event.operating_system,
+ else: session.operating_system
+ ),
+ operating_system_version:
+ if(session.operating_system_version == "",
+ do: event.operating_system_version,
+ else: session.operating_system_version
+ ),
+ browser: if(session.browser == "", do: event.browser, else: session.browser),
+ browser_version:
+ if(session.browser_version == "",
+ do: event.browser_version,
+ else: session.browser_version
+ ),
screen_size:
if(session.screen_size == "", do: event.screen_size, else: session.screen_size),
events: session.events + 1
diff --git a/test/plausible/session/store_test.exs b/test/plausible/session/store_test.exs
index b310bdc802..fce9a7ca31 100644
--- a/test/plausible/session/store_test.exs
+++ b/test/plausible/session/store_test.exs
@@ -71,7 +71,15 @@ defmodule Plausible.Session.StoreTest do
user_id: event1.user_id,
name: "pageview",
timestamp: timestamp,
- screen_size: "Desktop"
+ country_code: "US",
+ subdivision1_code: "SUB1",
+ subdivision2_code: "SUB2",
+ city_geoname_id: 12312,
+ screen_size: "Desktop",
+ operating_system: "Mac",
+ operating_system_version: "11",
+ browser: "Firefox",
+ browser_version: "10"
)
Store.on_event(event1, nil, store)
@@ -81,6 +89,14 @@ defmodule Plausible.Session.StoreTest do
assert session.duration == 10
assert session.pageviews == 2
assert session.events == 2
+ assert session.country_code == "US"
+ assert session.subdivision1_code == "SUB1"
+ assert session.subdivision2_code == "SUB2"
+ assert session.city_geoname_id == 12312
+ assert session.operating_system == "Mac"
+ assert session.operating_system_version == "11"
+ assert session.browser == "Firefox"
+ assert session.browser_version == "10"
assert session.screen_size == "Desktop"
end