Move Funnels to StatsController and use base query

pull/2859/head
Adam Rutkowski 4 years ago
parent 27f5ea0d30
commit 308517c08f

@ -4,6 +4,7 @@ defmodule Plausible.Funnels do
alias Plausible.Funnel
alias Plausible.Repo
alias Plausible.ClickhouseRepo
alias Plausible.Stats.Base
import Ecto.Query
@ -53,11 +54,12 @@ defmodule Plausible.Funnels do
Repo.one(q)
end
def evaluate(_query, funnel_id, site_id) do
funnel = get(site_id, funnel_id)
def evaluate(query, funnel_id, site) do
# TODO: handle non-existing funnel
funnel = get(site.id, funnel_id)
q_events =
from(e in "events_v2",
from(e in Base.base_event_query(site, query),
select: %{session_id: e.session_id},
where: e.site_id == ^funnel.site_id,
group_by: e.session_id,

@ -1,13 +0,0 @@
defmodule PlausibleWeb.Api.FunnelsController do
use PlausibleWeb, :controller
alias Plausible.Funnels
def show(conn, %{"id" => funnel_id}) do
site_id = conn.assigns.site.id
{funnel_id, ""} = Integer.parse(funnel_id)
funnel = Funnels.evaluate(:nop, funnel_id, site_id)
json(conn, funnel)
end
end

@ -846,6 +846,30 @@ defmodule PlausibleWeb.Api.StatsController do
)
end
def funnel(conn, %{"id" => funnel_id} = params) do
site = conn.assigns[:site]
with :ok <- validate_params(params),
query <- Query.from(site, params) |> Filters.add_prefix(),
:ok <- validate_funnel_query(query) do
{funnel_id, ""} = Integer.parse(funnel_id)
funnel = Plausible.Funnels.evaluate(query, funnel_id, site)
json(conn, funnel)
else
{:error, message} when is_binary(message) -> bad_request(conn, message)
end
end
defp validate_funnel_query(query) do
if query.filters["event:page"] || query.filters["event:goal"] || query.period == "realtime" do
raise "Implement me properly"
{:error, "Funnels unavailable for current set of filters"}
else
:ok
end
end
defp calculate_cr(nil, _converted_visitors), do: nil
defp calculate_cr(unique_visitors, converted_visitors) do

@ -83,7 +83,7 @@ defmodule PlausibleWeb.Router do
get "/:domain/conversions", StatsController, :conversions
get "/:domain/property/:prop_name", StatsController, :prop_breakdown
get "/:domain/suggestions/:filter_name", StatsController, :filter_suggestions
get "/:domain/funnels/:id", FunnelsController, :show
get "/:domain/funnels/:id", StatsController, :funnel
end
scope "/api/v1/stats", PlausibleWeb.Api do

Loading…
Cancel
Save