From 08bd10614f1dd29ffa782ad125dc1e8cd390d53c Mon Sep 17 00:00:00 2001 From: hq1 Date: Thu, 2 Nov 2023 16:29:01 +0100 Subject: [PATCH] Fixups sites (#3482) * Revert "Fix sites query invitation left join lookup (#3480)" This reverts commit 6e6508a3595cd7b8abdd656637de6184c2a0a602. * Revert "Revert "Fix sites query invitation left join lookup (#3480)"" This reverts commit f5cc831d7ae1174e6b3763cf76cf36d3d766ee2f. * Revert "Fix sites query invitation left join lookup (#3480)" This reverts commit 6e6508a3595cd7b8abdd656637de6184c2a0a602. * Fix sites listing --- lib/plausible/sites.ex | 6 +++--- test/plausible/site/sites_test.exs | 28 +++++++++++++++++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index 6a2b783d7..1df4b9b7e 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -19,10 +19,10 @@ defmodule Plausible.Sites do base_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.exs index a60a5c618..62b79225a 100644 --- a/test/plausible/site/sites_test.exs +++ b/test/plausible/site/sites_test.exs @@ -98,24 +98,38 @@ defmodule Plausible.SitesTest do end test "returns invitations and sites" do - user = insert(:user) + user = insert(:user, email: "hello@example.com") - %{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: "friend@example.com", inviter: user, role: :viewer, site: site1) + + insert(:invitation, + site: site1, + inviter: user, + email: "another@example.com" + ) + 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