|
|
|
|
@ -21,6 +21,7 @@ defmodule Plausible.Ingestion.Request do
|
|
|
|
|
field :hash_mode, :string
|
|
|
|
|
field :pathname, :string
|
|
|
|
|
field :props, :map
|
|
|
|
|
field :revenue_source, :map
|
|
|
|
|
field :query_params, :map
|
|
|
|
|
|
|
|
|
|
field :timestamp, :naive_datetime
|
|
|
|
|
@ -53,6 +54,7 @@ defmodule Plausible.Ingestion.Request do
|
|
|
|
|
|> put_props(request_body)
|
|
|
|
|
|> put_pathname()
|
|
|
|
|
|> put_query_params()
|
|
|
|
|
|> put_revenue_source(request_body)
|
|
|
|
|
|> map_domains(request_body)
|
|
|
|
|
|> Changeset.validate_required([
|
|
|
|
|
:event_name,
|
|
|
|
|
@ -166,7 +168,7 @@ defmodule Plausible.Ingestion.Request do
|
|
|
|
|
defp put_props(changeset, %{} = request_body) do
|
|
|
|
|
props =
|
|
|
|
|
(request_body["m"] || request_body["meta"] || request_body["p"] || request_body["props"])
|
|
|
|
|
|> decode_props_or_fallback()
|
|
|
|
|
|> decode_json_or_fallback()
|
|
|
|
|
|> Enum.reject(fn {_k, v} -> is_nil(v) || is_list(v) || is_map(v) || v == "" end)
|
|
|
|
|
|> Map.new()
|
|
|
|
|
|
|
|
|
|
@ -175,18 +177,6 @@ defmodule Plausible.Ingestion.Request do
|
|
|
|
|
|> validate_props()
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp decode_props_or_fallback(raw) do
|
|
|
|
|
with raw when is_binary(raw) <- raw,
|
|
|
|
|
{:ok, %{} = decoded} <- Jason.decode(raw) do
|
|
|
|
|
decoded
|
|
|
|
|
else
|
|
|
|
|
already_a_map when is_map(already_a_map) -> already_a_map
|
|
|
|
|
{:ok, _list_or_other} -> %{}
|
|
|
|
|
{:error, _decode_error} -> %{}
|
|
|
|
|
_any -> %{}
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
@max_prop_key_length 300
|
|
|
|
|
@max_prop_value_length 2000
|
|
|
|
|
defp validate_props(changeset) do
|
|
|
|
|
@ -209,6 +199,52 @@ defmodule Plausible.Ingestion.Request do
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp put_revenue_source(%Ecto.Changeset{} = changeset, %{} = request_body) do
|
|
|
|
|
with revenue_source <- request_body["revenue"] || request_body["$"],
|
|
|
|
|
%{"amount" => _, "currency" => _} = revenue_source <-
|
|
|
|
|
decode_json_or_fallback(revenue_source) do
|
|
|
|
|
parse_revenue_source(changeset, revenue_source)
|
|
|
|
|
else
|
|
|
|
|
_any -> changeset
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
@valid_currencies Plausible.Goal.valid_currencies()
|
|
|
|
|
defp parse_revenue_source(changeset, %{"amount" => amount, "currency" => currency}) do
|
|
|
|
|
with true <- currency in @valid_currencies,
|
|
|
|
|
{%Decimal{} = amount, _rest} <- parse_decimal(amount),
|
|
|
|
|
%Money{} = amount <- Money.new(currency, amount) do
|
|
|
|
|
Changeset.put_change(changeset, :revenue_source, amount)
|
|
|
|
|
else
|
|
|
|
|
false ->
|
|
|
|
|
Changeset.add_error(changeset, :revenue_source, "currency is not supported or invalid")
|
|
|
|
|
|
|
|
|
|
_parse_error ->
|
|
|
|
|
Changeset.add_error(changeset, :revenue_source, "must be a valid number")
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp decode_json_or_fallback(raw) do
|
|
|
|
|
with raw when is_binary(raw) <- raw,
|
|
|
|
|
{:ok, %{} = decoded} <- Jason.decode(raw) do
|
|
|
|
|
decoded
|
|
|
|
|
else
|
|
|
|
|
already_a_map when is_map(already_a_map) -> already_a_map
|
|
|
|
|
{:ok, _list_or_other} -> %{}
|
|
|
|
|
{:error, _decode_error} -> %{}
|
|
|
|
|
_any -> %{}
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp parse_decimal(value) do
|
|
|
|
|
case value do
|
|
|
|
|
value when is_binary(value) -> Decimal.parse(value)
|
|
|
|
|
value when is_float(value) -> {Decimal.from_float(value), nil}
|
|
|
|
|
value when is_integer(value) -> {Decimal.new(value), nil}
|
|
|
|
|
_any -> :error
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp put_query_params(changeset) do
|
|
|
|
|
case Changeset.get_field(changeset, :uri) do
|
|
|
|
|
%{query: query} when is_binary(query) ->
|
|
|
|
|
|