Compare commits

...

2 Commits

Author SHA1 Message Date
Uku Taht 3598f48618 Fixup 4 years ago
Uku Taht e82ab49e99 WIP 4 years ago

@ -322,12 +322,16 @@ defmodule Plausible.Stats.Base do
end end
def select_session_metrics(q, [:pageviews | rest], query) do def select_session_metrics(q, [:pageviews | rest], query) do
from(s in q, if has_named_binding?(q, :events) do
select_merge: %{ from([s, events: e] in q, select_merge: %{pageviews: field(e, :pageviews)})
pageviews: else
fragment("toUInt64(round(sum(? * ?) * any(_sample_factor)))", s.sign, s.pageviews) from(s in q,
} select_merge: %{
) pageviews:
fragment("toUInt64(round(sum(? * ?) * any(_sample_factor)))", s.sign, s.pageviews)
}
)
end
|> select_session_metrics(rest, query) |> select_session_metrics(rest, query)
end end
@ -424,14 +428,18 @@ defmodule Plausible.Stats.Base do
if Query.has_event_filters?(query) do if Query.has_event_filters?(query) do
converted_sessions = converted_sessions =
from(e in query_events(site, query), from(e in query_events(site, query),
group_by: [e.session_id, field(e, :_sample_factor)],
select: %{ select: %{
session_id: fragment("DISTINCT ?", e.session_id), session_id: e.session_id,
_sample_factor: fragment("_sample_factor") _sample_factor: fragment("_sample_factor"),
events: count(),
pageviews: fragment("countIf(? = ?)", e.name, "pageview")
} }
) )
from(s in db_query, from(s in db_query,
join: cs in subquery(converted_sessions), join: cs in subquery(converted_sessions),
as: :events,
on: s.session_id == cs.session_id on: s.session_id == cs.session_id
) )
else else

@ -192,6 +192,7 @@ defmodule Plausible.Stats.Breakdown do
|> select_session_metrics(metrics, query) |> select_session_metrics(metrics, query)
|> merge_imported(site, query, property, metrics) |> merge_imported(site, query, property, metrics)
|> apply_pagination(pagination) |> apply_pagination(pagination)
|> tap(fn q -> IO.inspect(Ecto.Adapters.SQL.to_sql(:all, ClickhouseRepo, q)) end)
|> ClickhouseRepo.all() |> ClickhouseRepo.all()
|> transform_keys(%{operating_system: :os}) |> transform_keys(%{operating_system: :os})
|> remove_internal_visits_metric(metrics) |> remove_internal_visits_metric(metrics)

@ -1942,5 +1942,40 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do
] ]
} }
end end
test "page filter, breakdown by visit:source, metric=pageviews", %{conn: conn, site: site} do
populate_stats(site, [
build(:pageview,
user_id: 1,
pathname: "/page1",
timestamp: ~N[2021-01-01 00:00:00]
),
build(:pageview,
user_id: 1,
pathname: "/page2",
timestamp: ~N[2021-01-01 00:10:00]
),
build(:pageview, user_id: 1, pathname: "/page1", timestamp: ~N[2021-01-01 00:25:00])
])
conn =
get(conn, "/api/v1/stats/breakdown", %{
"site_id" => site.domain,
"period" => "day",
"date" => "2021-01-01",
"property" => "visit:source",
"metrics" => "pageviews",
"filters" => "event:page==/page1"
})
assert json_response(conn, 200) == %{
"results" => [
%{
"source" => "Direct / None",
"pageviews" => 2
}
]
}
end
end end
end end

Loading…
Cancel
Save