Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Refactor: remove transform_filters function from imported base (#4409)

Uku Tahtb8680425817f
diff --git a/lib/plausible/stats/imported/base.ex b/lib/plausible/stats/imported/base.ex
index 0781306d26..2fb5affd6c 100644
--- a/lib/plausible/stats/imported/base.ex
+++ b/lib/plausible/stats/imported/base.ex
@@ -61,16 +61,12 @@ defmodule Plausible.Stats.Imported.Base do
def property_to_table_mappings(), do: @property_to_table_mappings
def query_imported(site, query) do
- [table] =
- query
- |> transform_filters()
- |> decide_tables()
+ [table] = decide_tables(query)
query_imported(table, site, query)
end
def query_imported(table, site, query) do
- query = transform_filters(query)
import_ids = site.complete_import_ids
%{first: date_from, last: date_to} = query.date_range
@@ -85,8 +81,6 @@ defmodule Plausible.Stats.Imported.Base do
end
def decide_tables(query) do
- query = transform_filters(query)
-
if custom_prop_query?(query) do
do_decide_custom_prop_table(query)
else
@@ -94,17 +88,6 @@ defmodule Plausible.Stats.Imported.Base do
end
end
- defp transform_filters(query) do
- new_filters =
- query.filters
- |> Enum.reject(fn
- [:is, "event:name", ["pageview"]] -> true
- _ -> false
- end)
-
- struct!(query, filters: new_filters)
- end
-
defp custom_prop_query?(query) do
query.filters
|> Enum.map(&Enum.at(&1, 1))
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex
index 6a65a7903f..a0b554bd18 100644
--- a/lib/plausible_web/controllers/api/stats_controller.ex
+++ b/lib/plausible_web/controllers/api/stats_controller.ex
@@ -934,7 +934,6 @@ defmodule PlausibleWeb.Api.StatsController do
query
|> Query.remove_filters(["visit:exit_page"])
|> Query.add_filter([:is, "event:page", pages])
- |> Query.add_filter([:is, "event:name", ["pageview"]])
|> Query.set(dimensions: ["event:page"])
total_pageviews =
diff --git a/test/workers/clickhouse_clean_sites_test.exs b/test/workers/clickhouse_clean_sites_test.exs
index 8d85dee2c1..61e852e711 100644
--- a/test/workers/clickhouse_clean_sites_test.exs
+++ b/test/workers/clickhouse_clean_sites_test.exs
@@ -6,6 +6,7 @@ defmodule Plausible.Workers.ClickhouseCleanSitesTest do
alias Plausible.Workers.ClickhouseCleanSites
+ @tag :slow
test "deletes data from events and sessions tables" do
site = insert(:site)
deleted_site = insert(:site)