diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index 463461bf8..3f03a13c7 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -140,8 +140,7 @@ defmodule Plausible.Stats.Base do q = from(s in "sessions_v2", where: s.site_id == ^site.id) sessions_q = - if FunWithFlags.enabled?(:experimental_session_count, for: site) or - query.experimental_session_count? do + if query.experimental_session_count? do from s in q, where: s.timestamp >= ^first_datetime and s.start < ^last_datetime else from s in q, where: s.start >= ^first_datetime and s.start < ^last_datetime diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index 6a0e3bb35..6874aaa96 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -22,7 +22,7 @@ defmodule Plausible.Stats.Query do query = __MODULE__ |> struct!(now: now) - |> put_experimental_session_count(params) + |> put_experimental_session_count(site, params) |> put_period(site, params) |> put_interval(params) |> put_parsed_filters(params) @@ -36,11 +36,15 @@ defmodule Plausible.Stats.Query do query end - defp put_experimental_session_count(query, params) do - if Map.get(params, "experimental_session_count") == "true" do - struct!(query, experimental_session_count?: true) + defp put_experimental_session_count(query, site, params) do + if Map.has_key?(params, "experimental_session_count") do + struct!(query, + experimental_session_count?: Map.get(params, "experimental_session_count") == "true" + ) else - query + struct!(query, + experimental_session_count?: FunWithFlags.enabled?(:experimental_session_count, for: site) + ) end end