Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Ensure upserted invitations and memberships are up to date on conflict (#4749)

Adrian Gruntkowskia3ab3c90614e
diff --git a/lib/plausible/teams/invitations.ex b/lib/plausible/teams/invitations.ex
index 8e5eaf7c38..f31016e508 100644
--- a/lib/plausible/teams/invitations.ex
+++ b/lib/plausible/teams/invitations.ex
@@ -195,7 +195,8 @@ defmodule Plausible.Teams.Invitations do
|> Teams.SiteTransfer.changeset(initiator: initiator, email: invitee_email)
|> Repo.insert(
on_conflict: [set: [updated_at: now]],
- conflict_target: [:email, :site_id]
+ conflict_target: [:email, :site_id],
+ returning: true
)
end
@@ -301,7 +302,8 @@ defmodule Plausible.Teams.Invitations do
|> Teams.GuestMembership.changeset(site, old_guest_membership.role)
|> Repo.insert(
on_conflict: [set: [updated_at: now, role: old_guest_membership.role]],
- conflict_target: [:team_membership_id, :site_id]
+ conflict_target: [:team_membership_id, :site_id],
+ returning: true
)
end
@@ -322,7 +324,8 @@ defmodule Plausible.Teams.Invitations do
|> Teams.GuestMembership.changeset(site, :editor)
|> Repo.insert(
on_conflict: [set: [updated_at: now, role: :editor]],
- conflict_target: [:team_membership_id, :site_id]
+ conflict_target: [:team_membership_id, :site_id],
+ returning: true
)
end
@@ -460,7 +463,11 @@ defmodule Plausible.Teams.Invitations do
team
|> Teams.Invitation.changeset(email: invitee_email, role: :guest, inviter: inviter)
- |> Repo.insert(on_conflict: [set: [updated_at: now]], conflict_target: [:team_id, :email])
+ |> Repo.insert(
+ on_conflict: [set: [updated_at: now]],
+ conflict_target: [:team_id, :email],
+ returning: true
+ )
end
defp create_guest_invitation(team_invitation, site, role) do
@@ -470,7 +477,8 @@ defmodule Plausible.Teams.Invitations do
|> Teams.GuestInvitation.changeset(site, role)
|> Repo.insert(
on_conflict: [set: [updated_at: now]],
- conflict_target: [:team_invitation_id, :site_id]
+ conflict_target: [:team_invitation_id, :site_id],
+ returning: true
)
end
@@ -501,7 +509,8 @@ defmodule Plausible.Teams.Invitations do
|> Teams.Membership.changeset(user, role)
|> Repo.insert(
on_conflict: [set: [updated_at: now]],
- conflict_target: [:team_id, :user_id]
+ conflict_target: [:team_id, :user_id],
+ returning: true
)
end
diff --git a/test/plausible/site/memberships/accept_invitation_test.exs b/test/plausible/site/memberships/accept_invitation_test.exs
index 485f2d8224..43c2f23bb7 100644
--- a/test/plausible/site/memberships/accept_invitation_test.exs
+++ b/test/plausible/site/memberships/accept_invitation_test.exs
@@ -318,6 +318,29 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
)
end
+ @tag :teams
+ test "does not create redundant guest membership when owner team membership exists" do
+ user = insert(:user)
+ {:ok, team} = Plausible.Teams.get_or_create(user)
+ site = insert(:site, team: team, members: [user])
+
+ invitation =
+ insert(:invitation,
+ site_id: site.id,
+ inviter: insert(:user),
+ email: user.email,
+ role: :admin
+ )
+
+ {:ok, team_membership} =
+ Plausible.Teams.Invitations.accept_invitation_sync(invitation, user)
+
+ team_membership = team_membership |> Repo.reload!() |> Repo.preload(:guest_memberships)
+
+ assert team_membership.role == :owner
+ assert team_membership.guest_memberships == []
+ end
+
@tag :teams
test "sync newly converted membership with team" do
inviter = insert(:user)