Add Funnels.list/1 function

pull/2859/head
Uku Taht 4 years ago committed by Adam Rutkowski
parent 55e9dc36ae
commit 2268636d8f

@ -26,6 +26,14 @@ defmodule Plausible.Funnels do
|> Repo.insert()
end
def list(%Plausible.Site{id: site_id}) do
Repo.all(
from f in Funnel,
where: f.site_id == ^site_id,
select: %{name: f.name, id: f.id}
)
end
def get(%Plausible.Site{id: site_id}, by) do
get(site_id, by)
end
@ -45,7 +53,7 @@ defmodule Plausible.Funnels do
Repo.one(q)
end
def evaluate(query, funnel_id, site_id) do
def evaluate(_query, funnel_id, site_id) do
funnel = get(site_id, funnel_id)
q_events =

@ -56,6 +56,7 @@ defmodule PlausibleWeb.StatsController do
stats_start_date && can_see_stats? ->
demo = site.domain == PlausibleWeb.Endpoint.host()
offer_email_report = get_session(conn, site.domain <> "_offer_email_report")
funnels = Plausible.Funnels.list(site)
conn
|> assign(:skip_plausible_tracking, !demo)
@ -64,6 +65,7 @@ defmodule PlausibleWeb.StatsController do
|> render("stats.html",
site: site,
has_goals: Plausible.Sites.has_goals?(site),
funnels: funnels,
stats_start_date: stats_start_date,
native_stats_start_date: NaiveDateTime.to_date(site.native_stats_start_at),
title: "Plausible · " <> site.domain,

@ -18,6 +18,7 @@
data-domain="<%= @site.domain %>"
data-offset="<%= Plausible.Site.tz_offset(@site) %>"
data-has-goals="<%= @has_goals %>"
data-funnels="<%= Jason.encode!(@funnels) %>"
data-logged-in="<%= !!@conn.assigns[:current_user] %>"
data-stats-begin="<%= @stats_start_date %>"
data-native-stats-begin="<%= @native_stats_start_date %>"

@ -19,7 +19,8 @@ defmodule Plausible.FunnelsTest do
Funnels.create(
site,
"From blog to signup and purchase",
[g1, g2, g3]
[g1, g2, g3],
nil
)
assert funnel.inserted_at
@ -66,7 +67,12 @@ defmodule Plausible.FunnelsTest do
|> IO.inspect(label: :err)
end
test "funnels can be listed per site" do
test "funnels can be listed per site", %{site: site, goals: [g1, g2, g3]} do
Funnels.create(site, "Funnel 1", [g3, g1, g2], nil)
Funnels.create(site, "Funnel 2", [g2, g1, g3], nil)
funnels_list = Funnels.list(site)
assert [%{name: "Funnel 1"}, %{name: "Funnel 2"}] = funnels_list
end
test "funnels can be evaluated per site within a time range", %{site: site, goals: goals} do

Loading…
Cancel
Save