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
Fixups sites (#3482)
hq108bd10614f1d
diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex 6a2b783d74..1df4b9b7e5 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -19,10 +19,10 @@ defmodule Plausible.Sites dobase_query =from(s in Plausible.Site,left_join: sm in assoc(s, :memberships),+ on: sm.user_id == ^user.id,left_join: i in assoc(s, :invitations),- where:- (is_nil(i.id) and sm.user_id == ^user.id) or- (not is_nil(i.id) and i.email == ^user.email),+ on: i.email == ^user.email,+ where: not is_nil(i.id) or not is_nil(sm.id),select: %{s| list_type:diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exsindex a60a5c618c..62b79225af 100644--- a/test/plausible/site/sites_test.exs+++ b/test/plausible/site/sites_test.exs@@ -98,24 +98,38 @@ defmodule Plausible.SitesTest doendtest "returns invitations and sites" do- user = insert(:user)+ user = insert(:user, email: "[email protected]")- %{id: site_id1} = insert(:site, members: [user])- %{id: site_id2} = insert(:site, members: [user])- _rogue_site = insert(:site)+ site1 = %{id: site_id1} = insert(:site, members: [user], domain: "one.example.com")+ %{id: site_id2} = insert(:site, members: [user], domain: "two.example.com")+ %{id: site_id4} = insert(:site, members: [user], domain: "four.example.com")++ _rogue_site = insert(:site, domain: "rogue.example.com")++ insert(:invitation, email: user.email, inviter: build(:user), role: :owner, site: site1)%{id: site_id3} =insert(:site,+ domain: "three.example.com",invitations: [build(:invitation, email: user.email, inviter: build(:user), role: :viewer)])+ insert(:invitation, email: "[email protected]", inviter: user, role: :viewer, site: site1)++ insert(:invitation,+ site: site1,+ inviter: user,+ email: "[email protected]"+ )+assert %{entries: [- %{id: ^site_id3},- %{id: ^site_id1},- %{id: ^site_id2}+ %{id: ^site_id1, list_type: "invitation"},+ %{id: ^site_id3, list_type: "invitation"},+ %{id: ^site_id4, list_type: "site"},+ %{id: ^site_id2, list_type: "site"}]} = Sites.list(user, %{})end