diff --git a/lib/plausible/session/cache_store.ex b/lib/plausible/session/cache_store.ex index 81591e55c..9747e660d 100644 --- a/lib/plausible/session/cache_store.ex +++ b/lib/plausible/session/cache_store.ex @@ -47,8 +47,15 @@ defmodule Plausible.Session.CacheStore do do: event.pathname, else: session.entry_page ), + hostname: + if(event.name == "pageview" and session.hostname != event.hostname, + do: event.hostname, + else: session.hostname + ) + |> IO.inspect(label: "updated_hostname_for user #{event.user_id}"), exit_page: if(event.name == "pageview", do: event.pathname, else: session.exit_page), - exit_page_hostname: if(event.name == "pageview", do: event.hostname, else: ""), + exit_page_hostname: + if(event.name == "pageview", do: event.hostname, else: session.exit_page_hostname), is_bounce: false, duration: Timex.diff(event.timestamp, session.start, :second) |> abs, pageviews: @@ -61,7 +68,9 @@ defmodule Plausible.Session.CacheStore do %Plausible.ClickhouseSessionV2{ sign: 1, session_id: Plausible.ClickhouseSessionV2.random_uint64(), - hostname: if(event.name == "pageview", do: event.hostname, else: ""), + hostname: + if(event.name == "pageview", do: event.hostname, else: "") + |> IO.inspect(label: "new hostname_for user #{event.user_id}"), site_id: event.site_id, user_id: event.user_id, entry_page: if(event.name == "pageview", do: event.pathname, else: ""), diff --git a/lib/plausible/stats/aggregate.ex b/lib/plausible/stats/aggregate.ex index 68b96183a..4a146ba4e 100644 --- a/lib/plausible/stats/aggregate.ex +++ b/lib/plausible/stats/aggregate.ex @@ -19,6 +19,8 @@ defmodule Plausible.Stats.Aggregate do @session_metrics [:visits, :bounce_rate, :visit_duration, :views_per_visit, :sample_percent] def aggregate(site, query, metrics) do + IO.inspect(metrics, label: :metrics) + {currency, metrics} = on_full_build do Plausible.Stats.Goal.Revenue.get_revenue_tracking_currency(site, query, metrics) @@ -35,7 +37,10 @@ defmodule Plausible.Stats.Aggregate do event_task = fn -> aggregate_events(site, query, event_metrics) end - session_metrics = Enum.filter(metrics, &(&1 in @session_metrics)) + session_metrics = + Enum.filter(metrics, &(&1 in @session_metrics)) + |> IO.inspect(label: :session_metrics) + session_task = fn -> aggregate_sessions(site, query, session_metrics) end time_on_page_task = @@ -58,6 +63,7 @@ defmodule Plausible.Stats.Aggregate do defp aggregate_events(site, query, metrics) do from(e in base_event_query(site, query), select: ^select_event_metrics(metrics)) + |> IO.inspect(label: :agg_query) |> merge_imported(site, query, :aggregate, metrics) |> maybe_add_conversion_rate(site, query, metrics, include_imported: query.include_imported) |> ClickhouseRepo.one() diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index 463461bf8..441faa30e 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -50,6 +50,8 @@ defmodule Plausible.Stats.Base do q = from(e in q, where: ^dynamic_filter_condition(query, "event:page", :pathname)) + q = from(e in q, where: ^dynamic_filter_condition(query, "event:hostname", :hostname)) + q = case query.filters["event:name"] do {:is, name} -> diff --git a/lib/plausible/stats/filters/dashboard_filter_parser.ex b/lib/plausible/stats/filters/dashboard_filter_parser.ex index 041fa836e..c5dd230ca 100644 --- a/lib/plausible/stats/filters/dashboard_filter_parser.ex +++ b/lib/plausible/stats/filters/dashboard_filter_parser.ex @@ -11,6 +11,11 @@ defmodule Plausible.Stats.Filters.DashboardFilterParser do def parse_and_prefix(filters_map) do Enum.reduce(filters_map, %{}, fn {name, val}, new_filters -> cond do + name in Filters.event_props() and name in Filters.visit_props() -> + new_filters + |> Map.put("event:" <> name, filter_value(name, val)) + |> Map.put("visit:" <> name, filter_value(name, val)) + name in Filters.visit_props() -> Map.put(new_filters, "visit:" <> name, filter_value(name, val)) @@ -31,7 +36,7 @@ defmodule Plausible.Stats.Filters.DashboardFilterParser do {is_negated, val} = parse_negated_prefix(val) {is_contains, val} = parse_contains_prefix(val) is_list = list_expression?(val) - is_wildcard = String.contains?(key, ["page", "goal"]) && wildcard_expression?(val) + is_wildcard = String.contains?(key, ["page", "goal", "hostname"]) && wildcard_expression?(val) val = if is_list, do: parse_member_list(val), else: remove_escape_chars(val) val = if key == "goal", do: wrap_goal_value(val), else: val diff --git a/lib/plausible/stats/filters/filters.ex b/lib/plausible/stats/filters/filters.ex index b1364c667..e0ac6977a 100644 --- a/lib/plausible/stats/filters/filters.ex +++ b/lib/plausible/stats/filters/filters.ex @@ -23,15 +23,16 @@ defmodule Plausible.Stats.Filters do :region, :city, :entry_page, - :exit_page, - :hostname + :exit_page ] def visit_props(), do: @visit_props |> Enum.map(&to_string/1) - @event_props [:name, :page, :goal] + @event_props [:name, :page, :goal, :hostname] def event_props(), do: @event_props |> Enum.map(&to_string/1) + # def visit_props_exclusive(), do: (@visit_props -- @event_props) |> Enum.map(&to_string/1) + @doc """ Parses different filter formats. diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index ec38d5509..6af57aca8 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -28,7 +28,6 @@ defmodule Plausible.Stats.Query do |> put_parsed_filters(params) |> put_imported_opts(site, params) |> maybe_drop_prop_filter(site) - |> IO.inspect(label: :query) on_full_build do query = Plausible.Stats.Sampling.put_threshold(query, params) diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 6b9798d10..9207aadc6 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -382,7 +382,10 @@ defmodule PlausibleWeb.Api.StatsController do ] end - current_results = Stats.aggregate(site, query, metrics) + current_results = + Stats.aggregate(site, query, metrics) + |> IO.inspect(label: :current) + prev_results = comparison_query && Stats.aggregate(site, comparison_query, metrics) stats = diff --git a/test/plausible/stats/dashboard_filter_parser_test.exs b/test/plausible/stats/dashboard_filter_parser_test.exs index ad5a5d657..d3daf7910 100644 --- a/test/plausible/stats/dashboard_filter_parser_test.exs +++ b/test/plausible/stats/dashboard_filter_parser_test.exs @@ -67,6 +67,9 @@ defmodule Plausible.Stats.DashboardFilterParserTest do %{"props" => %{"cta" => "Top"}} |> assert_parsed(%{"event:props:cta" => {:is, "Top"}}) + + %{"hostname" => "dummy.site"} + |> assert_parsed(%{"visit:hostname" => {:is, "dummy.site"}}) end end diff --git a/test/plausible_web/controllers/api/stats_controller/pages_test.exs b/test/plausible_web/controllers/api/stats_controller/pages_test.exs index 5a7a0bd38..6a84c715f 100644 --- a/test/plausible_web/controllers/api/stats_controller/pages_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/pages_test.exs @@ -25,6 +25,37 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do ] end + test "returns top pages by visitors by hostname", %{conn: conn1, site: site} do + populate_stats(site, [ + build(:pageview, pathname: "/", hostname: "a.example.com"), + build(:pageview, pathname: "/", hostname: "b.example.com"), + build(:pageview, pathname: "/", hostname: "d.example.com"), + build(:pageview, pathname: "/landing", hostname: "x.example.com", user_id: 123), + build(:pageview, pathname: "/register", hostname: "d.example.com", user_id: 123), + build(:pageview, pathname: "/register", hostname: "d.example.com", user_id: 123), + build(:pageview, pathname: "/register", hostname: "d.example.com"), + build(:pageview, pathname: "/contact", hostname: "e.example.com") + ]) + + filters = Jason.encode!(%{"hostname" => "*.example.com"}) + conn = get(conn1, "/api/stats/#{site.domain}/pages?period=day&filters=#{filters}") + + assert json_response(conn, 200) == [ + %{"visitors" => 3, "name" => "/"}, + %{"visitors" => 2, "name" => "/register"}, + %{"visitors" => 1, "name" => "/contact"}, + %{"visitors" => 1, "name" => "/landing"} + ] + + filters = Jason.encode!(%{"hostname" => "d.example.com"}) + conn = get(conn1, "/api/stats/#{site.domain}/pages?period=day&filters=#{filters}") + + assert json_response(conn, 200) == [ + %{"visitors" => 2, "name" => "/register"}, + %{"visitors" => 1, "name" => "/"} + ] + end + test "returns top pages with :is filter on custom pageview props", %{conn: conn, site: site} do populate_stats(site, [ build(:pageview, diff --git a/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs b/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs index 3acaee674..41e4d8712 100644 --- a/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs @@ -236,6 +236,39 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do assert json_response(conn, 200) == [] end + test "returns suggestions for hostnames", %{conn: conn1, user: user} do + {:ok, [site: site]} = create_new_site(%{user: user}) + + populate_stats(site, [ + build(:pageview, + pathname: "/", + hostname: "host-alice.example.com" + ), + build(:pageview, + pathname: "/some-other-page", + hostname: "host-bob.example.com" + ) + ]) + + conn = + get( + conn1, + "/api/stats/#{site.domain}/suggestions/hostname?q=alice" + ) + + assert json_response(conn, 200) == [%{"value" => "host-alice.example.com", "label" => "host-alice.example.com"}] + + conn = + get( + conn1, + "/api/stats/#{site.domain}/suggestions/hostname?q=host" + ) + + assert json_response(conn, 200) == + [%{"label" => "host-alice.example.com", "value" => "host-alice.example.com"}, %{"label" => "host-bob.example.com", "value" => "host-bob.example.com"}] + + end + test "returns suggestions for referrers", %{conn: conn, site: site} do populate_stats(site, [ build(:pageview, diff --git a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs index 6ef32c322..d4964d5c8 100644 --- a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs @@ -642,6 +642,33 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"] end + test "returns only visitors with specific screen size for a given hostname", %{ + conn: conn, + site: site + } do + populate_stats(site, [ + build(:pageview, screen_size: "Desktop", hostname: "blog.example.com"), + build(:pageview, screen_size: "Desktop", hostname: "example.com", user_id: @user_id), + build(:pageview, screen_size: "Desktop", hostname: "blog.example.com", user_id: @user_id), + build(:pageview, screen_size: "Mobile") + ]) + + filters = Jason.encode!(%{screen: "Desktop", hostname: "blog.example.com"}) + + conn = + get( + conn, + "/api/stats/#{site.domain}/top-stats?period=month&filters=#{filters}" + ) + + res = + json_response(conn, 200) + |> IO.inspect(label: :huh) + + assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"] + assert %{"name" => "Total visits", "value" => 2} in res["top_stats"] + end + test "returns only visitors with specific browser", %{conn: conn, site: site} do populate_stats(site, [ build(:pageview, browser: "Chrome"), @@ -738,6 +765,82 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do _ -> false end) end + + test "hostname exact filter", %{conn: conn, site: site} do + populate_stats(site, [ + build(:pageview, pathname: "/index", hostname: "example.com"), + build(:pageview, pathname: "/index", hostname: "example.com", user_id: @user_id), + build(:pageview, pathname: "/blog/post1", hostname: "blog.example.com", user_id: @user_id), + build(:pageview, pathname: "/blog/post2", hostname: "blog.example.com") + ]) + + filters = Jason.encode!(%{hostname: "example.com"}) + + conn = + get( + conn, + "/api/stats/#{site.domain}/top-stats?period=month&filters=#{filters}" + ) + + res = json_response(conn, 200) + + assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"] + assert %{"name" => "Total pageviews", "value" => 2} in res["top_stats"] + end + + test "hostname glob filter", %{conn: conn, site: site} do + populate_stats(site, [ + build(:pageview, pathname: "/index", hostname: "example.com"), + build(:pageview, pathname: "/index", hostname: "example.com", user_id: @user_id), + build(:pageview, pathname: "/blog/post1", hostname: "blog.example.com", user_id: @user_id), + build(:pageview, pathname: "/blog/post2", hostname: "blog.example.com", user_id: @user_id), + build(:pageview, pathname: "/blog/post2", hostname: "blog.example.com"), + build(:pageview, pathname: "/blog/post2", hostname: "about.example.com") + ]) + + filters = Jason.encode!(%{hostname: "*example.com"}) + + conn = + get( + conn, + "/api/stats/#{site.domain}/top-stats?period=month&filters=#{filters}" + ) + + res = + json_response(conn, 200) + + assert %{"name" => "Unique visitors", "value" => 4} in res["top_stats"] + assert %{"name" => "Total pageviews", "value" => 6} in res["top_stats"] + end + + test "hostname glob subdomain filter", %{conn: conn, site: site} do + populate_stats(site, [ + build(:pageview, pathname: "/index", hostname: "example.com"), + build(:pageview, pathname: "/index", hostname: "example.com", user_id: @user_id), + build(:pageview, pathname: "/blog/post1", hostname: "blog.example.com", user_id: @user_id), + build(:pageview, pathname: "/blog/post2", hostname: "blog.example.com", user_id: @user_id), + build(:pageview, pathname: "/blog/post3", hostname: "blog.example.com"), + build(:pageview, + pathname: "/blog/post2", + hostname: "blog.example.com", + user_id: 100_002_378_237 + ) + ]) + + filters = Jason.encode!(%{hostname: "*.example.com"}) + # filters = Jason.encode!(%{page: "/blog/*"}) + + conn = + get( + conn, + "/api/stats/#{site.domain}/top-stats?period=month&filters=#{filters}" + ) + + res = json_response(conn, 200) + + assert %{"name" => "Unique visitors", "value" => 3} in res["top_stats"] + assert %{"name" => "Total pageviews", "value" => 4} in res["top_stats"] + end end describe "GET /api/stats/top-stats - filtered for goal" do