Stop tagging Funnels.get/2 result

pull/3023/head
Adam Rutkowski 3 years ago
parent e99f61c91c
commit 242081e544

@ -69,7 +69,7 @@ defmodule Plausible.Funnels do
end end
@spec get(Plausible.Site.t() | pos_integer(), pos_integer()) :: @spec get(Plausible.Site.t() | pos_integer(), pos_integer()) ::
{:ok, Funnel.t()} | {:error, String.t()} Funnel.t() | nil
def get(%Plausible.Site{id: site_id}, by) do def get(%Plausible.Site{id: site_id}, by) do
get(site_id, by) get(site_id, by)
end end
@ -86,20 +86,18 @@ defmodule Plausible.Funnels do
steps: {steps, goal: goal} steps: {steps, goal: goal}
] ]
funnel = Repo.one(q) Repo.one(q)
if funnel do
{:ok, funnel}
else
{:error, "Funnel not found"}
end
end end
@spec evaluate(Plausible.Stats.Query.t(), Funnel.t() | pos_integer(), Plausible.Site.t()) :: @spec evaluate(Plausible.Stats.Query.t(), Funnel.t() | pos_integer(), Plausible.Site.t()) ::
{:ok, Funnel.t()} | {:error, String.t()} {:ok, Funnel.t()} | {:error, :funnel_not_found}
def evaluate(query, funnel_id, site) when is_integer(funnel_id) do def evaluate(query, funnel_id, site) when is_integer(funnel_id) do
with {:ok, funnel_definition} <- get(site.id, funnel_id) do case get(site.id, funnel_id) do
evaluate(query, funnel_definition, site) %Funnel{} = funnel_definition ->
evaluate(query, funnel_definition, site)
nil ->
{:error, :funnel_not_found}
end end
end end

@ -121,10 +121,10 @@ defmodule Plausible.GoalsTest do
:ok = Goals.delete(g1.id, site) :ok = Goals.delete(g1.id, site)
assert {:ok, f1} = Plausible.Funnels.get(site.id, f1.id) assert f1 = Plausible.Funnels.get(site.id, f1.id)
assert Enum.count(f1.steps) == 2 assert Enum.count(f1.steps) == 2
assert {:error, "Funnel not found"} = Plausible.Funnels.get(site.id, f2.id) refute Plausible.Funnels.get(site.id, f2.id)
assert Repo.all(from fs in Plausible.Funnel.Step, where: fs.funnel_id == ^f2.id) == [] assert Repo.all(from fs in Plausible.Funnel.Step, where: fs.funnel_id == ^f2.id) == []
assert [^g3, ^g2] = Goals.for_site(site) assert [^g3, ^g2] = Goals.for_site(site)

Loading…
Cancel
Save