PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-07 23:06:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

add roles and filter preload

Browse source
This commit is contained in:
byte[] 2019-12-07 19:49:05 -05:00
parent 040622574f
commit 8a4b6d3b0a
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/philomena/users.ex
View file

@ -164,4 +164,13 @@ defmodule Philomena.Users do
|> User.creation_changeset(params) |> User.creation_changeset(params)
|> Repo.insert() |> Repo.insert()
end end
@impl Pow.Ecto.Context
def get_by(clauses) do
User
|> join(:left, [u], _ in assoc(u, :roles))
|> join(:left, [u, _], _ in assoc(u, :current_filter))
|> preload([_, r, cf], [current_filter: cf, roles: r])
|> Repo.get_by(clauses)
end
end end

2
lib/philomena/users/user.ex
View file

@ -22,6 +22,7 @@ defmodule Philomena.Users.User do
alias Philomena.Galleries.Gallery alias Philomena.Galleries.Gallery
alias Philomena.Users.User alias Philomena.Users.User
alias Philomena.Commissions.Commission alias Philomena.Commissions.Commission
alias Philomena.Roles.Role
@derive {Phoenix.Param, key: :slug} @derive {Phoenix.Param, key: :slug}
@ -34,6 +35,7 @@ defmodule Philomena.Users.User do
has_many :unread_notifications, UnreadNotification has_many :unread_notifications, UnreadNotification
has_many :notifications, through: [:unread_notifications, :notification] has_many :notifications, through: [:unread_notifications, :notification]
has_one :commission, Commission has_one :commission, Commission
many_to_many :roles, Role, join_through: "users_roles"
belongs_to :current_filter, Filter belongs_to :current_filter, Filter
belongs_to :deleted_by_user, User belongs_to :deleted_by_user, User