diff --git a/lib/plausible/ingest/session.ex b/lib/plausible/ingest/session.ex index 15806442a..ec982d504 100644 --- a/lib/plausible/ingest/session.ex +++ b/lib/plausible/ingest/session.ex @@ -55,7 +55,8 @@ defmodule Plausible.Ingest.Session do referrer_source: event.referrer_source, country_code: event.country_code, operating_system: event.operating_system, - browser: event.browser + browser: event.browser, + start: event.timestamp }) |> Repo.insert! end diff --git a/lib/plausible/session/schema.ex b/lib/plausible/session/schema.ex index 5f76ef2bb..33a0a5d7b 100644 --- a/lib/plausible/session/schema.ex +++ b/lib/plausible/session/schema.ex @@ -7,6 +7,7 @@ defmodule Plausible.Session do field :new_visitor, :boolean field :user_id, :binary_id + field :start, :naive_datetime, null: false field :length, :integer field :is_bounce, :boolean @@ -22,7 +23,7 @@ defmodule Plausible.Session do def changeset(session, attrs) do session - |> cast(attrs, [:hostname, :referrer, :new_visitor, :user_id, :length, :is_bounce, :operating_system, :browser, :referrer_source, :country_code, :screen_size]) - |> validate_required([:hostname, :new_visitor, :user_id, :is_bounce]) + |> cast(attrs, [:hostname, :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/20191220042658_add_session_start.exs b/priv/repo/migrations/20191220042658_add_session_start.exs new file mode 100644 index 000000000..be65ec6a4 --- /dev/null +++ b/priv/repo/migrations/20191220042658_add_session_start.exs @@ -0,0 +1,15 @@ +defmodule Plausible.Repo.Migrations.AddSessionStart do + use Ecto.Migration + + def change do + alter table(:sessions) do + add :start, :naive_datetime + end + + execute "UPDATE sessions set start = timestamp" + + alter table(:sessions) do + modify :start, :naive_datetime, null: false + end + end +end diff --git a/test/plausible/ingest/session_test.exs b/test/plausible/ingest/session_test.exs index 2e7ca79d1..c8f155c94 100644 --- a/test/plausible/ingest/session_test.exs +++ b/test/plausible/ingest/session_test.exs @@ -31,6 +31,7 @@ defmodule Plausible.Ingest.SessionTest do assert session.user_id == pageview.user_id assert session.new_visitor == pageview.new_visitor + assert session.start == pageview.timestamp end test "inserts bounced session when timeout fires after one pageview" do