Skip to content

Commit

Permalink
Switch to relying on new team membership constraint when creating my …
Browse files Browse the repository at this point in the history
…team
  • Loading branch information
zoldar committed Jan 29, 2025
1 parent 637f8cd commit 8bbc650
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
18 changes: 13 additions & 5 deletions lib/plausible/teams.ex
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ defmodule Plausible.Teams do
If the user has a non-guest membership other than owner, `:no_team` error
is returned.
"""
@spec get_or_create(Auth.User.t()) :: {:ok, Teams.Team.t()} | {:error, :multiple_teams}
def get_or_create(user) do
with {:error, :no_team} <- get_by_owner(user) do
case create_my_team(user) do
Expand All @@ -155,6 +156,8 @@ defmodule Plausible.Teams do
end
end

@spec get_by_owner(Auth.User.t() | pos_integer()) ::
{:ok, Teams.Team.t()} | {:error, :no_team | :multiple_teams}
def get_by_owner(user_id) when is_integer(user_id) do
result =
from(tm in Teams.Membership,
Expand All @@ -163,18 +166,21 @@ defmodule Plausible.Teams do
select: t,
order_by: t.id
)
|> Repo.one()
|> Repo.all()

case result do
nil ->
[] ->
{:error, :no_team}

team ->
[team] ->
{:ok, team}

_teams ->
{:error, :multiple_teams}
end
end

def get_by_owner(%Plausible.Auth.User{} = user) do
def get_by_owner(%Auth.User{} = user) do
get_by_owner(user.id)
end

Expand Down Expand Up @@ -311,11 +317,13 @@ defmodule Plausible.Teams do
team_membership =
team
|> Teams.Membership.changeset(user, :owner)
|> Ecto.Changeset.put_change(:is_autocreated, true)
|> Ecto.Changeset.put_change(:inserted_at, user.inserted_at)
|> Ecto.Changeset.put_change(:updated_at, user.updated_at)
|> Repo.insert!(
on_conflict: :nothing,
conflict_target: {:unsafe_fragment, "(user_id) WHERE role != 'guest'"}
conflict_target:
{:unsafe_fragment, "(user_id) WHERE role = 'owner' and is_autocreated = true"}
)

if team_membership.id do
Expand Down
1 change: 1 addition & 0 deletions lib/plausible/teams/membership.ex
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ defmodule Plausible.Teams.Membership do

schema "team_memberships" do
field :role, Ecto.Enum, values: @roles
field :is_autocreated, :boolean, default: false

belongs_to :user, Plausible.Auth.User
belongs_to :team, Plausible.Teams.Team
Expand Down

0 comments on commit 8bbc650

Please sign in to comment.