From 5cf268b5b71d7bcc5be97074be7a74e935d00ea6 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Tue, 13 Jun 2023 09:30:13 +0200 Subject: [PATCH] Split funnel schema modules --- lib/plausible/funnel.ex | 25 ++----------------------- lib/plausible/funnel/step.ex | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 lib/plausible/funnel/step.ex diff --git a/lib/plausible/funnel.ex b/lib/plausible/funnel.ex index 9f9e23fd4..3e4b2f3b5 100644 --- a/lib/plausible/funnel.ex +++ b/lib/plausible/funnel.ex @@ -2,6 +2,8 @@ defmodule Plausible.Funnel do use Ecto.Schema import Ecto.Changeset + alias Plasuible.Funnel.Step + @min_steps 2 @max_steps 5 @@ -24,29 +26,6 @@ defmodule Plausible.Funnel do end end - defmodule Step do - use Ecto.Schema - import Ecto.Changeset - - @type t() :: %__MODULE__{} - schema "funnel_steps" do - field :step_order, :integer - belongs_to :funnel, Plausible.Funnel - belongs_to :goal, Plausible.Goal - timestamps() - end - - def changeset(step, attrs \\ %{}) do - step - |> cast(attrs, [:goal_id]) - |> cast_assoc(:goal) - |> validate_required([:goal_id]) - |> unique_constraint(:goal, - name: :funnel_steps_goal_id_funnel_id_index - ) - end - end - @type t() :: %__MODULE__{} schema "funnels" do field :name, :string diff --git a/lib/plausible/funnel/step.ex b/lib/plausible/funnel/step.ex new file mode 100644 index 000000000..a0a16ffed --- /dev/null +++ b/lib/plausible/funnel/step.ex @@ -0,0 +1,22 @@ +defmodule Plausible.Funnel.Step do + use Ecto.Schema + import Ecto.Changeset + + @type t() :: %__MODULE__{} + schema "funnel_steps" do + field :step_order, :integer + belongs_to :funnel, Plausible.Funnel + belongs_to :goal, Plausible.Goal + timestamps() + end + + def changeset(step, attrs \\ %{}) do + step + |> cast(attrs, [:goal_id]) + |> cast_assoc(:goal) + |> validate_required([:goal_id]) + |> unique_constraint(:goal, + name: :funnel_steps_goal_id_funnel_id_index + ) + end +end