From bf9d6173a81d43ef755265e50599bf785d4be3e4 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Tue, 18 Apr 2023 11:13:11 +0200 Subject: [PATCH] Dirty wip --- lib/plausible/funnel.ex | 8 +++- lib/plausible/funnel/goals.ex | 4 +- lib/plausible/funnels.ex | 37 +++++++++++++------ .../controllers/api/funnels_controller.ex | 2 +- test/plausible/funnels_test.exs | 16 +++++++- 5 files changed, 50 insertions(+), 17 deletions(-) diff --git a/lib/plausible/funnel.ex b/lib/plausible/funnel.ex index 18f051759..d29d7232a 100644 --- a/lib/plausible/funnel.ex +++ b/lib/plausible/funnel.ex @@ -6,8 +6,12 @@ defmodule Plausible.Funnel do field :name, :string belongs_to :site, Plausible.Site - has_many :funnel_goals, Plausible.Funnel.Goals - has_many :goals, through: [:funnel_goals, :goal] + has_many :steps, Plausible.FunnelStep, + preload_order: [ + asc: :step_order + ] + + has_many :goals, through: [:steps, :goal] timestamps() end end diff --git a/lib/plausible/funnel/goals.ex b/lib/plausible/funnel/goals.ex index ab513c54a..1c2f01e99 100644 --- a/lib/plausible/funnel/goals.ex +++ b/lib/plausible/funnel/goals.ex @@ -1,10 +1,10 @@ -defmodule Plausible.Funnel.Goals do +defmodule Plausible.FunnelStep do use Ecto.Schema @type t() :: %__MODULE__{} + # XXX rename funnel_steps schema "funnel_goals" do field :step_order, :integer - belongs_to :funnel, Plausible.Funnel belongs_to :goal, Plausible.Goal timestamps() diff --git a/lib/plausible/funnels.ex b/lib/plausible/funnels.ex index 2af155dc9..8fb681d60 100644 --- a/lib/plausible/funnels.ex +++ b/lib/plausible/funnels.ex @@ -8,8 +8,8 @@ defmodule Plausible.Funnels do import Ecto.Changeset import Ecto.Query - def create(site, name, goals) when is_list(goals) do - funnel_goals = + def create(site, name, goals, id \\ 5) when is_list(goals) do + steps = goals |> Enum.with_index(1) |> Enum.map(fn {goal, index} -> @@ -22,13 +22,28 @@ defmodule Plausible.Funnels do change(%Funnel{ site_id: site.id, name: name, - id: 5 + id: id }) - |> put_assoc(:funnel_goals, funnel_goals) + |> put_assoc(:steps, steps) |> Repo.insert!() end - def list_funnels(site) do + def get(%Plausible.Site{id: site_id}, by) do + get(site_id, by) + end + + def get(site_id, funnel_id) when is_integer(site_id) and is_integer(funnel_id) do + q = + from f in Funnel, + where: f.site_id == ^site_id, + where: f.id == ^funnel_id, + inner_join: steps in assoc(f, :steps), + inner_join: goal in assoc(steps, :goal), + preload: [ + steps: {steps, goal: goal} + ] + + Repo.one(q) end def evaluate(_query, funnel_id, site_id) do @@ -38,7 +53,7 @@ defmodule Plausible.Funnels do site_id: site_id ) # XXX: make inner join - |> Repo.preload(funnel_goals: :goal) + |> Repo.preload(steps: :goal) q_events = from e in "events_v2", @@ -74,17 +89,17 @@ defmodule Plausible.Funnels do end defp update_step_defaults(funnel, funnel_result) do - max_step = Enum.max_by(funnel.funnel_goals, & &1.step_order).step_order + max_step = Enum.max_by(funnel.steps, & &1.step_order).step_order - funnel.funnel_goals + funnel.steps |> Enum.sort_by(& &1.step_order) - |> Enum.map(fn funnel_goal -> + |> Enum.map(fn step -> label = - Plausible.Goal.display_name(funnel_goal.goal) + Plausible.Goal.display_name(step.goal) |> IO.inspect(label: :label) visitors_total = - Enum.reduce(funnel_goal.step_order..max_step, 0, fn step_order, acc -> + Enum.reduce(step.step_order..max_step, 0, fn step_order, acc -> visitors = Map.get(funnel_result, step_order, 0) |> IO.inspect(label: "visitors_#{step_order}") diff --git a/lib/plausible_web/controllers/api/funnels_controller.ex b/lib/plausible_web/controllers/api/funnels_controller.ex index 5bacfde69..92e983e7b 100644 --- a/lib/plausible_web/controllers/api/funnels_controller.ex +++ b/lib/plausible_web/controllers/api/funnels_controller.ex @@ -3,7 +3,7 @@ defmodule PlausibleWeb.Api.FunnelsController do alias Plausible.Funnels - """ + @snippet """ Plausible.Repo.delete_all(Plausible.Goal) Plausible.Repo.delete_all(Plausible.Funnel) site = Plausible.Sites.get_by_domain("dummy.site") diff --git a/test/plausible/funnels_test.exs b/test/plausible/funnels_test.exs index 16d445336..67daa3558 100644 --- a/test/plausible/funnels_test.exs +++ b/test/plausible/funnels_test.exs @@ -24,7 +24,7 @@ defmodule Plausible.GoalsTest do assert funnel.inserted_at assert funnel.name == "From blog to signup and purchase" - assert [fg1, fg2, fg3] = funnel.funnel_goals + assert [fg1, fg2, fg3] = funnel.steps assert fg1.goal_id == g1.id assert fg2.goal_id == g2.id @@ -35,6 +35,20 @@ defmodule Plausible.GoalsTest do assert fg3.step_order == 3 end + test "retrieve a funnel by id and site", %{site: site, goals: goals} do + funnel = + Funnels.create( + site, + "Lorem ipsum", + goals, + nil + ) + + assert got = + Funnels.get(site, funnel.id) + |> IO.inspect(label: :got) + end + test "a funnel can be made of max n(TBD) goals" do end