mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-24 20:36:49 +00:00
fix enterprise roles page performance
This commit is contained in:
@@ -3,9 +3,8 @@
|
||||
module Admin
|
||||
class EnterpriseRolesController < Admin::ResourceController
|
||||
def index
|
||||
@enterprise_roles = EnterpriseRole.by_user_email
|
||||
@users = Spree::User.order('spree_users.email')
|
||||
@my_enterprises = @all_enterprises = Enterprise.by_name
|
||||
@enterprise_roles, @users, @all_enterprises = Admin::EnterpriseRolesQuery.query
|
||||
@my_enterprises = @all_enterprises
|
||||
end
|
||||
|
||||
def create
|
||||
|
||||
47
app/queries/admin/enterprise_roles_query.rb
Normal file
47
app/queries/admin/enterprise_roles_query.rb
Normal file
@@ -0,0 +1,47 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module Admin
|
||||
class EnterpriseRolesQuery
|
||||
EnterpriseRoleStruct = Struct.new(:id, :user_id, :enterprise_id, :user_, :enterprise_name)
|
||||
UserStruct = Struct.new(:id, :email)
|
||||
EnterpriseStruct = Struct.new(:id, :name)
|
||||
|
||||
class << self
|
||||
def query
|
||||
enterprise_roles = query_enterprice_roles
|
||||
users = query_users
|
||||
enterprises = query_enterprises
|
||||
|
||||
[enterprise_roles, users, enterprises]
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def query_enterprice_roles
|
||||
EnterpriseRole.joins(:user, :enterprise).order('spree_users.email ASC').
|
||||
pluck(:id, :user_id, :enterprise_id, 'spree_users.email', 'enterprises.name').
|
||||
map do |data|
|
||||
id, user_id, enterprise_id, user_email, enterprise_name = data
|
||||
|
||||
{ id:, user_id:, enterprise_id:, user_email:, enterprise_name: }
|
||||
end
|
||||
end
|
||||
|
||||
def query_users
|
||||
Spree::User.order(:email).pluck(:id, :email).map do |data|
|
||||
id, email = data
|
||||
|
||||
{ id:, email: }
|
||||
end
|
||||
end
|
||||
|
||||
def query_enterprises
|
||||
Enterprise.order(:name).pluck(:id, :name).map do |data|
|
||||
id, name = data
|
||||
|
||||
{ id:, name: }
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,4 +1,3 @@
|
||||
= admin_inject_enterprise_roles(@enterprise_roles)
|
||||
= admin_inject_users(@users)
|
||||
= admin_inject_enterprises(@my_enterprises, @all_enterprises)
|
||||
|
||||
= admin_inject_json('ofn.admin', 'enterpriseRoles', @enterprise_roles)
|
||||
= admin_inject_json('ofn.admin', 'users', @users)
|
||||
= admin_inject_json('ofn.admin', 'my_enterprises', @my_enterprises) + admin_inject_json('ofn.admin', 'all_enterprises', @all_enterprises)
|
||||
|
||||
Reference in New Issue
Block a user