lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Refactored code to reduce number of database queries (#960)

Browse Source
This commit is contained in:
Ahmad Farhat
2020-02-24 12:31:30 -05:00
committed by GitHub
parent 92da1f6f87
commit 2cc1fdf281
14 changed files with 81 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/user.rb
View File

@ -32,7 +32,7 @@ class User < ApplicationRecord
has_many :shared_access
belongs_to :main_room, class_name: 'Room', foreign_key: :room_id, required: false
has_and_belongs_to_many :roles, -> { includes :role_permissions }, join_table: :users_roles
has_and_belongs_to_many :roles, join_table: :users_roles
validates :name, length: { maximum: 256 }, presence: true
validates :provider, presence: true
@ -183,7 +183,7 @@ class User < ApplicationRecord
# role functions
def highest_priority_role
roles.by_priority.first
roles.min_by(&:priority)
end
def add_role(role)
@ -217,7 +217,11 @@ class User < ApplicationRecord
# rubocop:disable Naming/PredicateName
def has_role?(role)
# rubocop:enable Naming/PredicateName
roles.exists?(name: role)
roles.each do |single_role|
return true if single_role.name.eql? role.to_s
end
false
end
def self.with_role(role)