Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/plausible/stats/api_query_parser.ex
Original file line number Diff line number Diff line change
Expand Up @@ -325,11 +325,11 @@ defmodule Plausible.Stats.ApiQueryParser do
defp parse_include_entry(key, _value),
do: {:error, %QueryError{code: :invalid_include, message: "Invalid include key'#{i(key)}'."}}

defp parse_pagination(pagination) when is_map(pagination) do
def parse_pagination(pagination) when is_map(pagination) do
{:ok, Map.merge(@default_pagination, atomize_keys(pagination))}
end

defp parse_pagination(nil), do: {:ok, @default_pagination}
def parse_pagination(nil), do: {:ok, @default_pagination}

defp atomize_keys(map) when is_map(map) do
Map.new(map, fn {key, value} ->
Expand Down
4 changes: 4 additions & 0 deletions lib/plausible/stats/dashboard/query_parser.ex
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ defmodule Plausible.Stats.Dashboard.QueryParser do
{:ok, dimensions} <- ApiQueryParser.parse_dimensions(params["dimensions"]),
{:ok, filters} <- ApiQueryParser.parse_filters(params["filters"]),
{:ok, metrics} <- parse_metrics(params),
{:ok, order_by} <- ApiQueryParser.parse_order_by(params["order_by"]),
{:ok, pagination} <- ApiQueryParser.parse_pagination(params["pagination"]),
{:ok, include} <- parse_include(params) do
{:ok,
ParsedQueryParams.new!(%{
Expand All @@ -28,6 +30,8 @@ defmodule Plausible.Stats.Dashboard.QueryParser do
dimensions: dimensions,
filters: filters,
metrics: metrics,
order_by: order_by,
pagination: pagination,
include: include,
skip_goal_existence_check: true,
now: Keyword.get(opts, :now)
Expand Down
1 change: 1 addition & 0 deletions lib/plausible/stats/metrics.ex
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ defmodule Plausible.Stats.Metrics do
:visit_duration,
:events,
:conversion_rate,
:total_visitors,
:group_conversion_rate,
:time_on_page,
:percentage,
Expand Down
13 changes: 13 additions & 0 deletions test/plausible/stats/query/query_parse_and_build_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,19 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do
assert error =~ "Invalid metric"
end

test "public API does not recognize total_visitors metric", %{site: site} do
params = %{
"site_id" => site.domain,
"metrics" => ["total_visitors"],
"date_range" => "all"
}

assert {:error, %QueryError{message: error}} =
Query.parse_and_build(site, params, now: @now)

assert error =~ "Invalid metric"
end

test "valid metrics passed", %{site: site} do
params = %{
"site_id" => site.domain,
Expand Down
Loading
Loading