diff --git a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs index 6f0e35092..42fe1417a 100644 --- a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs +++ b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs @@ -1355,50 +1355,14 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do assert json_response(conn, 200)["results"] == %{"visitors" => %{"value" => 3}} end - test "joins correctly with the sessions (CollapsingMergeTree) table", %{ + test "handles filtering by visit country", %{ conn: conn, site: site } do - create_sessions([ - %{ - site_id: site.id, - session_id: 1000, - country_code: "EE", - sign: 1, - events: 1 - }, - %{ - site_id: site.id, - session_id: 1000, - country_code: "EE", - sign: -1, - events: 1 - }, - %{ - site_id: site.id, - session_id: 1000, - country_code: "EE", - sign: 1, - events: 2 - } - ]) - - create_events([ - %{ - site_id: site.id, - session_id: 1000, - name: "pageview" - }, - %{ - site_id: site.id, - session_id: 1000, - name: "pageview" - }, - %{ - site_id: site.id, - session_id: 1000, - name: "pageview" - } + populate_stats(site, [ + build(:pageview, country_code: "EE"), + build(:pageview, country_code: "EE"), + build(:pageview, country_code: "EE") ]) conn = diff --git a/test/support/test_utils.ex b/test/support/test_utils.ex index 91db1b99b..d495de445 100644 --- a/test/support/test_utils.ex +++ b/test/support/test_utils.ex @@ -90,31 +90,6 @@ defmodule Plausible.TestUtils do Plausible.IngestRepo.insert_all(Plausible.ClickhouseEventV2, pageviews) end - def create_events(events) do - events = - Enum.map(events, fn event -> - Factory.build(:event, event) - |> Map.from_struct() - |> Map.delete(:__meta__) - |> update_in([:timestamp], &to_naive_truncate/1) - end) - - Plausible.IngestRepo.insert_all(Plausible.ClickhouseEventV2, events) - end - - def create_sessions(sessions) do - sessions = - Enum.map(sessions, fn session -> - Factory.build(:ch_session, session) - |> Map.from_struct() - |> Map.delete(:__meta__) - |> update_in([:timestamp], &to_naive_truncate/1) - |> update_in([:start], &to_naive_truncate/1) - end) - - Plausible.IngestRepo.insert_all(Plausible.ClickhouseSessionV2, sessions) - end - def log_in(%{user: user, conn: conn}) do conn = init_session(conn)