Dashboard.QueryParser: add pagination and order_by

Author: RobertJoonas

lib/plausible/stats/api_query_parser.ex

@@ -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} ->

lib/plausible/stats/dashboard/query_parser.ex

@@ -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!(%{
@@ -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)