From 9453209023637506d5f6f41ab61ede8256bedac3 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 8 Feb 2021 17:17:03 +0200 Subject: [PATCH] Fix custom date format Fixes #691 --- lib/plausible/stats/query.ex | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index 701037472..2017db2ea 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -146,6 +146,16 @@ defmodule Plausible.Stats.Query do } end + def from(tz, %{"period" => "custom", "from" => from, "to" => to} = params) do + new_params = + params + |> Map.delete("from") + |> Map.delete("to") + |> Map.put("date", Enum.join([from, to], ",")) + + from(tz, new_params) + end + def from(_tz, %{"period" => "custom", "date" => date} = params) do [from, to] = String.split(date, ",") from_date = Date.from_iso8601!(from) @@ -159,10 +169,6 @@ defmodule Plausible.Stats.Query do } end - def from(tz, %{"period" => "custom", "from" => from, "to" => to} = params) do - from(tz, Map.merge(params, %{"period" => "custom", "date" => Enum.join([from, to], ",")})) - end - def from(tz, _) do __MODULE__.from(tz, %{"period" => "30d"}) end