mix format

pr-2841
Robert Joonas 4 years ago
parent ab94b6e7c9
commit 1bc1530044

@ -184,7 +184,8 @@ defmodule Plausible.Stats.Base do
as: :meta,
where:
(meta.key == ^prop_name and meta.value in ^values) or
(^none_value_included and fragment("not has(?, ?)", field(e, :"meta.key"), ^prop_name))
(^none_value_included and
fragment("not has(?, ?)", field(e, :"meta.key"), ^prop_name))
)
{"event:props:" <> prop_name, {:not_member, values}} ->
@ -196,12 +197,15 @@ defmodule Plausible.Stats.Base do
as: :meta,
where:
(meta.key == ^prop_name and meta.value not in ^values) or
(^none_value_included and fragment("has(?, ?)", field(e, :"meta.key"), ^prop_name) and meta.value not in ^values) or
(not ^none_value_included and fragment("not has(?, ?)", field(e, :"meta.key"), ^prop_name))
(^none_value_included and fragment("has(?, ?)", field(e, :"meta.key"), ^prop_name) and
meta.value not in ^values) or
(not (^none_value_included) and
fragment("not has(?, ?)", field(e, :"meta.key"), ^prop_name))
)
_ -> q
end
_ ->
q
end
q
end

@ -83,10 +83,11 @@ defmodule Plausible.Stats.Breakdown do
end
trace(query, property, metrics)
results =
breakdown_events(site, query, "event:props:" <> custom_prop, metrics, pagination)
|> Kernel.++(none_result)
|> Enum.sort_by(&(&1[sorting_key(metrics)]), :desc)
|> Enum.sort_by(& &1[sorting_key(metrics)], :desc)
if Enum.find_index(results, fn value -> value[custom_prop] == "(none)" end) == limit do
Enum.slice(results, 0..(limit - 1))
@ -170,7 +171,7 @@ defmodule Plausible.Stats.Breakdown do
|> Map.merge(event_row)
|> Map.merge(session_row)
end)
|> Enum.sort_by(&(&1[sorting_key(metrics)]), :desc)
|> Enum.sort_by(& &1[sorting_key(metrics)], :desc)
end
defp include_none_result?({:is, value}), do: value == "(none)"

@ -38,7 +38,7 @@ defmodule Plausible.Stats.Props do
{{_, {_, goal_name}}, {"event:props:" <> key, _}} when is_binary(goal_name) ->
%{goal_name => [key]}
{{_, values}, {"event:props:" <> _, _}} when is_list(values)->
{{_, values}, {"event:props:" <> _, _}} when is_list(values) ->
nil
_ ->

@ -1521,7 +1521,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do
assert json_response(conn, 200) == %{
"results" => [
%{"browser" => "Chrome", "visitors" => 2},
%{"browser" => "Safari", "visitors" => 1},
%{"browser" => "Safari", "visitors" => 1}
]
}
end
@ -1564,7 +1564,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest do
assert json_response(conn, 200) == %{
"results" => [
%{"browser" => "Chrome", "visitors" => 2},
%{"browser" => "Safari", "visitors" => 1},
%{"browser" => "Safari", "visitors" => 1}
]
}
end

@ -268,7 +268,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
name: "Payment",
"meta.key": ["author"],
"meta.value": ["John"]
),
)
])
insert(:goal, %{site: site, event_name: "Payment"})
@ -287,10 +287,11 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
]
end
test "returns prop_names=nil when goal :member + property filter are applied at the same time", %{
conn: conn,
site: site
} do
test "returns prop_names=nil when goal :member + property filter are applied at the same time",
%{
conn: conn,
site: site
} do
populate_stats(site, [
build(:event,
name: "Payment",
@ -306,7 +307,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
name: "Payment",
"meta.key": ["author"],
"meta.value": ["John"]
),
)
])
insert(:goal, %{site: site, event_name: "Payment"})
@ -588,7 +589,10 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
]
end
test "does not return (none) value in property breakdown with is filter on prop_value", %{conn: conn, site: site} do
test "does not return (none) value in property breakdown with is filter on prop_value", %{
conn: conn,
site: site
} do
populate_stats(site, [
build(:event,
name: "Purchase",
@ -618,11 +622,14 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 50.0
},
}
]
end
test "returns only (none) value in property breakdown with is (none) filter", %{conn: conn, site: site} do
test "returns only (none) value in property breakdown with is (none) filter", %{
conn: conn,
site: site
} do
populate_stats(site, [
build(:event,
name: "Purchase",
@ -652,11 +659,14 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 50.0
},
}
]
end
test "returns (none) value in property breakdown with is_not filter on prop_value", %{conn: conn, site: site} do
test "returns (none) value in property breakdown with is_not filter on prop_value", %{
conn: conn,
site: site
} do
populate_stats(site, [
build(:event,
name: "Purchase",
@ -698,15 +708,18 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
"conversion_rate" => 50.0
},
%{
"name" => "(none)",
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 25.0
},
"name" => "(none)",
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 25.0
}
]
end
test "does not return (none) value in property breakdown with is_not (none) filter", %{conn: conn, site: site} do
test "does not return (none) value in property breakdown with is_not (none) filter", %{
conn: conn,
site: site
} do
populate_stats(site, [
build(:event,
name: "Purchase",
@ -736,11 +749,14 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 50.0
},
}
]
end
test "does not return (none) value in property breakdown with member filter on prop_value", %{conn: conn, site: site} do
test "does not return (none) value in property breakdown with member filter on prop_value", %{
conn: conn,
site: site
} do
populate_stats(site, [
build(:event,
name: "Purchase",
@ -782,15 +798,16 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
"conversion_rate" => 50.0
},
%{
"name" => "0",
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 25.0
},
"name" => "0",
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 25.0
}
]
end
test "returns (none) value in property breakdown with member filter including a (none) value", %{conn: conn, site: site} do
test "returns (none) value in property breakdown with member filter including a (none) value",
%{conn: conn, site: site} do
populate_stats(site, [
build(:event,
name: "Purchase",
@ -832,15 +849,18 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
"conversion_rate" => 50.0
},
%{
"name" => "(none)",
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 25.0
},
"name" => "(none)",
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 25.0
}
]
end
test "returns (none) value in property breakdown with not_member filter on prop_value", %{conn: conn, site: site} do
test "returns (none) value in property breakdown with not_member filter on prop_value", %{
conn: conn,
site: site
} do
populate_stats(site, [
build(:event,
name: "Purchase",
@ -887,15 +907,16 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
"conversion_rate" => 40.0
},
%{
"name" => "(none)",
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 20.0
},
"name" => "(none)",
"unique_conversions" => 1,
"total_conversions" => 1,
"conversion_rate" => 20.0
}
]
end
test "does not return (none) value in property breakdown with not_member filter including a (none) value", %{conn: conn, site: site} do
test "does not return (none) value in property breakdown with not_member filter including a (none) value",
%{conn: conn, site: site} do
populate_stats(site, [
build(:event,
name: "Purchase",
@ -935,7 +956,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do
"unique_conversions" => 2,
"total_conversions" => 2,
"conversion_rate" => 50.0
},
}
]
end

@ -307,7 +307,10 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
]
end
test "returns top pages with :not_member filter on custom pageview props", %{conn: conn, site: site} do
test "returns top pages with :not_member filter on custom pageview props", %{
conn: conn,
site: site
} do
populate_stats(site, [
build(:pageview,
pathname: "/chrome",
@ -340,17 +343,20 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
])
filters = Jason.encode!(%{props: %{"browser" => "!Chrome|Safari"}})
conn = get(conn, "/api/stats/#{site.domain}/pages?period=day&date=2021-01-01&filters=#{filters}")
conn =
get(conn, "/api/stats/#{site.domain}/pages?period=day&date=2021-01-01&filters=#{filters}")
assert json_response(conn, 200) == [
%{
"name" => "/firefox",
"visitors" => 2
}
]
%{
"name" => "/firefox",
"visitors" => 2
}
]
end
test "returns top pages with :not_member filter on custom pageview props including (none) value", %{conn: conn, site: site} do
test "returns top pages with :not_member filter on custom pageview props including (none) value",
%{conn: conn, site: site} do
populate_stats(site, [
build(:pageview,
pathname: "/chrome",
@ -377,14 +383,16 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
])
filters = Jason.encode!(%{props: %{"browser" => "!Chrome|(none)"}})
conn = get(conn, "/api/stats/#{site.domain}/pages?period=day&date=2021-01-01&filters=#{filters}")
conn =
get(conn, "/api/stats/#{site.domain}/pages?period=day&date=2021-01-01&filters=#{filters}")
assert json_response(conn, 200) == [
%{
"name" => "/safari",
"visitors" => 1
}
]
%{
"name" => "/safari",
"visitors" => 1
}
]
end
test "calculates bounce_rate and time_on_page for pages filtered by page path",

@ -272,13 +272,14 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do
get(conn, "/api/stats/#{site.domain}/suggestions/prop_key?period=day&date=2022-01-01")
assert json_response(conn, 200) == [
%{"label" => "author", "value" => "author"},
%{"label" => "logged_in", "value" => "logged_in"},
%{"label" => "dark_mode", "value" => "dark_mode"}
]
%{"label" => "author", "value" => "author"},
%{"label" => "logged_in", "value" => "logged_in"},
%{"label" => "dark_mode", "value" => "dark_mode"}
]
end
test "returns suggestions for prop value ordered by count, but (none) value is always first", %{conn: conn, site: site} do
test "returns suggestions for prop value ordered by count, but (none) value is always first",
%{conn: conn, site: site} do
populate_stats(site, [
build(:pageview,
"meta.key": ["author"],
@ -309,13 +310,16 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do
)
assert json_response(conn, 200) == [
%{"label" => "(none)", "value" => "(none)"},
%{"label" => "Uku Taht", "value" => "Uku Taht"},
%{"label" => "Marko Saric", "value" => "Marko Saric"}
]
%{"label" => "(none)", "value" => "(none)"},
%{"label" => "Uku Taht", "value" => "Uku Taht"},
%{"label" => "Marko Saric", "value" => "Marko Saric"}
]
end
test "does not show (none) value suggestion when all events have that prop_key", %{conn: conn, site: site} do
test "does not show (none) value suggestion when all events have that prop_key", %{
conn: conn,
site: site
} do
populate_stats(site, [
build(:pageview,
"meta.key": ["author"],
@ -343,9 +347,9 @@ defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do
)
assert json_response(conn, 200) == [
%{"label" => "Uku Taht", "value" => "Uku Taht"},
%{"label" => "Marko Saric", "value" => "Marko Saric"}
]
%{"label" => "Uku Taht", "value" => "Uku Taht"},
%{"label" => "Marko Saric", "value" => "Marko Saric"}
]
end
test "when date is borked, bad request is returned", %{

Loading…
Cancel
Save