Skip to content

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

Remove `maybe_drop_prop_filter` (#4066)

Karl-Aksel Puulmann64850cd00f6e
diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex
index c00421aace..bf4adaeace 100644
--- a/lib/plausible/stats/query.ex
+++ b/lib/plausible/stats/query.ex
@@ -31,7 +31,6 @@ defmodule Plausible.Stats.Query do
|> put_interval(params)
|> put_parsed_filters(params)
|> put_imported_opts(site, params)
- |> maybe_drop_prop_filter(site)
on_ee do
query = Plausible.Stats.Sampling.put_threshold(query, params)
@@ -269,19 +268,6 @@ defmodule Plausible.Stats.Query do
)
end
- defp maybe_drop_prop_filter(query, site) do
- prop_filter? = Map.has_key?(query.filters, "props")
-
- props_available? = fn ->
- site = Plausible.Repo.preload(site, :owner)
- Plausible.Billing.Feature.Props.check_availability(site.owner) == :ok
- end
-
- if prop_filter? && !props_available?.(),
- do: struct!(query, filters: Map.drop(query.filters, ["props"])),
- else: query
- end
-
@spec include_imported?(t(), Plausible.Site.t(), boolean()) :: boolean()
def include_imported?(query, site, requested?) do
cond do
diff --git a/test/plausible/stats/query_test.exs b/test/plausible/stats/query_test.exs
index c6400ddba6..c56e0f978a 100644
--- a/test/plausible/stats/query_test.exs
+++ b/test/plausible/stats/query_test.exs
@@ -203,21 +203,5 @@ defmodule Plausible.Stats.QueryTest do
assert q.filters["visit:source"] == {:is, "Twitter"}
end
-
- test "allows prop filters when site owner is on a business plan", %{site: site, user: user} do
- insert(:business_subscription, user: user)
- filters = Jason.encode!(%{"props" => %{"author" => "!John Doe"}})
- query = Query.from(site, %{"period" => "6mo", "filters" => filters})
-
- assert Map.has_key?(query.filters, "event:props:author")
- end
-
- test "drops prop filter when site owner is on a growth plan", %{site: site, user: user} do
- insert(:growth_subscription, user: user)
- filters = Jason.encode!(%{"props" => %{"author" => "!John Doe"}})
- query = Query.from(site, %{"period" => "6mo", "filters" => filters})
-
- refute Map.has_key?(query.filters, "props")
- end
end
end