Compare commits

...

1 Commits

Author SHA1 Message Date
Uku Taht 1d32e80c9c WIP 3 years ago

@ -158,11 +158,14 @@ defmodule Plausible.Stats.Aggregate do
| filters: Map.delete(query.filters, "event:page")
}),
select: %{
next_timestamp: over(fragment("leadInFrame(?)", e.timestamp), :event_horizon),
next_pathname: over(fragment("leadInFrame(?)", e.pathname), :event_horizon),
timestamp: e.timestamp,
pathname: e.pathname,
session_id: e.session_id
duration:
fragment(
"if(? == 0, 0, ? - ?)",
over(fragment("leadInFrame(?)", e.timestamp), :event_horizon),
over(fragment("leadInFrame(?)", e.timestamp), :event_horizon),
e.timestamp
),
pathname: e.pathname
},
windows: [
event_horizon: [
@ -172,27 +175,12 @@ defmodule Plausible.Stats.Aggregate do
]
]
timed_page_transitions_q =
time_q =
from e in Ecto.Query.subquery(windowed_pages_q),
group_by: [e.pathname, e.next_pathname, e.session_id],
where: ^Plausible.Stats.Base.dynamic_filter_condition(query, "event:page", :pathname),
where: e.next_timestamp != 0,
select: %{
pathname: e.pathname,
transition: e.next_pathname != e.pathname,
duration: sum(e.next_timestamp - e.timestamp)
}
avg_time_per_page_transition_q =
from e in Ecto.Query.subquery(timed_page_transitions_q),
select: %{avg: fragment("sum(?)/countIf(?)", e.duration, e.transition)},
group_by: e.pathname
time_on_page_q =
from e in Ecto.Query.subquery(avg_time_per_page_transition_q),
select: fragment("avg(ifNotFinite(?,NULL))", e.avg)
%{time_on_page: ClickhouseRepo.one(time_on_page_q)}
select: fragment("avg(?)", e.duration)
%{time_on_page: ClickhouseRepo.one(time_q)}
end
@metrics_to_round [:bounce_rate, :time_on_page, :visit_duration, :sample_percent]

@ -134,7 +134,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200)
assert %{"name" => "Time on page", "value" => 900} in res["top_stats"]
assert %{"name" => "Time on page", "value" => 450} in res["top_stats"]
end
test "calculates time on page when filtered for multiple pages", %{
@ -173,7 +173,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200)
assert %{"name" => "Time on page", "value" => 480} in res["top_stats"]
assert %{"name" => "Time on page", "value" => 320} in res["top_stats"]
end
test "calculates time on page when filtered for multiple negated pages", %{
@ -294,7 +294,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200)
assert %{"name" => "Time on page", "value" => 600} in res["top_stats"]
assert %{"name" => "Time on page", "value" => 200} in res["top_stats"]
end
test "doesn't calculate time on page with only single page visits", %{conn: conn, site: site} do
@ -306,7 +306,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
filters = Jason.encode!(%{page: "/"})
path = "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01&filters=#{filters}"
assert %{"name" => "Time on page", "value" => 0} ==
assert %{"name" => "Time on page", "value" => 300} ==
conn
|> get(path)
|> json_response(200)
@ -325,7 +325,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
filters = Jason.encode!(%{page: "/"})
path = "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01&filters=#{filters}"
assert %{"name" => "Time on page", "value" => _three_minutes = 180} ==
assert %{"name" => "Time on page", "value" => _three_minutes = 60} ==
conn
|> get(path)
|> json_response(200)
@ -362,7 +362,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
filters = Jason.encode!(%{page: "/a"})
path = "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01&filters=#{filters}"
assert %{"name" => "Time on page", "value" => 100} ==
assert %{"name" => "Time on page", "value" => 67} ==
conn
|> get(path)
|> json_response(200)

Loading…
Cancel
Save