diff --git a/lib/plausible/funnel.ex b/lib/plausible/funnel.ex index d29d7232a..90ed23f1e 100644 --- a/lib/plausible/funnel.ex +++ b/lib/plausible/funnel.ex @@ -1,12 +1,24 @@ defmodule Plausible.Funnel do use Ecto.Schema + defmodule Step do + use Ecto.Schema + + @type t() :: %__MODULE__{} + schema "funnel_steps" do + field :step_order, :integer + belongs_to :funnel, Plausible.Funnel + belongs_to :goal, Plausible.Goal + timestamps() + end + end + @type t() :: %__MODULE__{} schema "funnels" do field :name, :string belongs_to :site, Plausible.Site - has_many :steps, Plausible.FunnelStep, + has_many :steps, Step, preload_order: [ asc: :step_order ] diff --git a/lib/plausible/funnel/goals.ex b/lib/plausible/funnel/goals.ex deleted file mode 100644 index 9a93d9f68..000000000 --- a/lib/plausible/funnel/goals.ex +++ /dev/null @@ -1,11 +0,0 @@ -defmodule Plausible.FunnelStep do - use Ecto.Schema - - @type t() :: %__MODULE__{} - schema "funnel_steps" do - field :step_order, :integer - belongs_to :funnel, Plausible.Funnel - belongs_to :goal, Plausible.Goal - timestamps() - end -end diff --git a/lib/plausible/funnels.ex b/lib/plausible/funnels.ex index b49a9516f..a52938865 100644 --- a/lib/plausible/funnels.ex +++ b/lib/plausible/funnels.ex @@ -39,6 +39,7 @@ defmodule Plausible.Funnels do where: f.id == ^funnel_id, inner_join: steps in assoc(f, :steps), inner_join: goal in assoc(steps, :goal), + order_by: steps.step_order, preload: [ steps: {steps, goal: goal} ] diff --git a/test/plausible/funnels_test.exs b/test/plausible/funnels_test.exs index ce7f05ffe..a6b635b64 100644 --- a/test/plausible/funnels_test.exs +++ b/test/plausible/funnels_test.exs @@ -35,12 +35,12 @@ defmodule Plausible.FunnelsTest do assert fg3.step_order == 3 end - test "retrieve a funnel by id and site", %{site: site, goals: goals} do + test "retrieve a funnel by id and site, get steps in order", %{site: site, goals: [g1, g2, g3]} do funnel = Funnels.create( site, "Lorem ipsum", - goals, + [g3, g1, g2], nil )