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
Get rid of memberships prosthetic for `Teams.Sites.list_with_invitations` (#4764)
Adrian Gruntkowski1e1a4ab35b1c
diff --git a/lib/plausible/data_migration/backfill_teams.ex b/lib/plausible/data_migration/backfill_teams.exindex 0f39c65487..c1a87a51e2 100644--- a/lib/plausible/data_migration/backfill_teams.ex+++ b/lib/plausible/data_migration/backfill_teams.ex@@ -188,7 +188,7 @@ defmodule Plausible.DataMigration.BackfillTeams dogm in Teams.GuestMembership,inner_join: tm in assoc(gm, :team_membership),inner_join: s in assoc(gm, :site),- where: tm.team_id != s.id+ where: tm.team_id != s.team_id)|> @repo.all()diff --git a/lib/plausible/teams/sites.ex b/lib/plausible/teams/sites.exindex d832c3c87a..84c63757a4 100644--- a/lib/plausible/teams/sites.ex+++ b/lib/plausible/teams/sites.ex@@ -135,7 +135,7 @@ defmodule Plausible.Teams.Sites dosite_id: s.id,entry_type: "site",invitation_id: 0,- invitation_role: nil,+ role: tm.role,transfer_id: 0}@@ -148,7 +148,17 @@ defmodule Plausible.Teams.Sites dosite_id: s.id,entry_type: "site",invitation_id: 0,- invitation_role: nil,+ role:+ fragment(+ """+ CASE+ WHEN ? = 'editor' THEN 'admin'+ ELSE ?+ END+ """,+ gm.role,+ gm.role+ ),transfer_id: 0})@@ -175,7 +185,7 @@ defmodule Plausible.Teams.Sites dosite_id: s.id,entry_type: "invitation",invitation_id: ti.id,- invitation_role:+ role:fragment("""CASE@@ -207,7 +217,7 @@ defmodule Plausible.Teams.Sites dosite_id: s.id,entry_type: "invitation",invitation_id: 0,- invitation_role: "owner",+ role: "owner",transfer_id: st.id}@@ -244,11 +254,18 @@ defmodule Plausible.Teams.Sites do:entry_type),pinned_at: selected_as(up.pinned_at, :pinned_at),+ memberships: [+ %Plausible.Site.Membership{+ role: type(u.role, ^@role_type),+ site_id: s.id,+ site: s+ }+ ],invitations: [%Plausible.Auth.Invitation{invitation_id: coalesce(ti.invitation_id, st.transfer_id),email: coalesce(ti.email, st.email),- role: type(coalesce(u.invitation_role, "owner"), ^@role_type),+ role: type(u.role, ^@role_type),site_id: s.id,site: s}@@ -263,10 +280,13 @@ defmodule Plausible.Teams.Sites do|> maybe_filter_by_domain(domain_filter)|> Repo.paginate(pagination_params)|> Map.update!(:entries, fn entries ->- # temporary prosthetic, when switching to the new model eventually,- # we'll have to preload memberships from new schemas- membership_query = from sm in Site.Membership, where: sm.user_id == ^user.id- Repo.preload(entries, memberships: membership_query)+ Enum.map(entries, fn+ %{invitation: [%{invitation_id: nil}]} = entry ->+ %{entry | invitations: []}++ entry ->+ entry+ end)end)end