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
Prioritize domain exact match when looking up site for user (#6625)
Adam90399f621fd3
diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex 724a5b2909..e829452aaa 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -537,6 +537,8 @@ defmodule Plausible.Sites dowhere: coalesce(gm.role, tm.role) in ^roles,where: s.domain == ^domain or s.domain_changed_from == ^domain,where: is_nil(gm.id) or gm.site_id == s.id,+ order_by: [desc: s.domain == ^domain],+ limit: 1,select: s)diff --git a/test/plausible/sites_test.exs b/test/plausible/sites_test.exsindex e530d8722e..4c97887346 100644--- a/test/plausible/sites_test.exs+++ b/test/plausible/sites_test.exs@@ -292,6 +292,41 @@ defmodule Plausible.SitesTest doassert Sites.get_for_user(user, domain, include_consolidated?: true)assert Sites.get_for_user!(user, domain, include_consolidated?: true)end++ test "prioritizes exact domain match when two sites in the same team swapped domains" do+ user = new_user()+ site_a = new_site(owner: user)+ site_b = new_site(owner: user)+ original_domain_a = site_a.domain+ original_domain_b = site_b.domain++ # Domains can't be swapped in a single update per site due to the+ # unique constraint on `domain`, so a temporary value is used as+ # a stepping stone, same as a real swap performed via 3 separate+ # domain changes would produce.+ site_b =+ site_b+ |> change(domain: "swap-temp.example.com", domain_changed_from: original_domain_b)+ |> Repo.update!()++ site_a =+ site_a+ |> change(domain: original_domain_b, domain_changed_from: original_domain_a)+ |> Repo.update!()++ site_b+ |> change(domain: original_domain_a, domain_changed_from: original_domain_b)+ |> Repo.update!()++ # site_a now holds site_b's original domain, and site_b's+ # domain_changed_from also equals that same domain, so a naive+ # query for it would match both sites.+ assert %{id: id} = Sites.get_for_user!(user, original_domain_b)+ assert id == site_a.id++ assert %{id: id} = Sites.get_for_user!(user, original_domain_a)+ assert id == site_b.id+ endenddescribe "toggle_pin/2" do