Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Update goal in segment (#5027)
Uku Taht9f1d8ec2b781
diff --git a/lib/plausible/goals/goals.ex b/lib/plausible/goals/goals.exindex af17a254f4..c3229c96d6 100644--- a/lib/plausible/goals/goals.ex+++ b/lib/plausible/goals/goals.ex@@ -56,16 +56,20 @@ defmodule Plausible.Goals do{:ok, Goal.t()} | {:error, Ecto.Changeset.t()} | {:error, :upgrade_required}def update(goal, params) dochangeset = Goal.changeset(goal, params)- site = Repo.preload(goal, :site).site- with :ok <- maybe_check_feature_access(site, changeset),- {:ok, goal} <- Repo.update(changeset) do- on_ee do- {:ok, Repo.preload(goal, :funnels)}- else- {:ok, goal}+ Repo.transaction(fn ->+ site = Repo.preload(goal, :site).site++ with :ok <- maybe_check_feature_access(site, changeset),+ {:ok, updated_goal} <- Repo.update(changeset),+ :ok <- Plausible.Segments.update_goal_in_segments(site, goal, updated_goal) do+ on_ee do+ Repo.preload(updated_goal, :funnels)+ else+ updated_goal+ endend- end+ end)enddef find_or_create(diff --git a/lib/plausible/segments/segments.ex b/lib/plausible/segments/segments.exindex 3ede54ff66..63ac290244 100644--- a/lib/plausible/segments/segments.ex+++ b/lib/plausible/segments/segments.ex@@ -137,6 +137,54 @@ defmodule Plausible.Segments doendend+ def update_goal_in_segments(+ %Plausible.Site{} = site,+ %Plausible.Goal{} = stale_goal,+ %Plausible.Goal{} = updated_goal+ ) do+ # Looks for a pattern like ["is", "event:goal", [...<goal_name>...]] in the filters structure.+ # Added a bunch of whitespace matchers to make sure it's tolerant of valid JSON formatting+ goal_filter_regex =+ ~s(.*?\\[\s*"is",\s*"event:goal",\s*\\[.*?"#{Regex.escape(stale_goal.display_name)}".*?\\]\s*\\].*?)++ segments_to_update =+ from(+ s in Segment,+ where: s.site_id == ^site.id,+ where: fragment("?['filters']::text ~ ?", s.segment_data, ^goal_filter_regex)+ )++ stale_goal_name = stale_goal.display_name++ for segment <- Repo.all(segments_to_update) do+ updated_filters =+ Plausible.Stats.Filters.transform_filters(segment.segment_data["filters"], fn+ ["is", "event:goal", clauses] ->+ new_clauses =+ Enum.map(clauses, fn+ ^stale_goal_name -> updated_goal.display_name+ clause -> clause+ end)++ [["is", "event:goal", new_clauses]]++ _ ->+ nil+ end)++ updated_segment_data = Map.put(segment.segment_data, "filters", updated_filters)++ from(+ s in Segment,+ where: s.id == ^segment.id,+ update: [set: [segment_data: ^updated_segment_data]]+ )+ |> Repo.update_all([])+ end++ :ok+ end+def delete_one(user_id, %Plausible.Site{} = site, site_role, segment_id) dowith {:ok, segment} <- get_one(user_id, site, site_role, segment_id) docond dodiff --git a/test/plausible/goals_test.exs b/test/plausible/goals_test.exsindex a18db94c8b..256640e5fa 100644--- a/test/plausible/goals_test.exs+++ b/test/plausible/goals_test.exs@@ -180,6 +180,53 @@ defmodule Plausible.GoalsTest doassert goal2.display_name == "Homepage"end+ test "update/2 also updates all segments the goal is a part of" do+ user = new_user()+ site = new_site(owner: user)+ {:ok, goal1} = Goals.create(site, %{"event_name" => "Signup"})+ {:ok, _goal2} = Goals.create(site, %{"event_name" => "Signup from nav"})++ {:ok, segment1} =+ Plausible.Segments.insert_one(user.id, site, :editor, %{+ "type" => "site",+ "segment_data" => %{+ "filters" => [+ ["is", "event:page", ["/blog"]],+ ["is", "event:goal", ["Signup from nav", "Signup"]],+ ["is", "event:props:variant", ["A"]]+ ]+ },+ "name" => "Site segment"+ })++ {:ok, segment2} =+ Plausible.Segments.insert_one(user.id, site, :editor, %{+ "type" => "personal",+ "segment_data" => %{+ "filters" => [+ ["is", "event:goal", ["Signup"]]+ ]+ },+ "name" => "Personal segment"+ })++ Goals.update(goal1, %{"display_name" => "SIGNUP"})++ assert Repo.reload!(segment1).segment_data == %{+ "filters" => [+ ["is", "event:page", ["/blog"]],+ ["is", "event:goal", ["Signup from nav", "SIGNUP"]],+ ["is", "event:props:variant", ["A"]]+ ]+ }++ assert Repo.reload!(segment2).segment_data == %{+ "filters" => [+ ["is", "event:goal", ["SIGNUP"]]+ ]+ }+ end+@tag :ee_onlytest "list_revenue_goals/1 lists event_names and currencies for each revenue goal" dosite = new_site()