From 94a20fb0a20373edca83f5b4e2b904232877c356 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 15 Jan 2020 11:00:42 +0200 Subject: [PATCH] Add exit page to sessions (#25) --- lib/plausible/ingest/session.ex | 34 ++++++++++--------- lib/plausible/session/schema.ex | 3 +- ...0200113143927_add_exit_page_to_session.exs | 9 +++++ test/plausible/ingest/session_test.exs | 11 ++++++ 4 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 priv/repo/migrations/20200113143927_add_exit_page_to_session.exs diff --git a/lib/plausible/ingest/session.ex b/lib/plausible/ingest/session.ex index 6b46c63cf..cbc9dbb64 100644 --- a/lib/plausible/ingest/session.ex +++ b/lib/plausible/ingest/session.ex @@ -24,13 +24,13 @@ defmodule Plausible.Ingest.Session do def init(event) do timer = Process.send_after(self(), :finalize, @session_timeout) - {:ok, %{first_event: event, timer: timer, is_bounce: true, last_unload: nil}} + {:ok, %{first_event: event, last_event: event, timer: timer, is_bounce: true, last_unload: nil}} end - def handle_cast({:on_event, _event}, state) do + def handle_cast({:on_event, event}, state) do Process.cancel_timer(state[:timer]) new_timer = Process.send_after(self(), :finalize, @session_timeout) - {:noreply, %{state | timer: new_timer, is_bounce: false, last_unload: nil}} + {:noreply, %{state | timer: new_timer, last_event: event, is_bounce: false, last_unload: nil}} end def handle_cast({:on_unload, timestamp}, state) do @@ -38,26 +38,28 @@ defmodule Plausible.Ingest.Session do end def handle_info(:finalize, state) do - event = state[:first_event] + first_event = state[:first_event] + last_event = state[:last_event] - if !is_potential_leftover?(event) do + if !is_potential_leftover?(first_event) do length = if state[:last_unload] do - Timex.diff(state[:last_unload], event.timestamp, :seconds) + Timex.diff(state[:last_unload], first_event.timestamp, :seconds) end Plausible.Session.changeset(%Plausible.Session{}, %{ - hostname: event.hostname, - user_id: event.user_id, - new_visitor: event.new_visitor, - entry_page: event.pathname, + hostname: first_event.hostname, + user_id: first_event.user_id, + new_visitor: first_event.new_visitor, + entry_page: first_event.pathname, + exit_page: last_event.pathname, is_bounce: state[:is_bounce], length: length, - referrer: event.referrer, - referrer_source: event.referrer_source, - country_code: event.country_code, - operating_system: event.operating_system, - browser: event.browser, - start: event.timestamp + referrer: first_event.referrer, + referrer_source: first_event.referrer_source, + country_code: first_event.country_code, + operating_system: first_event.operating_system, + browser: first_event.browser, + start: first_event.timestamp }) |> Repo.insert! end diff --git a/lib/plausible/session/schema.ex b/lib/plausible/session/schema.ex index 7f1f54102..ce2d108f2 100644 --- a/lib/plausible/session/schema.ex +++ b/lib/plausible/session/schema.ex @@ -11,6 +11,7 @@ defmodule Plausible.Session do field :length, :integer field :is_bounce, :boolean field :entry_page, :string + field :exit_page, :string field :referrer, :string field :referrer_source, :string @@ -24,7 +25,7 @@ defmodule Plausible.Session do def changeset(session, attrs) do session - |> cast(attrs, [:hostname, :entry_page, :referrer, :new_visitor, :user_id, :start, :length, :is_bounce, :operating_system, :browser, :referrer_source, :country_code, :screen_size]) + |> cast(attrs, [:hostname, :entry_page, :exit_page, :referrer, :new_visitor, :user_id, :start, :length, :is_bounce, :operating_system, :browser, :referrer_source, :country_code, :screen_size]) |> validate_required([:hostname, :new_visitor, :user_id, :is_bounce, :start]) end end diff --git a/priv/repo/migrations/20200113143927_add_exit_page_to_session.exs b/priv/repo/migrations/20200113143927_add_exit_page_to_session.exs new file mode 100644 index 000000000..fae3a9c3f --- /dev/null +++ b/priv/repo/migrations/20200113143927_add_exit_page_to_session.exs @@ -0,0 +1,9 @@ +defmodule Plausible.Repo.Migrations.AddExitPageToSession do + use Ecto.Migration + + def change do + alter table(:sessions) do + add :exit_page, :text + end + end +end diff --git a/test/plausible/ingest/session_test.exs b/test/plausible/ingest/session_test.exs index c8f155c94..e8c3de777 100644 --- a/test/plausible/ingest/session_test.exs +++ b/test/plausible/ingest/session_test.exs @@ -53,6 +53,17 @@ defmodule Plausible.Ingest.SessionTest do session = capture_session(pageview.user_id) refute session.is_bounce end + + test "captures the exit page" do + pageview = insert(:pageview) + pageview2 = insert(:pageview, user_id: pageview.user_id, pathname: "/exit") + + Ingest.Session.on_event(pageview) + Ingest.Session.on_event(pageview2) + + session = capture_session(pageview.user_id) + assert session.exit_page == "/exit" + end end describe "on_unload/1" do